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

movie_id > media_id

Browse Source
This commit is contained in:
Ruud
2013-11-30 16:52:08 +01:00
parent bab07a05e7
commit 9ce8ffc14b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
couchpotato/core/media/_base/media/main.py
View File

@@ -203,14 +203,14 @@ class MediaPlugin(MediaBase):
# List release statuses
releases = db.query(Release) \
.filter(Release.movie_id.in_(media_ids)) \
.filter(Release.media_id.in_(media_ids)) \
.all()
release_statuses = dict((m, set()) for m in media_ids)
releases_count = dict((m, 0) for m in media_ids)
for release in releases:
release_statuses[release.movie_id].add('%d,%d' % (release.status_id, release.quality_id))
releases_count[release.movie_id] += 1
release_statuses[release.media_id].add('%d,%d' % (release.status_id, release.quality_id))
releases_count[release.media_id] += 1
# Get main movie data
q2 = db.query(Media) \

2
couchpotato/core/media/movie/_base/static/movie.js
View File

@@ -54,7 +54,7 @@ var Movie = new Class({
// Reload when releases have updated
self.global_events['release.update_status'] = function(notification){
var data = notification.data
if(data && self.data.id == data.movie_id){
if(data && self.data.id == data.media_id){
if(!self.data.releases)
self.data.releases = [];

2
couchpotato/core/media/movie/searcher/main.py
View File

@@ -325,7 +325,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
try:
db = get_session()
rels = db.query(Release) \
.filter_by(movie_id = media_id) \
.filter_by(media_id = media_id) \
.filter(Release.status_id.in_([snatched_status.get('id'), done_status.get('id')])) \
.all()

4
couchpotato/core/plugins/renamer/main.py
View File

@@ -820,7 +820,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
try:
for rel in rels:
rel_dict = rel.to_dict({'info': {}})
movie_dict = fireEvent('media.get', media_id = rel.movie_id, single = True)
movie_dict = fireEvent('media.get', media_id = rel.media_id, single = True)
if not isinstance(rel_dict['info'], (dict)):
log.error('Faulty release found without any info, ignoring.')
@@ -878,7 +878,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
fireEvent('download.remove_failed', release_download, single = True)
if self.conf('next_on_failed'):
fireEvent('movie.searcher.try_next_release', media_id = rel.movie_id)
fireEvent('movie.searcher.try_next_release', media_id = rel.media_id)
elif release_download['status'] == 'completed':
log.info('Download of %s completed!', release_download['name'])
if self.statusInfoComplete(release_download):