Library update

libs/guessit/transfo/guess_episodes_rexps.py

@@ -26,14 +26,31 @@ import logging
 
 log = logging.getLogger(__name__)
 
+def number_list(s):
+    return re.sub('[^0-9]+', ' ', s).split()
 
 def guess_episodes_rexps(string):
     for rexp, confidence, span_adjust in episode_rexps:
         match = re.search(rexp, string, re.IGNORECASE)
         if match:
-            return (Guess(match.groupdict(), confidence=confidence),
-                    (match.start() + span_adjust[0],
-                     match.end() + span_adjust[1]))
+            result = (Guess(match.groupdict(), confidence=confidence),
+                      (match.start() + span_adjust[0],
+                       match.end() + span_adjust[1]))
+            # episodes which have a season > 25 are most likely errors
+            # (Simpsons is at 23!)
+            if int(result[0].get('season', 0)) > 25:
+                continue
+
+            # decide whether we have only a single episode number or an
+            # episode list
+            if result[0].get('episodeNumber'):
+                eplist = number_list(result[0]['episodeNumber'])
+                result[0].set('episodeNumber', int(eplist[0]), confidence=confidence)
+
+                if len(eplist) > 1:
+                    result[0].set('episodeList', map(int, eplist), confidence=confidence)
+
+            return result
 
     return None, None
 

libs/guessit/transfo/guess_filetype.py

@@ -87,6 +87,9 @@ def guess_filetype(filename, filetype):
                 upgrade_episode()
                 break
 
+        if 'tvu.org.ru' in filename:
+            upgrade_episode()
+
         # if no episode info found, assume it's a movie
         upgrade_movie()