Merge pull request #1885 from miigotu/fix-funky-quality-names

Fix funky Quality Names. Fixes SiCKRAGETV/sickrage-issues#1508

sickbeard/common.py

@@ -106,7 +106,7 @@ class Quality:
                       SDTV: "SDTV",
                       SDDVD: "SD DVD",
                       HDTV: "HDTV",
-                      RAWHDTV: "RawHD TV",
+                      RAWHDTV: "RawHD",
                       FULLHDTV: "1080p HDTV",
                       HDWEBDL: "720p WEB-DL",
                       FULLHDWEBDL: "1080p WEB-DL",
@@ -156,21 +156,25 @@ class Quality:
         If no quality is achieved it will try sceneQuality regex
         """
 
+        #Try Scene names first
+        quality = Quality.sceneQuality(name, anime)
+        if quality != Quality.UNKNOWN:
+            return quality
+
         name = os.path.basename(name)
 
         # if we have our exact text then assume we put it there
         for x in sorted(Quality.qualityStrings.keys(), reverse=True):
-            if x == Quality.UNKNOWN:
+            if x == Quality.UNKNOWN or x == Quality.NONE:
                 continue
 
-            if x == Quality.NONE:  #Last chance
-                return Quality.sceneQuality(name, anime)
-
             regex = '\W' + Quality.qualityStrings[x].replace(' ', '\W') + '\W'
             regex_match = re.search(regex, name, re.I)
             if regex_match:
                 return x
 
+        return Quality.UNKNOWN
+
     @staticmethod
     def sceneQuality(name, anime=False):
         """

tests/common_tests.py

@@ -91,7 +91,7 @@ class QualityTests(unittest.TestCase):
         self.assertEqual(common.Quality.SDTV, common.Quality.nameQuality("Test Show - S01E02 - SDTV - GROUP"))
         self.assertEqual(common.Quality.SDDVD, common.Quality.nameQuality("Test Show - S01E02 - SD DVD - GROUP"))
         self.assertEqual(common.Quality.HDTV, common.Quality.nameQuality("Test Show - S01E02 - HDTV - GROUP"))
-        self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test Show - S01E02 - RawHD TV - GROUP"))
+        self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test Show - S01E02 - RawHD - GROUP"))
         self.assertEqual(common.Quality.FULLHDTV, common.Quality.nameQuality("Test Show - S01E02 - 1080p HDTV - GROUP"))
         self.assertEqual(common.Quality.HDWEBDL, common.Quality.nameQuality("Test Show - S01E02 - 720p WEB-DL - GROUP"))
         self.assertEqual(common.Quality.FULLHDWEBDL, common.Quality.nameQuality("Test Show - S01E02 - 1080p WEB-DL - GROUP"))