Allow playing DVD structure from arbitrary directories

[enigma2.git] / 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 96ed5f674d8af6f8d50dbe502c469f07251c2f12..101166bb74ba0a17588f8fd0aa050e3c6fbdc54b 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -56,6 +56,11 @@ class FileBrowser(Screen):
                                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)
                else:
                        self.close(filename)
 
@@ -318,6 +323,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                        })
 
                self.onClose.append(self.__onClose)
+
+               if fileExists("/dev/cdroms/cdrom0"):
+                       print "physical dvd found (/dev/cdroms/cdrom0)"
+                       self.physicalDVD = True
+               else:
+                       self.physicalDVD = False
+
                self.onFirstExecBegin.append(self.showFileBrowser)
                self.service = None
                self.in_menu = False
@@ -504,7 +516,16 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                self.askLeavePlayer()
 
        def showFileBrowser(self):
-               self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
+               if self.physicalDVD:
+                       self.session.openWithCallback(self.DVDdriveCB, MessageBox, text=_("Do you want to play DVD in drive?"), timeout=5 )
+               else:
+                       self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
+       
+       def DVDdriveCB(self, answer):
+               if answer == True:
+                       self.FileBrowserClosed("/dev/cdroms/cdrom0")
+               else:
+                       self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
 
        def FileBrowserClosed(self, val):
                curref = self.session.nav.getCurrentlyPlayingServiceReference()