Merge branch 'refs/heads/develop' into tv

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)

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):