From 8f4e03d04b9affa625f160638cfb6dcd310eea1c Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 27 Dec 2014 13:46:25 +0100 Subject: [PATCH 1/2] Use detected encoding #4388 --- couchpotato/core/helpers/encoding.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/couchpotato/core/helpers/encoding.py b/couchpotato/core/helpers/encoding.py index b0fe05cf..c28b6974 100644 --- a/couchpotato/core/helpers/encoding.py +++ b/couchpotato/core/helpers/encoding.py @@ -37,14 +37,15 @@ def toUnicode(original, *args): except: try: detected = detect(original) - if detected.get('encoding') == 'utf-8': - return original.decode('utf-8') - return ek(original, *args) + try: + return original.decode(detected.get('encoding')) + except: + return ek(original, *args) except: raise except: log.error('Unable to decode value "%s..." : %s ', (repr(original)[:20], traceback.format_exc())) - return toSafeString(original) + return 'ERROR DECODING STRING' def ss(original, *args): @@ -91,7 +92,7 @@ def ek(original, *args): if isinstance(original, (str, unicode)): try: from couchpotato.environment import Env - return original.decode(Env.get('encoding')) + return original.decode(Env.get('encoding'), 'ignore') except UnicodeDecodeError: raise From 17e37996c4b31974050d560685bf0c52d41dabe6 Mon Sep 17 00:00:00 2001 From: Ruud Burger Date: Fri, 2 Jan 2015 18:18:08 +0100 Subject: [PATCH 2/2] Add remux category for TorrentShack close #4427 --- .../core/media/movie/providers/torrent/torrentshack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentshack.py b/couchpotato/core/media/movie/providers/torrent/torrentshack.py index 01eb6d6a..f9127315 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentshack.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentshack.py @@ -22,8 +22,8 @@ class TorrentShack(MovieProvider, Base): # Movies-SD Pack - 983 (not included) cat_ids = [ - ([970], ['bd50']), - ([300], ['720p', '1080p']), + ([970, 320], ['bd50']), + ([300, 320], ['720p', '1080p']), ([350], ['dvdr']), ([400], ['brrip', 'dvdrip']), ]