From 6d2889f88d2a9d02da3bba9dce8267c4b3e06c55 Mon Sep 17 00:00:00 2001 From: mano3m Date: Sat, 12 Oct 2013 13:28:44 +0200 Subject: [PATCH 1/2] Fix releases missing from Snatched&Available Fixes #1958 --- couchpotato/static/scripts/page/home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/static/scripts/page/home.js b/couchpotato/static/scripts/page/home.js index b93db5bd..9967ff41 100644 --- a/couchpotato/static/scripts/page/home.js +++ b/couchpotato/static/scripts/page/home.js @@ -52,7 +52,7 @@ Page.Home = new Class({ }) ), 'filter': { - 'release_status': 'snatched,available' + 'release_status': 'snatched,seeding,missing,available,downloaded' }, 'limit': null, 'onLoaded': function(){ From 3a117b6077f3651094044ed705f1a9c5c77067cd Mon Sep 17 00:00:00 2001 From: mano3m Date: Sat, 12 Oct 2013 13:40:51 +0200 Subject: [PATCH 2/2] Make sure movies are removed from dashboard --- couchpotato/core/media/movie/_base/main.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/couchpotato/core/media/movie/_base/main.py b/couchpotato/core/media/movie/_base/main.py index 4f39733d..e430a65a 100644 --- a/couchpotato/core/media/movie/_base/main.py +++ b/couchpotato/core/media/movie/_base/main.py @@ -83,26 +83,26 @@ class MovieBase(MovieTypeBase): addEvent('app.load', self.cleanReleases) fireEvent('schedule.interval', 'movie.clean_releases', self.cleanReleases, hours = 4) - def cleanReleases(self): + def cleanReleases(self): # Shouldnt this be part of the Release plugin, or the Dashboard plugin? log.debug('Removing releases from dashboard') now = time.time() week = 262080 - done_status, available_status, snatched_status = \ - fireEvent('status.get', ['done', 'available', 'snatched'], single = True) + done_status, available_status, snatched_status, downloaded_status = \ + fireEvent('status.get', ['done', 'available', 'snatched', 'downloaded'], single = True) db = get_session() # get movies last_edit more than a week ago - movies = db.query(Media) \ + media = db.query(Media) \ .filter(Media.status_id == done_status.get('id'), Media.last_edit < (now - week)) \ .all() - for movie in movies: - for rel in movie.releases: - if rel.status_id in [available_status.get('id'), snatched_status.get('id')]: + for item in media: + for rel in item.releases: + if rel.status_id in [available_status.get('id'), snatched_status.get('id'), downloaded_status.get('id')]: fireEvent('release.delete', id = rel.id, single = True) db.expire_all()