From 131326675e45500532948825ea39d9664e66d86d Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 9 Mar 2014 00:24:54 +0100
Subject: [PATCH] Update release on rename Prevent RevConflict

---
 couchpotato/core/plugins/manage/main.py  | 7 +++----
 couchpotato/core/plugins/release/main.py | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py
index d29321ce..e047d88f 100644
--- a/couchpotato/core/plugins/manage/main.py
+++ b/couchpotato/core/plugins/manage/main.py
@@ -106,7 +106,6 @@ class Manage(Plugin):
                 log.info('Updating manage library: %s', folder)
                 fireEvent('notify.frontend', type = 'manage.update', data = True, message = 'Scanning for movies in "%s"' % folder)
 
-
                 onFound = self.createAddToLibrary(folder, added_identifiers)
                 fireEvent('scanner.scan', folder = folder, simple = True, newer_than = last_update if not full else 0, on_found = onFound, single = True)
 
@@ -122,7 +121,7 @@ class Manage(Plugin):
 
                 for done_movie in done_movies:
                     if done_movie['identifier'] not in added_identifiers:
-                        fireEvent('media.delete', media_id = done_movie['id'], delete_from = 'all')
+                        fireEvent('media.delete', media_id = done_movie['_id'], delete_from = 'all')
                     else:
 
                         db = get_db()
@@ -191,7 +190,7 @@ class Manage(Plugin):
                 added_identifiers.append(group['identifier'])
 
                 # Add it to release and update the info
-                fireEvent('release.add', group = group)
+                fireEvent('release.add', group = group, update_info = False)
                 fireEvent('movie.update_info', identifier = group['identifier'], on_complete = self.createAfterUpdate(folder, group['identifier']))
             else:
                 self.updateProgress(folder)
@@ -239,7 +238,7 @@ class Manage(Plugin):
 
         if groups:
             for group in groups.values():
-                if group.get('info'):
+                if group.get('media'):
                     fireEvent('release.add', group = group)
 
     def getDiskSpace(self):
diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py
index 5cc3c01f..fb8e7945 100644
--- a/couchpotato/core/plugins/release/main.py
+++ b/couchpotato/core/plugins/release/main.py
@@ -81,7 +81,7 @@ class Release(Plugin):
                 elif rel['status'] in ['snatched', 'downloaded']:
                     self.updateStatus(rel['_id'], status = 'ignore')
 
-    def add(self, group):
+    def add(self, group, update_info = True):
 
         try:
             db = get_db()
@@ -95,7 +95,7 @@ class Release(Plugin):
                 media = fireEvent('movie.add', params = {
                     'identifier': group['identifier'],
                     'profile_id': None,
-                }, search_after = False, status = 'done', single = True)
+                }, search_after = False, update_after = update_info, notify_after = False, status = 'done', single = True)
 
             # Add Release
             release = {