dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean-up searcher

Browse Source
This commit is contained in:
mano3m
2013-09-30 19:15:30 +02:00
parent f0f843f746
commit 1bddadf3a4
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/media/_base/searcher/main.py
+3 -13
View File
@@ -60,7 +60,7 @@ class Searcher(SearcherBase):
if downloader_enabled: if downloader_enabled:
snatched_status = fireEvent('status.get', 'snatched', single = True) snatched_status, done_status, active_status = fireEvent('status.get', ['snatched', 'done', 'active'], single = True)
# Download movie to temp # Download movie to temp
filedata = None filedata = None
@@ -79,9 +79,7 @@ class Searcher(SearcherBase):
rls = db.query(Release).filter_by(identifier = md5(data['url'])).first() rls = db.query(Release).filter_by(identifier = md5(data['url'])).first()
if rls: if rls:
renamer_enabled = Env.setting('enabled', 'renamer') renamer_enabled = Env.setting('enabled', 'renamer')
fireEvent('release.update', id = rls.id, status = done_status if not renamer_enabled else snatched_status, single = True)
done_status = fireEvent('status.get', 'done', single = True)
rls.status_id = done_status.get('id') if not renamer_enabled else snatched_status.get('id')
# Save download-id info if returned # Save download-id info if returned
if isinstance(download_result, dict): if isinstance(download_result, dict):
@@ -100,20 +98,12 @@ class Searcher(SearcherBase):
# If renamer isn't used, mark movie done # If renamer isn't used, mark movie done
if not renamer_enabled: if not renamer_enabled:
active_status = fireEvent('status.get', 'active', single = True)
done_status = fireEvent('status.get', 'done', single = True)
try: try:
if movie['status_id'] == active_status.get('id'): if movie['status_id'] == active_status.get('id'):
for profile_type in movie['profile']['types']: for profile_type in movie['profile']['types']:
if profile_type['quality_id'] == rls.quality.id and profile_type['finish']: if profile_type['quality_id'] == rls.quality.id and profile_type['finish']:
log.info('Renamer disabled, marking movie as finished: %s', log_movie)
# Mark release done
rls.status_id = done_status.get('id')
rls.last_edit = int(time.time())
db.commit()
# Mark movie done # Mark movie done
log.info('Renamer disabled, marking movie as finished: %s', log_movie)
mvie = db.query(Movie).filter_by(id = movie['id']).first() mvie = db.query(Movie).filter_by(id = movie['id']).first()
mvie.status_id = done_status.get('id') mvie.status_id = done_status.get('id')
mvie.last_edit = int(time.time()) mvie.last_edit = int(time.time())
couchpotato/core/plugins/release/main.py
-3
View File
@@ -210,9 +210,6 @@ class Release(Plugin):
db.expunge_all() db.expunge_all()
rel = db.query(Relea).filter_by(id = id).first() # Get release again @RuudBurger why do we need to get it again?? rel = db.query(Relea).filter_by(id = id).first() # Get release again @RuudBurger why do we need to get it again??
if rel.status_id != done_status.get('id'):
fireEvent('release.update', id = id, status = snatched_status, single = True)
fireEvent('notify.frontend', type = 'release.download', data = True, message = 'Successfully snatched "%s"' % item['name']) fireEvent('notify.frontend', type = 'release.download', data = True, message = 'Successfully snatched "%s"' % item['name'])
return { return {
'success': success 'success': success