Merge branch 'develop' into tv

couchpotato/core/plugins/base.py

@@ -157,7 +157,7 @@ class Plugin(object):
                                 os.rmdir(full_path)
                             except:
                                 if show_error:
-                                    log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
+                                    log.info2('Couldn\'t remove directory %s: %s', (full_path, traceback.format_exc()))
 
         try:
             os.rmdir(folder)

couchpotato/core/plugins/log/static/log.js

@@ -241,7 +241,7 @@ Running on: ...\n\
 						'href': 'https://github.com/RuudBurger/CouchPotatoServer/blob/develop/contributing.md'
 					}),
 					new Element('span', {
-						'text': ' before posting, then copy the text below'
+						'text': ' before posting (kittens die if you don\'t), then copy the text below.'
 					})
 				),
 				textarea = new Element('textarea', {

couchpotato/core/plugins/release/main.py

@@ -234,8 +234,9 @@ class Release(Plugin):
         db = get_db()
 
         try:
-            rel = db.get('id', id, with_doc = True)
-            self.updateStatus(id, 'available' if rel['status'] in ['ignored', 'failed'] else 'ignored')
+            if id:
+                rel = db.get('id', id, with_doc = True)
+                self.updateStatus(id, 'available' if rel['status'] in ['ignored', 'failed'] else 'ignored')
 
             return {
                 'success': True
@@ -364,7 +365,7 @@ class Release(Plugin):
         let_through = False
         filtered_results = []
 
-        # If a single release comes through the "wait for", let through all
+        # Filter out ignored and other releases we don't want
         for rel in results:
 
             if rel['status'] in ['ignored', 'failed']:
@@ -379,6 +380,11 @@ class Release(Plugin):
                 log.info('Ignored, size "%sMB" to low: %s', (rel['size'], rel['name']))
                 continue
 
+            if 'seeders' in rel and rel.get('seeders') <= 0:
+                log.info('Ignored, no seeders: %s', (rel['name']))
+                continue
+
+            # If a single release comes through the "wait for", let through all
             rel['wait_for'] = False
             if quality_custom.get('index') != 0 and quality_custom.get('wait_for', 0) > 0 and rel.get('age') <= quality_custom.get('wait_for', 0):
                 rel['wait_for'] = True

couchpotato/core/plugins/renamer.py

@@ -807,7 +807,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
                 if os.name == 'nt' and self.conf('ntfs_permission'):
                     os.popen('icacls "' + dest + '"* /reset /T')
             except:
-                log.error('Failed setting permissions for file: %s, %s', (dest, traceback.format_exc(1)))
+                log.debug('Failed setting permissions for file: %s, %s', (dest, traceback.format_exc(1)))
         except:
             log.error('Couldn\'t move file "%s" to "%s": %s', (old, dest, traceback.format_exc()))
             raise