Don't create a new "done" release on rename. fix #3250

couchpotato/core/plugins/manage.py

@@ -32,7 +32,7 @@ class Manage(Plugin):
         # Add files after renaming
         def after_rename(message = None, group = None):
             if not group: group = {}
-            return self.scanFilesToLibrary(folder = group['destination_dir'], files = group['renamed_files'])
+            return self.scanFilesToLibrary(folder = group['destination_dir'], files = group['renamed_files'], release_download = group['release_download'])
         addEvent('renamer.after', after_rename, priority = 110)
 
         addApiView('manage.update', self.updateLibraryView, docs = {
@@ -254,7 +254,7 @@ class Manage(Plugin):
 
         return []
 
-    def scanFilesToLibrary(self, folder = None, files = None):
+    def scanFilesToLibrary(self, folder = None, files = None, release_download = None):
 
         folder = os.path.normpath(folder)
 
@@ -263,6 +263,9 @@ class Manage(Plugin):
         if groups:
             for group in groups.values():
                 if group.get('media'):
+                    if release_download and release_download.get('release_id'):
+                        fireEvent('release.add', group = group, update_id = release_download.get('release_id'))
+                    else:
                         fireEvent('release.add', group = group)
 
     def getDiskSpace(self):

couchpotato/core/plugins/release/main.py

@@ -104,7 +104,7 @@ class Release(Plugin):
                 elif rel['status'] in ['snatched', 'downloaded']:
                     self.updateStatus(rel['_id'], status = 'ignore')
 
-    def add(self, group, update_info = True):
+    def add(self, group, update_info = True, update_id = None):
 
         try:
             db = get_db()
@@ -120,7 +120,21 @@ class Release(Plugin):
                     'profile_id': None,
                 }, search_after = False, update_after = update_info, notify_after = False, status = 'done', single = True)
 
+            release = None
+            if update_id:
+                try:
+                    release = db.get('id', update_id)
+                    release.update({
+                        'identifier': release_identifier,
+                        'last_edit': int(time.time()),
+                        'status': 'done',
+                    })
+                except:
+                    log.error('Failed updating existing release: %s', traceback.format_exc())
+            else:
+
                 # Add Release
+                if not release:
                     release = {
                         '_t': 'release',
                         'media_id': media['_id'],
@@ -130,10 +144,12 @@ class Release(Plugin):
                         'last_edit': int(time.time()),
                         'status': 'done'
                     }
+
                 try:
                     r = db.get('release_identifier', release_identifier, with_doc = True)['doc']
                     r['media_id'] = media['_id']
                 except:
+                    log.error('Failed updating release by identifier: %s', traceback.format_exc())
                     r = db.insert(release)
 
                 # Update with ref and _id

couchpotato/core/plugins/renamer.py

@@ -227,6 +227,7 @@ class Renamer(Plugin):
         for group_identifier in groups:
 
             group = groups[group_identifier]
+            group['release_download'] = None
             rename_files = {}
             remove_files = []
             remove_releases = []
@@ -504,6 +505,7 @@ class Renamer(Plugin):
                                 if release_download['status'] == 'completed':
                                     # Set the release to downloaded
                                     fireEvent('release.update_status', release['_id'], status = 'downloaded', single = True)
+                                    group['release_download'] = release_download
                                 elif release_download['status'] == 'seeding':
                                     # Set the release to seeding
                                     fireEvent('release.update_status', release['_id'], status = 'seeding', single = True)
@@ -511,6 +513,7 @@ class Renamer(Plugin):
                         elif release.get('identifier') == group['meta_data']['quality']['identifier']:
                             # Set the release to downloaded
                             fireEvent('release.update_status', release['_id'], status = 'downloaded', single = True)
+                            group['release_download'] = release_download
 
                 # Remove leftover files
                 if not remove_leftovers:  # Don't remove anything