Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop

couchpotato/core/plugins/automation.py

@@ -46,7 +46,8 @@ class Automation(Plugin):
                 break
 
             movie_dict = fireEvent('media.get', movie_id, single = True)
-            fireEvent('movie.searcher.single', movie_dict)
+            if movie_dict:
+                fireEvent('movie.searcher.single', movie_dict)
 
         return True
 

couchpotato/core/plugins/base.py

@@ -1,3 +1,4 @@
+import threading
 from urllib import quote
 from urlparse import urlparse
 import glob
@@ -35,6 +36,8 @@ class Plugin(object):
     _needs_shutdown = False
     _running = None
 
+    _locks = {}
+
     user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20130519 Firefox/24.0'
     http_last_use = {}
     http_time_between_calls = 0
@@ -400,3 +403,19 @@ class Plugin(object):
 
     def isEnabled(self):
         return self.conf(self.enabled_option) or self.conf(self.enabled_option) is None
+
+    def acquireLock(self, key):
+
+        lock = self._locks.get(key)
+        if not lock:
+            self._locks[key] = threading.RLock()
+
+        log.debug('Acquiring lock: %s', key)
+        self._locks.get(key).acquire()
+
+    def releaseLock(self, key):
+
+        lock = self._locks.get(key)
+        if lock:
+            log.debug('Releasing lock: %s', key)
+            self._locks.get(key).release()

couchpotato/core/plugins/dashboard.py

@@ -1,5 +1,6 @@
 import random as rndm
 import time
+from CodernityDB.database import RecordDeleted
 
 from couchpotato import get_db
 from couchpotato.api import addApiView
@@ -58,7 +59,11 @@ class Dashboard(Plugin):
                 rndm.shuffle(active_ids)
 
             for media_id in active_ids:
-                media = db.get('id', media_id)
+                try:
+                    media = db.get('id', media_id)
+                except RecordDeleted:
+                    log.debug('Record already deleted: %s', media_id)
+                    continue
 
                 pp = profile_pre.get(media.get('profile_id'))
                 if not pp: continue

couchpotato/core/plugins/manage.py

@@ -234,7 +234,8 @@ class Manage(Plugin):
             total = self.in_progress[folder]['total']
             movie_dict = fireEvent('media.get', identifier, single = True)
 
-            fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict))
+            if movie_dict:
+                fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict))
 
         return afterUpdate
 

couchpotato/core/plugins/release/main.py

@@ -95,9 +95,7 @@ class Release(Plugin):
                 except:
                     log.error('Failed fixing mis-status tag: %s', traceback.format_exc())
             except ValueError:
-                log.debug('Deleted corrupted document "%s": %s', (release.get('key'), traceback.format_exc(0)))
-                corrupted = db.get('id', release.get('key'), with_storage = False)
-                db._delete_id_index(corrupted.get('_id'), corrupted.get('_rev'), None)
+                fireEvent('database.delete_corrupted', release.get('key'), traceback_error = traceback.format_exc(0))
                 reindex += 1
             except RecordDeleted:
                 db.delete(doc)
@@ -112,7 +110,7 @@ class Release(Plugin):
         del media_exist
 
         # get movies last_edit more than a week ago
-        medias = fireEvent('media.with_status', ['done','active'], single = True)
+        medias = fireEvent('media.with_status', ['done', 'active'], single = True)
 
         for media in medias:
             if media.get('last_edit', 0) > (now - week):