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 (total_releases == 0 and not new_media_status) or (not new_media_status and delete_from == 'late'):
                         db.delete(media)
                         deleted = True
                     elif new_media_status:

couchpotato/core/media/movie/providers/automation/moviemeter.py

@@ -21,11 +21,15 @@ class Moviemeter(Automation, RSS):
 
         for movie in rss_movies:
 
-            name_year = fireEvent('scanner.name_year', self.getTextElement(movie, 'title'), single = True)
+            title = self.getTextElement(movie, 'title')
-            imdb = self.search(name_year.get('name'), name_year.get('year'))
+            name_year = fireEvent('scanner.name_year', title, single = True)
+            if name_year.get('name') and name_year.get('year'):
+                imdb = self.search(name_year.get('name'), name_year.get('year'))
 
-            if imdb and self.isMinimalMovie(imdb):
+                if imdb and self.isMinimalMovie(imdb):
-                movies.append(imdb['imdb'])
+                    movies.append(imdb['imdb'])
+            else:
+                log.error('Failed getting name and year from: %s', title)
 
         return movies
 

couchpotato/core/plugins/browser.py

@@ -3,6 +3,7 @@ import os
 import string
 
 from couchpotato.api import addApiView
+from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import getUserDir
 from couchpotato.core.plugins.base import Plugin
 import six
@@ -50,6 +51,7 @@ class FileBrowser(Plugin):
             path = '/'
 
         dirs = []
+        path = sp(path)
         for f in os.listdir(path):
             p = os.path.join(path, f)
             if os.path.isdir(p) and ((self.is_hidden(p) and bool(int(show_hidden))) or not self.is_hidden(p)):

couchpotato/core/plugins/manage.py

@@ -4,6 +4,7 @@ import sys
 import time
 import traceback
 
+from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import sp
@@ -179,6 +180,10 @@ class Manage(Plugin):
                     if self.shuttingDown():
                         break
 
+                if not self.shuttingDown():
+                    db = get_db()
+                    db.reindex()
+
             Env.prop(last_update_key, time.time())
         except:
             log.error('Failed updating library: %s', (traceback.format_exc()))

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/core/plugins/scanner.py

@@ -105,7 +105,7 @@ class Scanner(Plugin):
         'HDTV': ['hdtv']
     }
 
-    clean = '([ _\,\.\(\)\[\]\-]|^)(3d|hsbs|sbs|half.sbs|full.sbs|ou|half.ou|full.ou|extended.cut|directors.cut|french|fr|swedisch|sw|danish|dutch|nl|swesub|subs|spanish|german|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdr|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip' \
+    clean = '([ _\,\.\(\)\[\]\-]|^)(3d|hsbs|sbs|half.sbs|full.sbs|ou|half.ou|full.ou|extended|extended.cut|directors.cut|french|fr|swedisch|sw|danish|dutch|nl|swesub|subs|spanish|german|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdr|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip' \
             '|hdtvrip|webdl|web.dl|webrip|web.rip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|video_ts|audio_ts|480p|480i|576p|576i|720p|720i|1080p|1080i|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|hc|\[.*\])(?=[ _\,\.\(\)\[\]\-]|$)'
     multipart_regex = [
         '[ _\.-]+cd[ _\.-]*([0-9a-d]+)',  #*cd1
@@ -634,7 +634,14 @@ class Scanner(Plugin):
 
                     name_year = self.getReleaseNameYear(identifier, file_name = filename if not group['is_dvd'] else None)
                     if name_year.get('name') and name_year.get('year'):
-                        movie = fireEvent('movie.search', q = '%(name)s %(year)s' % name_year, merge = True, limit = 1)
+                        search_q = '%(name)s %(year)s' % name_year
+                        movie = fireEvent('movie.search', q = search_q, merge = True, limit = 1)
+
+                        # Try with other
+                        if len(movie) == 0 and name_year.get('other') and name_year['other'].get('name') and name_year['other'].get('year'):
+                            search_q2 = '%(name)s %(year)s' % name_year
+                            if search_q2 != search_q:
+                                movie = fireEvent('movie.search', q = '%(name)s %(year)s' % name_year.get('other'), merge = True, limit = 1)
 
                         if len(movie) > 0:
                             imdb_id = movie[0].get('imdb')
@@ -938,8 +945,11 @@ class Scanner(Plugin):
                 pass
 
         if cp_guess.get('year') == guess.get('year') and len(cp_guess.get('name', '')) > len(guess.get('name', '')):
+            cp_guess['other'] = guess
             return cp_guess
         elif guess == {}:
+            cp_guess['other'] = guess
             return cp_guess
 
+        guess['other'] = cp_guess
         return guess

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