From 46b2d6ba6ee71b65f6cc094c80865b2d54d3891b Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sat, 30 Nov 2013 16:48:46 +0100
Subject: [PATCH] movie_id > media_id

---
 couchpotato/core/media/movie/_base/main.py                 | 6 +++---
 couchpotato/core/media/movie/_base/static/movie.actions.js | 2 +-
 couchpotato/core/media/movie/searcher/main.py              | 6 +++---
 couchpotato/core/plugins/manage/main.py                    | 2 +-
 couchpotato/core/plugins/renamer/main.py                   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/couchpotato/core/media/movie/_base/main.py b/couchpotato/core/media/movie/_base/main.py
index aa8c513..20663b5 100644
--- a/couchpotato/core/media/movie/_base/main.py
+++ b/couchpotato/core/media/movie/_base/main.py
@@ -148,9 +148,9 @@ class MovieBase(MovieTypeBase):
         available_status = fireEvent('status.get', 'available', single = True)
 
         ids = splitString(id)
-        for movie_id in ids:
+        for media_id in ids:
 
-            m = db.query(Media).filter_by(id = movie_id).first()
+            m = db.query(Media).filter_by(id = media_id).first()
             if not m:
                 continue
 
@@ -176,7 +176,7 @@ class MovieBase(MovieTypeBase):
             fireEvent('media.restatus', m.id)
 
             movie_dict = m.to_dict(self.default_dict)
-            fireEventAsync('movie.searcher.single', movie_dict, on_complete = self.createNotifyFront(movie_id))
+            fireEventAsync('movie.searcher.single', movie_dict, on_complete = self.createNotifyFront(media_id))
 
         db.expire_all()
         return {
diff --git a/couchpotato/core/media/movie/_base/static/movie.actions.js b/couchpotato/core/media/movie/_base/static/movie.actions.js
index 22a55c0..66c84c6 100644
--- a/couchpotato/core/media/movie/_base/static/movie.actions.js
+++ b/couchpotato/core/media/movie/_base/static/movie.actions.js
@@ -450,7 +450,7 @@ MA.Release = new Class({
 
 	},
 
-	tryNextRelease: function(movie_id){
+	tryNextRelease: function(){
 		var self = this;
 
 		Api.request('movie.searcher.try_next', {
diff --git a/couchpotato/core/media/movie/searcher/main.py b/couchpotato/core/media/movie/searcher/main.py
index 02b037a..d90f959 100644
--- a/couchpotato/core/media/movie/searcher/main.py
+++ b/couchpotato/core/media/movie/searcher/main.py
@@ -318,14 +318,14 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
             'success': trynext
         }
 
-    def tryNextRelease(self, movie_id, manual = False):
+    def tryNextRelease(self, media_id, manual = False):
 
         snatched_status, done_status, ignored_status = fireEvent('status.get', ['snatched', 'done', 'ignored'], single = True)
 
         try:
             db = get_session()
             rels = db.query(Release) \
-                .filter_by(movie_id = movie_id) \
+                .filter_by(movie_id = media_id) \
                 .filter(Release.status_id.in_([snatched_status.get('id'), done_status.get('id')])) \
                 .all()
 
@@ -333,7 +333,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
                 rel.status_id = ignored_status.get('id')
             db.commit()
 
-            movie_dict = fireEvent('media.get', movie_id, single = True)
+            movie_dict = fireEvent('media.get', media_id = media_id, single = True)
             log.info('Trying next release for: %s', getTitle(movie_dict['library']))
             fireEvent('movie.searcher.single', movie_dict, manual = manual)
 
diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py
index ebafb8f..d9e2898 100644
--- a/couchpotato/core/plugins/manage/main.py
+++ b/couchpotato/core/plugins/manage/main.py
@@ -116,7 +116,7 @@ class Manage(Plugin):
 
                 for done_movie in done_movies:
                     if done_movie['library']['identifier'] not in added_identifiers:
-                        fireEvent('media.delete', movie_id = done_movie['id'], delete_from = 'all')
+                        fireEvent('media.delete', media_id = done_movie['id'], delete_from = 'all')
                     else:
 
                         releases = fireEvent('release.for_movie', id = done_movie.get('id'), single = True)
diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
index 422699e..a03e1af 100755
--- a/couchpotato/core/plugins/renamer/main.py
+++ b/couchpotato/core/plugins/renamer/main.py
@@ -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', rel.movie_id, single = True)
+                        movie_dict = fireEvent('media.get', media_id = rel.movie_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', movie_id = rel.movie_id)
+                                        fireEvent('movie.searcher.try_next_release', media_id = rel.movie_id)
                                 elif release_download['status'] == 'completed':
                                     log.info('Download of %s completed!', release_download['name'])
                                     if self.statusInfoComplete(release_download):