Fix mixed line endings

Author: Patrick Vos

sickbeard/postProcessor.py

@@ -157,16 +157,16 @@ def list_associated_files(self, file_path, base_name_only=False):
         base_name = file_path.rpartition('.')[0]
 
         if not base_name_only:
-            base_name = base_name + '.'
-
+            base_name = base_name + '.'
+
         # don't strip it all and use cwd by accident
         if not base_name:
             return []
 
         # don't confuse glob with chars we didn't mean to use
         base_name = re.sub(r'[\[\]\*\?]', r'[\g<0>]', base_name)
 
-        for associated_file_path in ek.ek(glob.glob, base_name + '*'):
+        for associated_file_path in ek.ek(glob.glob, base_name + '*'):
             # only add associated to list
             if associated_file_path == file_path:
                 continue
@@ -228,23 +228,23 @@ def _combined_file_operation(self, file_path, new_path, new_base_name, associate
             self._log(u"There were no files associated with " + file_path + ", not moving anything", logger.DEBUG)
             return
 
-        # create base name with file_path (media_file without .extension)
-        old_base_name = file_path.rpartition('.')[0]
-        old_base_name_length = len(old_base_name)
-
+        # create base name with file_path (media_file without .extension)
+        old_base_name = file_path.rpartition('.')[0]
+        old_base_name_length = len(old_base_name)
+
         # deal with all files
         for cur_file_path in file_list:
             cur_file_name = ek.ek(os.path.basename, cur_file_path)
-            # get the extension without .
-            cur_extension = cur_file_path[old_base_name_length + 1:]
+            # get the extension without .
+            cur_extension = cur_file_path[old_base_name_length + 1:]
 
             # replace .nfo with .nfo-orig to avoid conflicts
             if cur_extension == 'nfo':
                 cur_extension = 'nfo-orig'
 
             # If new base name then convert name
             if new_base_name:
-                new_file_name = new_base_name + '.' + cur_extension
+                new_file_name = new_base_name + '.' + cur_extension
             # if we're not renaming we still want to change extensions sometimes
             else:
                 new_file_name = helpers.replaceExtension(cur_file_name, cur_extension)
@@ -709,13 +709,13 @@ def process(self):
 
         self._log(u"Processing " + self.file_path + " (" + str(self.nzb_name) + ")")
 
-        if ek.ek(os.path.isdir, self.file_path):
-            self._log(u"File " + self.file_path + " seems to be a directory")
-            return False
-        for ignore_file in self.IGNORED_FILESTRINGS:
-            if ignore_file in self.file_path:
-                self._log(u"File " + self.file_path + " is ignored type, skipping")
-                return False
+        if ek.ek(os.path.isdir, self.file_path):
+            self._log(u"File " + self.file_path + " seems to be a directory")
+            return False
+        for ignore_file in self.IGNORED_FILESTRINGS:
+            if ignore_file in self.file_path:
+                self._log(u"File " + self.file_path + " is ignored type, skipping")
+                return False
         # reset per-file stuff
         self.in_history = False
 
@@ -863,10 +863,10 @@ def process(self):
         ep_obj.createMetaFiles()
         ep_obj.saveToDB()
 
-        # do the library update for XBMC
+        # do the library update for XBMC
         notifiers.xbmc_notifier.update_library(ep_obj.show.name)
 
-        # do the library update for Plex
+        # do the library update for Plex
         notifiers.plex_notifier.update_library()
 
         # do the library update for NMJ
@@ -877,8 +877,8 @@ def process(self):
 
         # do the library update for pyTivo
         notifiers.pytivo_notifier.update_library(ep_obj)
-
-        # do the library update for Trakt
+
+        # do the library update for Trakt
         notifiers.trakt_notifier.update_library(ep_obj)
 
         self._run_extra_scripts(ep_obj)