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

Don't log already deleted releases.

Browse Source
This commit is contained in:
Ruud
2014-06-16 21:21:55 +02:00
parent 530d3cd91e
commit 3faece0b4c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/manage.py
+6 -6
View File
@@ -136,6 +136,7 @@ class Manage(Plugin):
# Get movies with done status # Get movies with done status
total_movies, done_movies = fireEvent('media.list', types = 'movie', status = 'done', release_status = 'done', status_or = True, single = True) total_movies, done_movies = fireEvent('media.list', types = 'movie', status = 'done', release_status = 'done', status_or = True, single = True)
deleted_releases = []
for done_movie in done_movies: for done_movie in done_movies:
if getIdentifier(done_movie) not in added_identifiers: if getIdentifier(done_movie) not in added_identifiers:
fireEvent('media.delete', media_id = done_movie['_id'], delete_from = 'all') fireEvent('media.delete', media_id = done_movie['_id'], delete_from = 'all')
@@ -165,12 +166,11 @@ class Manage(Plugin):
already_used = used_files.get(release_file) already_used = used_files.get(release_file)
if already_used: if already_used:
# delete current one if release_id not in deleted_releases:
if already_used.get('last_edit', 0) < release.get('last_edit', 0): release_id = release['_id'] if already_used.get('last_edit', 0) < release.get('last_edit', 0) else already_used['_id']
fireEvent('release.delete', release['_id'], single = True) fireEvent('release.delete', release_id, single = True)
# delete previous one
else: deleted_releases.append(release_id)
fireEvent('release.delete', already_used['_id'], single = True)
break break
else: else:
used_files[release_file] = release used_files[release_file] = release
couchpotato/core/plugins/release/main.py
+2 -2
View File
@@ -149,7 +149,7 @@ class Release(Plugin):
r = db.get('release_identifier', release_identifier, with_doc = True)['doc'] r = db.get('release_identifier', release_identifier, with_doc = True)['doc']
r['media_id'] = media['_id'] r['media_id'] = media['_id']
except: except:
log.error('Failed updating release by identifier: %s', traceback.format_exc()) log.debug('Failed updating release by identifier "%s". Inserting new.', release_identifier)
r = db.insert(release) r = db.insert(release)
# Update with ref and _id # Update with ref and _id
@@ -184,7 +184,7 @@ class Release(Plugin):
db.delete(rel) db.delete(rel)
return True return True
except RecordDeleted: except RecordDeleted:
log.error('Already deleted: %s', release_id) log.debug('Already deleted: %s', release_id)
return True return True
except: except:
log.error('Failed: %s', traceback.format_exc()) log.error('Failed: %s', traceback.format_exc())