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 committed 2013-11-30 12:44:13 +01:00
2 parents a989c93505 2fc4809821
commit efdf77ef6c
33 files changed
+1047 -464
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/providers/info/_modifier/main.py
+2 -2
View File
@@ -104,11 +104,11 @@ class Movie(ModifierBase):
for movie in l.media:
if movie.status_id == active_status['id']:
temp['in_wanted'] = fireEvent('movie.get', movie.id, single = True)
temp['in_wanted'] = fireEvent('media.get', movie.id, single = True)
for release in movie.releases:
if release.status_id == done_status['id']:
temp['in_library'] = fireEvent('movie.get', movie.id, single = True)
temp['in_library'] = fireEvent('media.get', movie.id, single = True)
except:
log.error('Tried getting more info on searched movies: %s', traceback.format_exc())