Merge branch 'develop'

couchpotato/core/plugins/base.py

@@ -370,14 +370,16 @@ class Plugin(object):
 
     def cpTag(self, media, unique_tag = False):
 
-        identifier = getIdentifier(media) or ''
+        tag = ''
-        unique_tag = ', ' + randomString() if unique_tag else ''
+        if Env.setting('enabled', 'renamer') or unique_tag:
+            identifier = getIdentifier(media) or ''
+            unique_tag = ', ' + randomString() if unique_tag else ''
 
-        tag = '.cp('
+            tag = '.cp('
-        tag += identifier
+            tag += identifier
-        tag += ', ' if unique_tag and identifier else ''
+            tag += ', ' if unique_tag and identifier else ''
-        tag += randomString() if unique_tag else ''
+            tag += randomString() if unique_tag else ''
-        tag += ')'
+            tag += ')'
 
         return tag if len(tag) > 7 else ''
 

couchpotato/core/plugins/renamer.py

@@ -373,10 +373,6 @@ class Renamer(Plugin):
                         elif file_type is 'nfo':
                             final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True)
 
-                        # Seperator replace
-                        if separator:
-                            final_file_name = final_file_name.replace(' ', separator)
-
                         # Move DVD files (no structure renaming)
                         if group['is_dvd'] and file_type is 'movie':
                             found = False

couchpotato/static/scripts/page/settings.js

@@ -560,11 +560,19 @@ Option.Password = new Class({
 	create: function(){
 		var self = this;
 
-		self.parent();
+		self.el.adopt(
-		self.input.set('type', 'password');
+			self.createLabel(),
+			self.input = new Element('input.inlay', {
+				'type': 'text',
+				'name': self.postName(),
+				'value': self.getSettingValue() ? '********' : '',
+				'placeholder': self.getPlaceholder()
+			})
+		);
 
 		self.input.addEvent('focus', function(){
-			self.input.set('value', '')
+			self.input.set('value', '');
+			self.input.set('type', 'password');
 		})
 
 	}