Merge branch 'refs/heads/develop'

couchpotato/core/media/_base/media/main.py

@@ -405,7 +405,7 @@ class MediaPlugin(MediaBase):
                                 db.delete(release)
                                 total_deleted += 1
 
-                    if (total_releases == total_deleted and media['status'] != 'active') or (delete_from == 'wanted' and media['status'] == 'active') or (not new_media_status and delete_from == 'late'):
+                    if (total_releases == total_deleted and media['status'] != 'active') or (not new_media_status and delete_from == 'late'):
                         db.delete(media)
                         deleted = True
                     elif new_media_status:

couchpotato/core/plugins/release/main.py

@@ -477,7 +477,7 @@ class Release(Plugin):
             rel = db.get('id', release_id)
             if rel and rel.get('status') != status:
 
-                release_name = rel['info'].get('name')
+                release_name = None
                 if rel.get('files'):
                     for file_type in rel.get('files', {}):
                         if file_type == 'movie':
@@ -485,6 +485,9 @@ class Release(Plugin):
                                 release_name = os.path.basename(release_file)
                                 break
 
+                if not release_name and rel.get('info'):
+                    release_name = rel['info'].get('name')
+
                 #update status in Db
                 log.debug('Marking release %s as %s', (release_name, status))
                 rel['status'] = status

couchpotato/runner.py

@@ -293,7 +293,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
             'keyfile': config['ssl_key'],
         }
 
-    server = HTTPServer(application, no_keep_alive = True)
+    server = HTTPServer(application, no_keep_alive = True, ssl_options = ssl_options)
 
     try_restart = True
     restart_tries = 5