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

Merge branch 'refs/heads/develop' into tv

Browse Source 
Conflicts:
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/plugins/release/main.py
	couchpotato/core/plugins/renamer/main.py
This commit is contained in:
Ruud
2013-11-30 12:44:13 +01:00
parent a989c93505 2fc4809821
commit efdf77ef6c
33 changed files with 1047 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/release/main.py
+2 -2
View File
@@ -142,7 +142,7 @@ class Release(Plugin):
except:
log.debug('Failed to attach "%s" to release: %s', (added_files, traceback.format_exc()))
fireEvent('movie.restatus', media.id)
fireEvent('media.restatus', media.id)
return True
@@ -269,7 +269,7 @@ class Release(Plugin):
if filedata == 'try_next':
return filedata
download_result = fireEvent('download', data = data, movie = media, manual = manual, filedata = filedata, single = True)
download_result = fireEvent('download', data = data, media = media, manual = manual, filedata = filedata, single = True)
log.debug('Downloader result: %s', download_result)
if download_result: