X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f7d4b3e46c34d1ed7983c20577da833405f541f8..a072f55b74af5b939e6c08b6fcef2d2d5473b0d6:/lib/python/Plugins/Extensions/DVDPlayer/plugin.py diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 57706faf..7159a6cd 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -1,22 +1,18 @@ from os import path as os_path, remove as os_remove, listdir as os_listdir, system -from time import strftime -from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation, eServiceReference, iServiceKeys +from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox -from Screens.InputBox import InputBox from Screens.HelpMenu import HelpableScreen from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap from Components.Label import Label from Components.FileList import FileList +from Components.MenuList import MenuList from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase from Components.config import config -from Components.ProgressBar import ProgressBar -from ServiceReference import ServiceReference from Tools.Directories import pathExists, fileExists -import random import servicedvd # load c++ part of dvd player plugin lastpath = "" @@ -26,19 +22,23 @@ class FileBrowser(Screen): """ - def __init__(self, session): + def __init__(self, session, dvd_filelist = [ ]): Screen.__init__(self, session) - global lastpath - if lastpath is not None: - currDir = lastpath + "/" + + self.dvd_filelist = dvd_filelist + if len(dvd_filelist): + self["filelist"] = MenuList(self.dvd_filelist) else: - currDir = "/media/dvd/" - if not pathExists(currDir): - currDir = "/" - #else: - #print system("mount "+currDir) - self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True) - self["filelist"] = self.filelist + global lastpath + if lastpath is not None: + currDir = lastpath + "/" + else: + currDir = "/media/dvd/" + if not pathExists(currDir): + currDir = "/" + + self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True) + self["filelist"] = self.filelist self["FilelistActions"] = ActionMap(["OkCancelActions"], { @@ -47,26 +47,36 @@ class FileBrowser(Screen): }) def ok(self): - global lastpath - filename = self["filelist"].getFilename() - if filename is not None: - lastpath = filename[0:filename.rfind("/")] - if filename.upper().endswith("VIDEO_TS/"): - print "dvd structure found, trying to open..." - self.close(filename[0:-9]) - if self["filelist"].canDescent(): # isDir - self["filelist"].descent() - pathname = self["filelist"].getCurrentDirectory() - print self["filelist"].getFilename() - if fileExists(pathname+"VIDEO_TS.IFO"): - print "dvd structure found, trying to open..." - self.close(pathname) + if len(self.dvd_filelist): + print "OK " + self["filelist"].getCurrent() + self.close(self["filelist"].getCurrent()) else: - self.close(filename) + global lastpath + filename = self["filelist"].getFilename() + if filename is not None: + if filename.upper().endswith("VIDEO_TS/"): + print "dvd structure found, trying to open..." + dvdpath = filename[0:-9] + lastpath = (dvdpath.rstrip("/").rsplit("/",1))[0] + print "lastpath video_ts/=", lastpath + self.close(dvdpath) + return + if self["filelist"].canDescent(): # isDir + self["filelist"].descent() + pathname = self["filelist"].getCurrentDirectory() or "" + if fileExists(pathname+"VIDEO_TS.IFO"): + print "dvd structure found, trying to open..." + lastpath = (pathname.rstrip("/").rsplit("/",1))[0] + print "lastpath video_ts.ifo=", lastpath + self.close(pathname) + else: + lastpath = filename[0:filename.rfind("/")] + print "lastpath directory=", lastpath + self.close(filename) def exit(self): self.close(None) - + class DVDSummary(Screen): skin = """ @@ -152,10 +162,9 @@ class ChapterZap(Screen): self.Timer.callback.append(self.keyOK) self.Timer.start(3000, True) -class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen): -#InfoBarCueSheetSupport, +class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport): # ALLOW_SUSPEND = True -# ENABLE_RESUME_SUPPORT = True + ENABLE_RESUME_SUPPORT = True skin = """ @@ -224,11 +233,11 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP config.seek.stepwise_repeat.value = self.saved_config_seek_stepwise_repeat config.seek.on_pause.value = self.saved_config_seek_on_pause - def __init__(self, session, dvd_device = None, args = None): + def __init__(self, session, dvd_device = None, dvd_filelist = [ ], args = None): Screen.__init__(self, session) InfoBarBase.__init__(self) InfoBarNotifications.__init__(self) -# InfoBarCueSheetSupport.__init__(self, actionmap = "MediaPlayerCueSheetActions") + InfoBarCueSheetSupport.__init__(self, actionmap = "MediaPlayerCueSheetActions") InfoBarShowHide.__init__(self) HelpableScreen.__init__(self) self.save_infobar_seek_config() @@ -239,9 +248,11 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.oldService = self.session.nav.getCurrentlyPlayingServiceReference() self.session.nav.stopService() - self["audioLabel"] = Label("1") + self["audioLabel"] = Label("n/a") self["subtitleLabel"] = Label("") self["chapterLabel"] = Label("") + self.last_audioTuple = None + self.last_subtitleTuple = None self.totalChapters = 0 self.currentChapter = 0 self.totalTitles = 0 @@ -260,7 +271,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP iPlayableService.evUser+7: self.__osdSubtitleInfoAvail, iPlayableService.evUser+8: self.__chapterUpdated, iPlayableService.evUser+9: self.__titleUpdated, - #iPlayableService.evUser+10: self.__initializeDVDinfo, iPlayableService.evUser+11: self.__menuOpened, iPlayableService.evUser+12: self.__menuClosed }) @@ -336,6 +346,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.dvd_device = None self.physicalDVD = False + self.dvd_filelist = dvd_filelist self.onFirstExecBegin.append(self.showFileBrowser) self.service = None self.in_menu = False @@ -416,42 +427,46 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP print "StringAvail" def __osdAudioInfoAvail(self): - audioString = self.service.info().getInfoString(iServiceInformation.sUser+6) - print "AudioInfoAvail "+audioString - self["audioLabel"].setText(audioString) - if not self.in_menu: - self.doShow() + audioTuple = self.service.info().getInfoObject(iServiceInformation.sUser+6) + print "AudioInfoAvail ", repr(audioTuple) + if audioTuple: + audioString = "%d: %s (%s)" % (audioTuple[0],audioTuple[1],audioTuple[2]) + self["audioLabel"].setText(audioString) + if audioTuple != self.last_audioTuple and not self.in_menu: + self.doShow() + self.last_audioTuple = audioTuple def __osdSubtitleInfoAvail(self): - subtitleString = self.service.info().getInfoString(iServiceInformation.sUser+7) - print "SubtitleInfoAvail "+subtitleString - self["subtitleLabel"].setText(subtitleString) - if not self.in_menu: - self.doShow() + subtitleTuple = self.service.info().getInfoObject(iServiceInformation.sUser+7) + print "SubtitleInfoAvail ", repr(subtitleTuple) + if subtitleTuple: + subtitleString = "" + if subtitleTuple[0] is not 0: + subtitleString = "%d: %s" % (subtitleTuple[0],subtitleTuple[1]) + self["subtitleLabel"].setText(subtitleString) + if subtitleTuple != self.last_subtitleTuple and not self.in_menu: + self.doShow() + self.last_subtitleTuple = subtitleTuple def __chapterUpdated(self): - self.currentChapter = self.service.info().getInfo(iServiceInformation.sUser+8) - self.totalChapters = self.service.info().getInfo(iServiceInformation.sUser+80) + self.currentChapter = self.service.info().getInfo(iServiceInformation.sCurrentChapter) + self.totalChapters = self.service.info().getInfo(iServiceInformation.sTotalChapters) self.setChapterLabel() print "__chapterUpdated: %d/%d" % (self.currentChapter, self.totalChapters) def __titleUpdated(self): - self.currentTitle = self.service.info().getInfo(iServiceInformation.sUser+9) - self.totalTitles = self.service.info().getInfo(iServiceInformation.sUser+90) + self.currentTitle = self.service.info().getInfo(iServiceInformation.sCurrentTitle) + self.totalTitles = self.service.info().getInfo(iServiceInformation.sTotalTitles) self.setChapterLabel() print "__titleUpdated: %d/%d" % (self.currentTitle, self.totalTitles) if not self.in_menu: self.doShow() - #def __initializeDVDinfo(self): - #self.__osdAudioInfoAvail() - #self.__osdSubtitleInfoAvail() - def askLeavePlayer(self): - if self.physicalDVD: - self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list=[(_("Continue playing"), "play"), (_("Exit"), "exit")]) - else: - self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list=[(_("Continue playing"), "play"), (_("Return to file browser"), "browser"), (_("Exit"), "exit")]) + choices = [(_("Continue playing"), "play"), (_("Exit"), "exit")] + if not self.physicalDVD: + choices.insert(1,(_("Return to file browser"), "browser")) + self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices) def nextAudioTrack(self): if self.service: @@ -525,19 +540,22 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.askLeavePlayer() def showFileBrowser(self): - if self.physicalDVD: + if self.physicalDVD and len(self.dvd_filelist) == 0: if self.dvd_device == "/dev/cdroms/cdrom0": self.session.openWithCallback(self.DVDdriveCB, MessageBox, text=_("Do you want to play DVD in drive?"), timeout=5 ) else: self.DVDdriveCB(True) + elif len(self.dvd_filelist) == 1: + self.FileBrowserClosed(self.dvd_filelist[0]) else: - self.session.openWithCallback(self.FileBrowserClosed, FileBrowser) + self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, self.dvd_filelist) def DVDdriveCB(self, answer): if answer == True: self.FileBrowserClosed(self.dvd_device) else: self.session.openWithCallback(self.FileBrowserClosed, FileBrowser) + self.physicalDVD = False def FileBrowserClosed(self, val): curref = self.session.nav.getCurrentlyPlayingServiceReference() @@ -562,6 +580,8 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP if answer[1] == "browser": #TODO check here if a paused dvd playback is already running... then re-start it... #else + if self.service: + self.service = None self.showFileBrowser() else: pass @@ -575,32 +595,21 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.restore_infobar_seek_config() self.session.nav.playService(self.oldService) -# def playLastCB(self, answer): # overwrite infobar cuesheet function -# print "playLastCB", answer, self.resume_point -# pos = self.resume_point -# title = self.resume_point % 90000 -# pos -= title -# chapter = title % 256 -# title /= 256 -# print "pos", pos, "title", title, "chapter", chapter -# if self.service: -# seek = self.service.seek() -# if title != 1: -# seek.seekTitle(title) -# self.resume_state = 1 -# elif chapter != 1: -# seek.seekChapter(chapter) -# self.resume_state = 2 -# else: -# seek.seekTo(pos) -# self.hideAfterResume() + def playLastCB(self, answer): # overwrite infobar cuesheet function + print "playLastCB", answer, self.resume_point + if self.service: + seek = self.service.seek() + if answer == True: + seek.seekTo(self.resume_point) + pause = self.service.pause() + pause.unpause() + self.hideAfterResume() def showAfterCuesheetOperation(self): if not self.in_menu: self.show() def createSummary(self): - print "DVDCreateSummary" return DVDSummary #override some InfoBarSeek functions @@ -620,18 +629,24 @@ def menu(menuid, **kwargs): from Plugins.Plugin import PluginDescriptor -#TODO add *.iso to filescanner and ask when more than one iso file is found - def filescan_open(list, session, **kwargs): - for x in list: - splitted = x.path.split('/') + if len(list) == 1 and list[0].mimetype == "video/x-dvd": + splitted = list[0].path.split('/') print "splitted", splitted if len(splitted) > 2: if splitted[1] == 'autofs': - session.open(DVDPlayer, "/dev/%s" %(splitted[2])) + session.open(DVDPlayer, dvd_device="/dev/%s" %(splitted[2])) return else: print "splitted[0]", splitted[1] + else: + dvd_filelist = [] + for x in list: + if x.mimetype == "video/x-dvd-iso": + dvd_filelist.append(x.path) + if x.mimetype == "video/x-dvd": + dvd_filelist.append(x.path.rsplit('/',1)[0]) + session.open(DVDPlayer, dvd_filelist=dvd_filelist) def filescan(**kwargs): from Components.Scanner import Scanner, ScanPath @@ -641,16 +656,17 @@ def filescan(**kwargs): def checkFile(self, file): return fileExists(file.path) - return \ - LocalScanner(mimetypes = None, + return [ + LocalScanner(mimetypes = ["video/x-dvd","video/x-dvd-iso"], paths_to_scan = [ ScanPath(path = "video_ts", with_subdirs = False), + ScanPath(path = "", with_subdirs = False), ], name = "DVD", description = "Play DVD", openfnc = filescan_open, - ) + )] def Plugins(**kwargs): return [PluginDescriptor(name = "DVDPlayer", description = "Play DVDs", where = PluginDescriptor.WHERE_MENU, fnc = menu),