Merge branch 'refs/heads/develop' into tv

couchpotato/core/plugins/category/static/category.js

@@ -271,6 +271,11 @@ var Category = new Class({
 
 	del: function(){
 		var self = this;
+		
+		if(self.data.label == undefined){
+			self.el.destroy();
+			return;
+		}
 
 		var label = self.el.getElement('.category_label input').get('value');
 		var qObj = new Question('Are you sure you want to delete <strong>"'+label+'"</strong>?', '', [{

couchpotato/core/plugins/log/main.py

@@ -120,7 +120,7 @@ class Logging(Plugin):
             path = '%s%s' % (Env.get('log_path'), '.%s' % x if x > 0 else '')
 
             if not os.path.isfile(path):
-                break
+                continue
 
             try:
 

couchpotato/core/plugins/renamer/main.py

@@ -129,6 +129,7 @@ class Renamer(Plugin):
         download_info = self.extendDownloadInfo(download_info)
 
         # Unpack any archives
+        extr_files = None
         if self.conf('unrar'):
             folder, movie_folder, files, extr_files = self.extractFiles(folder = folder, movie_folder = movie_folder, files = files, \
                 cleanup = self.conf('cleanup') and not self.downloadIsTorrent(download_info))
@@ -187,7 +188,8 @@ class Renamer(Plugin):
                 fireEvent('renamer.before', group)
 
                 # Add extracted files to the before_rename list
-                group['before_rename'].extend(extr_files)
+                if extr_files:
+                    group['before_rename'].extend(extr_files)
 
                 # Remove weird chars from moviename
                 movie_name = re.sub(r"[\x00\/\\:\*\?\"<>\|]", '', movie_title)

couchpotato/core/plugins/scanner/main.py

@@ -120,13 +120,17 @@ class Scanner(Plugin):
                 files = []
                 for root, dirs, walk_files in os.walk(folder):
                     files.extend(os.path.join(root, filename) for filename in walk_files)
+
+                    # Break if CP wants to shut down
+                    if self.shuttingDown():
+                        break
+
             except:
                 log.error('Failed getting files from %s: %s', (folder, traceback.format_exc()))
         else:
             check_file_date = False
             files = [ss(x) for x in files]
 
-        db = get_session()
 
         for file_path in files:
 
@@ -339,6 +343,7 @@ class Scanner(Plugin):
             download_info = None
 
         # Determine file types
+        db = get_session()
         processed_movies = {}
         while True and not self.shuttingDown():
             try:
@@ -761,7 +766,7 @@ class Scanner(Plugin):
 
         # Year
         year = self.findYear(identifier)
-        if year:
+        if year and identifier[:4] != year:
             identifier = '%s %s' % (identifier.split(year)[0].strip(), year)
         else:
             identifier = identifier.split('::')[0]

couchpotato/core/plugins/suggestion/static/suggest.js

@@ -43,6 +43,8 @@ var SuggestList = new Class({
 	fill: function(json){
 
 		var self = this;
+		
+		if(!json) return;
 
 		Object.each(json.suggestions, function(movie){
 

couchpotato/core/plugins/userscript/main.py

@@ -81,8 +81,6 @@ class Userscript(Plugin):
 
     def getViaUrl(self, url = None, **kwargs):
 
-        print url
-
         params = {
             'url': url,
             'movie': fireEvent('userscript.get_movie_via_url', url = url, single = True)