Revert back to UTF8 when ss encoding fails. fix #2220

2013-09-21 13:56:17 +02:00
parent 19f782e4a5
commit 2d3fc03a00
1 changed files with 8 additions and 2 deletions
--- a/couchpotato/core/helpers/encoding.py
+++ b/couchpotato/core/helpers/encoding.py
@@ -38,8 +38,14 @@ def toUnicode(original, *args):
        return toUnicode(ascii_text)

 def ss(original, *args):
-    from couchpotato.environment import Env
-    return toUnicode(original, *args).encode(Env.get('encoding'))
+
+    u_original = toUnicode(original, *args)
+    try:
+        from couchpotato.environment import Env
+        return u_original.encode(Env.get('encoding'))
+    except Exception, e:
+        log.debug('Failed ss encoding char, force UTF8: %s', e)
+        return u_original.encode('UTF-8')

 def ek(original, *args):
    if isinstance(original, (str, unicode)):