Subliminal update

libs/guessit/__init__.py

@@ -18,12 +18,58 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-__version__ = '0.4.2'
+
+__version__ = '0.5.2'
 __all__ = ['Guess', 'Language',
            'guess_file_info', 'guess_video_info',
            'guess_movie_info', 'guess_episode_info']
 
 
+# Do python3 detection before importing any other module, to be sure that
+# it will then always be available
+# with code from http://lucumr.pocoo.org/2011/1/22/forwards-compatible-python/
+import sys
+if sys.version_info[0] >= 3:
+    PY3 = True
+    unicode_text_type = str
+    native_text_type = str
+    base_text_type = str
+    def u(x):
+        return str(x)
+    def s(x):
+        return x
+    class UnicodeMixin(object):
+        __str__ = lambda x: x.__unicode__()
+    import binascii
+    def to_hex(x):
+        return binascii.hexlify(x).decode('utf-8')
+
+else:
+    PY3 = False
+    __all__ = [ str(s) for s in __all__ ] # fix imports for python2
+    unicode_text_type = unicode
+    native_text_type = str
+    base_text_type = basestring
+    def u(x):
+        if isinstance(x, str):
+            return x.decode('utf-8')
+        return unicode(x)
+    def s(x):
+        if isinstance(x, unicode):
+            return x.encode('utf-8')
+        if isinstance(x, list):
+            return [ s(y) for y in x ]
+        if isinstance(x, tuple):
+            return tuple(s(y) for y in x)
+        if isinstance(x, dict):
+            return dict((s(key), s(value)) for key, value in x.items())
+        return x
+    class UnicodeMixin(object):
+        __str__ = lambda x: unicode(x).encode('utf-8')
+    def to_hex(x):
+        return x.encode('hex')
+
+
 from guessit.guess import Guess, merge_all
 from guessit.language import Language
 from guessit.matcher import IterativeMatcher
@@ -32,6 +78,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
+
 class NullHandler(logging.Handler):
     def emit(self, record):
         pass
@@ -45,7 +92,7 @@ def guess_file_info(filename, filetype, info=None):
     """info can contain the names of the various plugins, such as 'filename' to
     detect filename info, or 'hash_md5' to get the md5 hash of the file.
 
-    >>> guess_file_info('test/dummy.srt', 'autodetect', info = ['hash_md5', 'hash_sha1'])
+    >>> guess_file_info('tests/dummy.srt', 'autodetect', info = ['hash_md5', 'hash_sha1'])
     {'hash_md5': 'e781de9b94ba2753a8e2945b2c0a123d', 'hash_sha1': 'bfd18e2f4e5d59775c2bc14d80f56971891ed620'}
     """
     result = []
@@ -54,7 +101,7 @@ def guess_file_info(filename, filetype, info=None):
     if info is None:
         info = ['filename']
 
-    if isinstance(info, basestring):
+    if isinstance(info, base_text_type):
         info = [info]
 
     for infotype in info:
@@ -67,7 +114,7 @@ def guess_file_info(filename, filetype, info=None):
             try:
                 result.append(Guess({'hash_mpc': hash_file(filename)},
                                     confidence=1.0))
-            except Exception, e:
+            except Exception as e:
                 log.warning('Could not compute MPC-style hash because: %s' % e)
 
         elif infotype == 'hash_ed2k':
@@ -75,7 +122,7 @@ def guess_file_info(filename, filetype, info=None):
             try:
                 result.append(Guess({'hash_ed2k': hash_file(filename)},
                                     confidence=1.0))
-            except Exception, e:
+            except Exception as e:
                 log.warning('Could not compute ed2k hash because: %s' % e)
 
         elif infotype.startswith('hash_'):
@@ -97,17 +144,28 @@ def guess_file_info(filename, filetype, info=None):
             hasherobjs = dict(hashers).values()
 
             with open(filename, 'rb') as f:
-                for chunk in iter(lambda: f.read(blocksize), ''):
+                chunk = f.read(blocksize)
+                while chunk:
                     for hasher in hasherobjs:
                         hasher.update(chunk)
+                    chunk = f.read(blocksize)
 
             for infotype, hasher in hashers:
                 result.append(Guess({infotype: hasher.hexdigest()},
                                     confidence=1.0))
-        except Exception, e:
+        except Exception as e:
             log.warning('Could not compute hash because: %s' % e)
 
-    return merge_all(result)
+    result = merge_all(result)
+
+    # last minute adjustments
+
+    # if country is in the guessed properties, make it part of the filename
+    if 'country' in result:
+        result['series'] += ' (%s)' % result['country'].alpha2.upper()
+
+
+    return result
 
 
 def guess_video_info(filename, info=None):