From c97bd38c83ea131389f0482d51a15049e916f593 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 1 Sep 2014 14:23:26 +0200 Subject: [PATCH 1/6] Import cleanup --- couchpotato/core/media/_base/media/main.py | 8 ++++---- couchpotato/core/media/movie/_base/main.py | 1 - couchpotato/core/media/movie/charts/main.py | 1 - couchpotato/core/media/movie/searcher.py | 2 +- couchpotato/core/plugins/manage.py | 1 + 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/couchpotato/core/media/_base/media/main.py b/couchpotato/core/media/_base/media/main.py index e032dca2..4a97688b 100755 --- a/couchpotato/core/media/_base/media/main.py +++ b/couchpotato/core/media/_base/media/main.py @@ -1,5 +1,4 @@ from datetime import timedelta -from operator import itemgetter import time import traceback from string import ascii_lowercase @@ -313,7 +312,8 @@ class MediaPlugin(MediaBase): def addSingleListView(self): for media_type in fireEvent('media.types', merge = True): - tempList = lambda media_type = media_type, *args, **kwargs : self.listView(type = media_type, **kwargs) + tempList = lambda *args, **kwargs : self.listView(type = media_type, **kwargs) + print tempList addApiView('%s.list' % media_type, tempList, docs = { 'desc': 'List media', 'params': { @@ -395,7 +395,7 @@ class MediaPlugin(MediaBase): def addSingleCharView(self): for media_type in fireEvent('media.types', merge = True): - tempChar = lambda media_type = media_type, *args, **kwargs : self.charView(type = media_type, **kwargs) + tempChar = lambda *args, **kwargs : self.charView(type = media_type, **kwargs) addApiView('%s.available_chars' % media_type, tempChar) def delete(self, media_id, delete_from = None): @@ -464,7 +464,7 @@ class MediaPlugin(MediaBase): def addSingleDeleteView(self): for media_type in fireEvent('media.types', merge = True): - tempDelete = lambda media_type = media_type, *args, **kwargs : self.deleteView(type = media_type, **kwargs) + tempDelete = lambda *args, **kwargs : self.deleteView(type = media_type, **kwargs) addApiView('%s.delete' % media_type, tempDelete, docs = { 'desc': 'Delete a ' + media_type + ' from the wanted list', 'params': { diff --git a/couchpotato/core/media/movie/_base/main.py b/couchpotato/core/media/movie/_base/main.py index 8a04d0b2..0dc39e56 100755 --- a/couchpotato/core/media/movie/_base/main.py +++ b/couchpotato/core/media/movie/_base/main.py @@ -1,4 +1,3 @@ -import os import traceback import time diff --git a/couchpotato/core/media/movie/charts/main.py b/couchpotato/core/media/movie/charts/main.py index 28d5d68a..9ab57dd3 100644 --- a/couchpotato/core/media/movie/charts/main.py +++ b/couchpotato/core/media/movie/charts/main.py @@ -1,6 +1,5 @@ import time -from couchpotato import tryInt from couchpotato.core.logger import CPLog from couchpotato.api import addApiView from couchpotato.core.event import addEvent,fireEvent diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py index d7ca27cb..97181aee 100755 --- a/couchpotato/core/media/movie/searcher.py +++ b/couchpotato/core/media/movie/searcher.py @@ -277,7 +277,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase): # Contains lower quality string contains_other = fireEvent('searcher.contains_other_quality', nzb, movie_year = media['info']['year'], preferred_quality = preferred_quality, single = True) - if contains_other != False: + if contains_other and isinstance(contains_other, dict): log.info2('Wrong: %s, looking for %s, found %s', (nzb['name'], quality['label'], [x for x in contains_other] if contains_other else 'no quality')) return False diff --git a/couchpotato/core/plugins/manage.py b/couchpotato/core/plugins/manage.py index 0f01774a..132f7ec0 100755 --- a/couchpotato/core/plugins/manage.py +++ b/couchpotato/core/plugins/manage.py @@ -190,6 +190,7 @@ class Manage(Plugin): delete_me = {} + # noinspection PyTypeChecker for folder in self.in_progress: if self.in_progress[folder]['to_go'] <= 0: delete_me[folder] = True From 6e455e62d5eb5f57451111f56849afab12bdfd36 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 1 Sep 2014 14:49:46 +0200 Subject: [PATCH 2/6] Remove debug print --- couchpotato/core/media/_base/media/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/couchpotato/core/media/_base/media/main.py b/couchpotato/core/media/_base/media/main.py index 4a97688b..d5e54d73 100755 --- a/couchpotato/core/media/_base/media/main.py +++ b/couchpotato/core/media/_base/media/main.py @@ -313,7 +313,6 @@ class MediaPlugin(MediaBase): for media_type in fireEvent('media.types', merge = True): tempList = lambda *args, **kwargs : self.listView(type = media_type, **kwargs) - print tempList addApiView('%s.list' % media_type, tempList, docs = { 'desc': 'List media', 'params': { From bad26026ae7cd8bf9545fbaf78237b62777a0fee Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 1 Sep 2014 14:50:42 +0200 Subject: [PATCH 3/6] Clean done after week, not 3 days --- couchpotato/core/plugins/release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index e4bfdc2a..614b3159 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -65,7 +65,7 @@ class Release(Plugin): log.debug('Removing releases from dashboard') now = time.time() - week = 262080 + week = 604800 db = get_db() From 3b34196901ebc32f5559edd67265b7d619619c7f Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 1 Sep 2014 14:57:59 +0200 Subject: [PATCH 4/6] Also untag active movies --- couchpotato/core/plugins/release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 614b3159..31c3e61b 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -95,7 +95,7 @@ class Release(Plugin): del media_exist # get movies last_edit more than a week ago - medias = fireEvent('media.with_status', 'done', single = True) + medias = fireEvent('media.with_status', ['done','active'], single = True) for media in medias: if media.get('last_edit', 0) > (now - week): @@ -111,7 +111,8 @@ class Release(Plugin): elif rel['status'] in ['snatched', 'downloaded']: self.updateStatus(rel['_id'], status = 'ignored') - fireEvent('media.untag', media.get('_id'), 'recent', single = True) + if 'recent' in media.get('tags', []): + fireEvent('media.untag', media.get('_id'), 'recent', single = True) def add(self, group, update_info = True, update_id = None): From 9d21dd9196eec5500c3b8749c1c4a29b3bc17068 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 1 Sep 2014 22:13:49 +0200 Subject: [PATCH 5/6] Newznab download status code not caught properly --- couchpotato/core/media/_base/providers/nzb/newznab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/_base/providers/nzb/newznab.py b/couchpotato/core/media/_base/providers/nzb/newznab.py index 81622ade..87ecc752 100644 --- a/couchpotato/core/media/_base/providers/nzb/newznab.py +++ b/couchpotato/core/media/_base/providers/nzb/newznab.py @@ -187,7 +187,7 @@ class Base(NZBProvider, RSS): self.limits_reached[host] = False return data except HTTPError as e: - if e.code == 503: + if e.response.status_code == 503: response = e.read().lower() if 'maximum api' in response or 'download limit' in response: if not self.limits_reached.get(host): From 5a2df624621a78c31d12d49afdbdfc5783905700 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 1 Sep 2014 22:51:55 +0200 Subject: [PATCH 6/6] Add quality test --- couchpotato/core/plugins/quality/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py index 60350018..baeca670 100644 --- a/couchpotato/core/plugins/quality/main.py +++ b/couchpotato/core/plugins/quality/main.py @@ -478,7 +478,7 @@ class QualityPlugin(Plugin): 'Moviename.2014.720p.R6.WEB-DL.x264.AC3-xyz': {'size': 750, 'quality': 'r5'}, 'Movie name 2014 New Source 720p HDCAM x264 AC3 xyz': {'size': 750, 'quality': 'cam'}, 'Movie.Name.2014.720p.HD.TS.AC3.x264': {'size': 750, 'quality': 'ts'}, - # 'Movie.Name.2014.1080p.HDrip.x264.aac-ReleaseGroup': {'size': 7500, 'quality': 'brrip'}, + 'Movie.Name.2014.1080p.HDrip.x264.aac-ReleaseGroup': {'size': 7000, 'quality': 'brrip'}, 'Movie.Name.2014.HDCam.Chinese.Subs-ReleaseGroup': {'size': 15000, 'quality': 'cam'}, 'Movie Name 2014 HQ DVDRip X264 AC3 (bla)': {'size': 0, 'quality': 'dvdrip'}, 'Movie Name1 (2012).mkv': {'size': 4500, 'quality': '720p'},