Merge branch 'refs/heads/develop'

couchpotato/core/downloaders/blackhole/__init__.py

@@ -13,7 +13,7 @@ config = [{
             'list': 'download_providers',
             'name': 'blackhole',
             'label': 'Black hole',
-            'description': 'Download the NZB/Torrent to a specific folder.',
+            'description': 'Download the NZB/Torrent to a specific folder. <em>Note: Seeding and copying/linking features do <strong>not</strong> work with Black hole</em>.',
             'wizard': True,
             'options': [
                 {

couchpotato/core/helpers/encoding.py

@@ -49,8 +49,17 @@ def ss(original, *args):
         return u_original.encode('UTF-8')
 
 def sp(path, *args):
+
     # Standardise encoding, normalise case, path and strip trailing '/' or '\'
-    return os.path.normcase(os.path.normpath(ss(path, *args))).rstrip(os.path.sep)
+    if not path or len(path) == 0:
+        return path
+
+    path = os.path.normcase(os.path.normpath(ss(path, *args)))
+
+    if path != os.path.sep:
+        path = path.rstrip(os.path.sep)
+
+    return path
 
 def ek(original, *args):
     if isinstance(original, (str, unicode)):

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

@@ -53,6 +53,7 @@ class MovieBase(MovieTypeBase):
             'params': {
                 'identifier': {'desc': 'IMDB id of the movie your want to add.'},
                 'profile_id': {'desc': 'ID of quality profile you want the add the movie in. If empty will use the default profile.'},
+                'category_id': {'desc': 'ID of category you want the add the movie in. If empty will use no category.'},
                 'title': {'desc': 'Movie title to use for searches. Has to be one of the titles returned by movie.search.'},
             }
         })

couchpotato/core/plugins/renamer/main.py

@@ -83,6 +83,7 @@ class Renamer(Plugin):
         }
 
     def scan(self, release_download = None):
+        if not release_download: release_download = {}
 
         if self.isDisabled():
             return
@@ -95,7 +96,7 @@ class Renamer(Plugin):
         to_folder = sp(self.conf('to'))
 
         # Get movie folder to process
-        movie_folder = release_download and release_download.get('folder')
+        movie_folder = release_download.get('folder')
 
         # Get all folders that should not be processed
         no_process = [to_folder]
@@ -122,7 +123,7 @@ class Renamer(Plugin):
             log.debug('The provided movie folder %s does not exist. Trying to find it in the \'from\' folder.', movie_folder)
 
             # Update to the from folder
-            if len(release_download.get('files')) == 1:
+            if len(splitString(release_download.get('files'), '|')) == 1:
                 new_movie_folder = from_folder
             else:
                 new_movie_folder = os.path.join(from_folder, os.path.basename(movie_folder))

couchpotato/templates/index.html

@@ -4,6 +4,8 @@
 	<head>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
 		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="mobile-web-app-capable" content="yes">
+
 
 		{% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'front', single = True) %}
 		<link rel="stylesheet" href="{{ Env.get('web_base') }}{{ url }}" type="text/css">{% end %}