movie_id > media_id

couchpotato/core/media/movie/_base/main.py

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

couchpotato/core/plugins/dashboard/main.py

@@ -4,7 +4,7 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.variable import splitString, tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Movie, Library, LibraryTitle, \
+from couchpotato.core.settings.model import Media, Library, LibraryTitle, \
     Release
 from sqlalchemy.orm import joinedload_all
 from sqlalchemy.sql.expression import asc, or_
@@ -50,12 +50,12 @@ class Dashboard(Plugin):
 
         # Get all active movies
         active_status, ignored_status = fireEvent('status.get', ['active', 'ignored'], single = True)
-        q = db.query(Movie) \
+        q = db.query(Media) \
             .join(Library) \
-            .outerjoin(Movie.releases) \
+            .outerjoin(Media.releases) \
-            .filter(Movie.status_id == active_status.get('id')) \
+            .filter(Media.status_id == active_status.get('id')) \
-            .with_entities(Movie.id, Movie.profile_id, Library.info, Library.year) \
+            .with_entities(Media.id, Media.profile_id, Library.info, Library.year) \
-            .group_by(Movie.id) \
+            .group_by(Media.id) \
             .filter(or_(Release.id == None, Release.status_id == ignored_status.get('id')))
 
         if not random:
@@ -101,11 +101,11 @@ class Dashboard(Plugin):
             if len(movie_ids) > 0:
 
                 # Get all movie information
-                movies_raw = db.query(Movie) \
+                movies_raw = db.query(Media) \
                     .options(joinedload_all('library.titles')) \
                     .options(joinedload_all('library.files')) \
                     .options(joinedload_all('files')) \
-                    .filter(Movie.id.in_(movie_ids)) \
+                    .filter(Media.id.in_(movie_ids)) \
                     .all()
 
                 # Create dict by movie id

couchpotato/core/plugins/release/main.py

@@ -224,7 +224,7 @@ class Release(Plugin):
         releases_raw = db.query(Relea) \
             .options(joinedload_all('info')) \
             .options(joinedload_all('files')) \
-            .filter(Relea.movie_id == id) \
+            .filter(Relea.media_id == id) \
             .all()
 
         releases = [r.to_dict({'info':{}, 'files':{}}) for r in releases_raw]

couchpotato/core/plugins/renamer/main.py

@@ -173,7 +173,7 @@ class Renamer(Plugin):
 
                 # Overwrite destination when set in category
                 destination = self.conf('to')
-                for movie in library_ent.movies:
+                for movie in library_ent.media:
                     if movie.category and movie.category.destination and len(movie.category.destination) > 0 and movie.category.destination != 'None':
                         destination = movie.category.destination
                         log.debug('Setting category destination for "%s": %s' % (movie_title, destination))
@@ -342,13 +342,13 @@ class Renamer(Plugin):
                 remove_leftovers = True
 
                 # Add it to the wanted list before we continue
-                if len(library_ent.movies) == 0:
+                if len(library_ent.media) == 0:
                     profile = db.query(Profile).filter_by(core = True, label = group['meta_data']['quality']['label']).first()
                     fireEvent('movie.add', params = {'identifier': group['library']['identifier'], 'profile_id': profile.id}, search_after = False)
                     db.expire_all()
                     library_ent = db.query(Library).filter_by(identifier = group['library']['identifier']).first()
 
-                for movie in library_ent.movies:
+                for movie in library_ent.media:
 
                     # Mark movie "done" once it's found the quality with the finish check
                     try:
@@ -678,7 +678,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
                     for rel in rels:
                         rel_dict = rel.to_dict({'info': {}})
 
-                        movie_dict = fireEvent('movie.get', rel.movie_id, single = True)
+                        movie_dict = fireEvent('movie.get', rel.media_id, single = True)
 
                         # check status
                         nzbname = self.createNzbName(rel_dict['info'], movie_dict)
@@ -734,7 +734,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
                                     db.commit()
 
                                     if self.conf('next_on_failed'):
-                                        fireEvent('movie.searcher.try_next_release', movie_id = rel.movie_id)
+                                        fireEvent('movie.searcher.try_next_release', media_id = rel.media_id)
                                 elif item['status'] == 'completed':
                                     log.info('Download of %s completed!', item['name'])
                                     if self.statusInfoComplete(item):