Merge lp:~damoxc/entertainer/video_metadata_enhancements into lp:entertainer

[Damien Churchill]

Adds checking of folder names to the video metadata search to allow for people to store videos with a path:

Futurama/Season 2/05 - Episode.avi

[lp:~damoxc/entertainer/video_metadata_enhancements]

415. By Damien Churchill on 2010-06-14

re-enable the imdb search

Unmerged revisions

415. By Damien Churchill on 2010-06-14

re-enable the imdb search

414. By Damien Churchill on 2010-06-14

add checking folder names to the video metadata search

=== modified file 'entertainerlib/backend/components/mediacache/video_metadata_search.py'
--- entertainerlib/backend/components/mediacache/video_metadata_search.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/backend/components/mediacache/video_metadata_search.py	2010-06-14 23:55:45 +0000
@@ -47,7 +47,7 @@
         except imdb.IMDbError:
             raise IOError("Couldn't connect to IMDB server!")
 
-    def _parse_filename(self, filename):
+    def _parse_filename(self, path):
         """
         Parse filename. Tries to get title of the movie/tv-series etc.
 
@@ -60,15 +60,15 @@
             movie_name_keyword_something.avi
             movie.name.avi
             etc.
-        @param filename: Path of the movie
+        @param path: Path of the movie
         @return: Title, season and episode
         """
         season = 0
         episode = 0
 
-        # lowercase filename and remove the path and extension
-        filename = filename.lower()
-        filename = os.path.split(filename)[1]
+        # lowercase path and get the filename minus extension
+        path = path.lower()
+        filename = os.path.basename(path)
         filename = os.path.splitext(filename)[0]
 
         # strip ., - and _ from filename
@@ -91,6 +91,17 @@
             filename = filename.strip()
             season = match.group('season')
             episode = match.group('episode')
+        else:
+            # quite likely that this is a Show/Season 1/05 Episode.avi
+            if filename[0].isdigit():
+                regexp = r'(?P<title>.*?)/[a-zA-Z]+\s+(?P<season>\d{1,2})/(?P<episode>\d{1,2})'
+                match = re.search(regexp, path)
+                if match:
+                    filename = match.group('title')
+                    filename = filename.strip()
+                    season = match.group('season')
+                    episode = match.group('episode')
+
 
         return filename, int(season), int(episode)
 

=== modified file 'entertainerlib/tests/test_videometadatasearch.py'
--- entertainerlib/tests/test_videometadatasearch.py	2010-04-03 15:01:03 +0000
+++ entertainerlib/tests/test_videometadatasearch.py	2010-06-14 23:55:45 +0000
@@ -22,12 +22,30 @@
         self.video_metadata_search_serie = VideoMetadataSearch(serie)
         self.assertEqual(self.video_metadata_search_serie.title, "futurama")
 
+    def testSerieTitleDir(self):
+        '''
+        testSerieTitleDir - Ensures a serie title is returned correctly
+        when specified by a parent directory.
+        '''
+        serie = "/home/user/videos/Futurama/Season 2/05 something.avi"
+        self.video_metadata_search_serie = VideoMetadataSearch(serie)
+        self.assertEqual(self.video_metadata_search_serie.title, "futurama")
+
     def testSerieSeason(self):
         '''testSerieSeason - Ensures a serie season is returned correctly'''
         serie = "/home/user/videos/Futurama s02e05 something.avi"
         self.video_metadata_search_serie = VideoMetadataSearch(serie)
         self.assertEqual(self.video_metadata_search_serie.season, 2)
 
+    def testSerieSeasonDir(self):
+        '''
+        testSerieSeasonDir - Ensures a serie season is returned correctly
+        when specified by a parent directory.
+        '''
+        serie = "/home/user/videos/Futurama/Season 2/05 something.avi"
+        self.video_metadata_search_serie = VideoMetadataSearch(serie)
+        self.assertEqual(self.video_metadata_search_serie.season, 2)
+
     def testSerieEpisode(self):
         '''testSerieEpisode - Ensures a serie episode is returned correctly'''
         serie = "/home/user/videos/Futurama s02e05 something.avi"