Merge pull request #404 from WebSpider/dev-replace_fix

Process showname only if it's present

sickbeard/helpers.py

@@ -658,24 +658,26 @@ def sanitizeSceneName(name, ezrss=False):
     Returns: A string containing the scene version of the show name given.
     """
 
-    if not ezrss:
-        bad_chars = u",:()'!?\u2019"
-    # ezrss leaves : and ! in their show names as far as I can tell
-    else:
-        bad_chars = u",()'?\u2019"
+    if name:
 
-    # strip out any bad chars
-    for x in bad_chars:
-        name = name.replace(x, "")
+        if not ezrss:
+            bad_chars = u",:()'!?\u2019"
+        # ezrss leaves : and ! in their show names as far as I can tell
+        else:
+            bad_chars = u",()'?\u2019"
 
-    # tidy up stuff that doesn't belong in scene names
-    name = name.replace("- ", ".").replace(" ", ".").replace("&", "and").replace('/', '.')
-    name = re.sub("\.\.*", ".", name)
+        # strip out any bad chars
+        for x in bad_chars:
+            name = name.replace(x, "")
 
-    if name.endswith('.'):
-        name = name[:-1]
+        # tidy up stuff that doesn't belong in scene names
+        name = name.replace("- ", ".").replace(" ", ".").replace("&", "and").replace('/', '.')
+        name = re.sub("\.\.*", ".", name)
 
-    return name
+        if name.endswith('.'):
+            name = name[:-1]
+
+        return name
 
 
 def create_https_certificates(ssl_cert, ssl_key):