diff --git a/couchpotato/core/media/show/providers/torrent/iptorrents.py b/couchpotato/core/media/show/providers/torrent/iptorrents.py old mode 100644 new mode 100755 index 8183675..c10183f --- a/couchpotato/core/media/show/providers/torrent/iptorrents.py +++ b/couchpotato/core/media/show/providers/torrent/iptorrents.py @@ -9,29 +9,20 @@ autoload = 'IPTorrents' class IPTorrents(MultiProvider): - def getTypes(self): return [Season, Episode] class Season(SeasonProvider, Base): - - # TODO come back to this later, a better quality system needs to be created cat_ids = [ - ([65], [ - 'bluray_1080p', 'bluray_720p', - 'bdrip_1080p', 'bdrip_720p', - 'brrip_1080p', 'brrip_720p', - 'webdl_1080p', 'webdl_720p', 'webdl_480p', - 'hdtv_720p', 'hdtv_sd' - ]), + ([65], {}), ] class Episode(EpisodeProvider, Base): - - # TODO come back to this later, a better quality system needs to be created cat_ids = [ - ([5], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']), - ([4, 78, 79], ['hdtv_sd']) + ([4], {'codec': ['mp4-asp'], 'resolution': ['sd'], 'source': ['hdtv', 'web']}), + ([5], {'codec': ['mp4-avc'], 'resolution': ['720p', '1080p'], 'source': ['hdtv', 'web']}), + ([78], {'codec': ['mp4-avc'], 'resolution': ['480p'], 'source': ['hdtv', 'web']}), + ([79], {'codec': ['mp4-avc'], 'resolution': ['sd'], 'source': ['hdtv', 'web']}) ] diff --git a/couchpotato/core/media/show/quality/main.py b/couchpotato/core/media/show/quality/main.py index f29ce19..27ff440 100755 --- a/couchpotato/core/media/show/quality/main.py +++ b/couchpotato/core/media/show/quality/main.py @@ -23,10 +23,11 @@ class ShowQuality(QualityBase): ], 'resolution': [ # TODO interlaced resolutions (auto-fill these options?) + {'identifier': 'sd'}, {'identifier': '480p', 'width': 853, 'height': 480}, {'identifier': '576p', 'width': 1024, 'height': 576}, {'identifier': '720p', 'width': 1280, 'height': 720}, - {'identifier': '1080p', 'width': 1920, 'height': 1080}, + {'identifier': '1080p', 'width': 1920, 'height': 1080} ], 'source': [ {'identifier': 'cam', 'label': 'Cam', 'value': ['camrip', 'hdcam']},