Private GIT

Skip to content
Snippets Groups Projects
Commit a91513fd authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Fix undefined FULLHDWEBDL, make common.py lintable by fixing a few problems...

Fix undefined FULLHDWEBDL, make common.py lintable by fixing a few problems and disabling some lint checks
parent f0252497
No related branches found
No related tags found
No related merge requests found
...@@ -107,7 +107,7 @@ multiEpStrings[NAMING_EXTEND] = "Extend" ...@@ -107,7 +107,7 @@ multiEpStrings[NAMING_EXTEND] = "Extend"
multiEpStrings[NAMING_LIMITED_EXTEND] = "Extend (Limited)" multiEpStrings[NAMING_LIMITED_EXTEND] = "Extend (Limited)"
multiEpStrings[NAMING_LIMITED_EXTEND_E_PREFIXED] = "Extend (Limited, E-prefixed)" multiEpStrings[NAMING_LIMITED_EXTEND_E_PREFIXED] = "Extend (Limited, E-prefixed)"
# pylint: disable=W0232,C1001
class Quality: class Quality:
NONE = 0 # 0 NONE = 0 # 0
SDTV = 1 # 1 SDTV = 1 # 1
...@@ -172,9 +172,9 @@ class Quality: ...@@ -172,9 +172,9 @@ class Quality:
:return: Human readable status value :return: Human readable status value
""" """
toReturn = {} toReturn = {}
for x in Quality.qualityStrings.keys(): for q in Quality.qualityStrings.keys():
toReturn[Quality.compositeStatus(status, x)] = Quality.statusPrefixes[status] + " (" + \ toReturn[Quality.compositeStatus(status, q)] = Quality.statusPrefixes[status] + " (" + \
Quality.qualityStrings[x] + ")" Quality.qualityStrings[q] + ")"
return toReturn return toReturn
@staticmethod @staticmethod
...@@ -229,8 +229,9 @@ class Quality: ...@@ -229,8 +229,9 @@ class Quality:
:param anime: Boolean to indicate if the show we're resolving is Anime :param anime: Boolean to indicate if the show we're resolving is Anime
:return: Quality prefix :return: Quality prefix
""" """
ret = Quality.UNKNOWN
if not name: if not name:
return Quality.UNKNOWN return ret
name = os.path.basename(name) name = os.path.basename(name)
...@@ -244,46 +245,46 @@ class Quality: ...@@ -244,46 +245,46 @@ class Quality:
fullHD = checkName(["1080p", "1920x1080"], any) fullHD = checkName(["1080p", "1920x1080"], any)
if sdOptions and not blueRayOptions and not dvdOptions: if sdOptions and not blueRayOptions and not dvdOptions:
return Quality.SDTV ret = Quality.SDTV
elif dvdOptions: elif dvdOptions:
return Quality.SDDVD ret = Quality.SDDVD
elif hdOptions and not blueRayOptions and not fullHD: elif hdOptions and not blueRayOptions and not fullHD:
return Quality.HDTV ret = Quality.HDTV
elif fullHD and not blueRayOptions and not hdOptions: elif fullHD and not blueRayOptions and not hdOptions:
return Quality.FULLHDTV ret = Quality.FULLHDTV
elif hdOptions and not blueRayOptions and not fullHD: elif hdOptions and not blueRayOptions and not fullHD:
return Quality.HDWEBDL ret = Quality.HDWEBDL
elif blueRayOptions and hdOptions and not fullHD: elif blueRayOptions and hdOptions and not fullHD:
return Quality.HDBLURAY ret = Quality.HDBLURAY
elif blueRayOptions and fullHD and not hdOptions: elif blueRayOptions and fullHD and not hdOptions:
return Quality.FULLHDBLURAY ret = Quality.FULLHDBLURAY
else:
return Quality.UNKNOWN return ret
if checkName(["(pdtv|hdtv|dsr|tvrip).(xvid|x26[45]|h.?26[45])"], all) and not checkName(["(720|1080)[pi]"], all) and\ if checkName(["(pdtv|hdtv|dsr|tvrip).(xvid|x26[45]|h.?26[45])"], all) and not checkName(["(720|1080)[pi]"], all) and\
not checkName(["hr.ws.pdtv.x26[45]"], any): not checkName(["hr.ws.pdtv.x26[45]"], any):
return Quality.SDTV ret = Quality.SDTV
elif checkName(["web.dl|webrip", "xvid|x26[45]|h.?26[45]"], all) and not checkName(["(720|1080)[pi]"], all): elif checkName(["web.dl|webrip", "xvid|x26[45]|h.?26[45]"], all) and not checkName(["(720|1080)[pi]"], all):
return Quality.SDTV ret = Quality.SDTV
elif checkName(["(dvdrip|b[rd]rip|blue?-?ray)(.ws)?.(xvid|divx|x26[45])"], any) and not checkName(["(720|1080)[pi]"], all): elif checkName(["(dvdrip|b[rd]rip|blue?-?ray)(.ws)?.(xvid|divx|x26[45])"], any) and not checkName(["(720|1080)[pi]"], all):
return Quality.SDDVD ret = Quality.SDDVD
elif checkName(["720p", "hdtv", "x26[45]"], all) or checkName(["hr.ws.pdtv.x26[45]"], any) and not checkName( elif checkName(["720p", "hdtv", "x26[45]"], all) or checkName(["hr.ws.pdtv.x26[45]"], any) and not checkName(
["1080[pi]"], all): ["1080[pi]"], all):
return Quality.HDTV ret = Quality.HDTV
elif checkName(["720p|1080i", "hdtv", "mpeg-?2"], all) or checkName(["1080[pi].hdtv", "h.?26[45]"], all): elif checkName(["720p|1080i", "hdtv", "mpeg-?2"], all) or checkName(["1080[pi].hdtv", "h.?26[45]"], all):
return Quality.RAWHDTV ret = Quality.RAWHDTV
elif checkName(["1080p", "hdtv", "x26[45]"], all): elif checkName(["1080p", "hdtv", "x26[45]"], all):
return Quality.FULLHDTV ret = Quality.FULLHDTV
elif checkName(["720p", "web.?dl|webrip"], all) or checkName(["720p", "itunes", "h.?26[45]"], all): elif checkName(["720p", "web.?dl|webrip"], all) or checkName(["720p", "itunes", "h.?26[45]"], all):
return Quality.HDWEBDL ret = Quality.HDWEBDL
elif checkName(["1080p", "web.?dl|webrip"], all) or checkName(["1080p", "itunes", "h.?26[45]"], all): elif checkName(["1080p", "web.?dl|webrip"], all) or checkName(["1080p", "itunes", "h.?26[45]"], all):
return Quality.FULLHDWEBDL ret = Quality.FULLHDWEBDL
elif checkName(["720p", "blue?-?ray|hddvd|b[rd]rip", "x26[45]"], all): elif checkName(["720p", "blue?-?ray|hddvd|b[rd]rip", "x26[45]"], all):
return Quality.HDBLURAY ret = Quality.HDBLURAY
elif checkName(["1080p", "blue?-?ray|hddvd|b[rd]rip", "x26[45]"], all): elif checkName(["1080p", "blue?-?ray|hddvd|b[rd]rip", "x26[45]"], all):
return Quality.FULLHDBLURAY ret = Quality.FULLHDBLURAY
else:
return Quality.UNKNOWN return ret
@staticmethod @staticmethod
def assumeQuality(name): def assumeQuality(name):
...@@ -315,6 +316,7 @@ class Quality: ...@@ -315,6 +316,7 @@ class Quality:
try: try:
parser = createParser(filename) parser = createParser(filename)
# pylint: disable=W0703
except Exception: except Exception:
parser = None parser = None
...@@ -323,12 +325,15 @@ class Quality: ...@@ -323,12 +325,15 @@ class Quality:
try: try:
metadata = extractMetadata(parser) metadata = extractMetadata(parser)
# pylint: disable=W0703
except Exception: except Exception:
metadata = None metadata = None
try: try:
# pylint: disable=W0212
parser.stream._input.close() parser.stream._input.close()
except: # pylint: disable=W0703
except Exception:
pass pass
if not metadata: if not metadata:
...@@ -353,7 +358,7 @@ class Quality: ...@@ -353,7 +358,7 @@ class Quality:
ret = Quality.UNKNOWN ret = Quality.UNKNOWN
if height > 1000: if height > 1000:
ret = ((Quality.FULLHDTV, Quality.FULLHDBLURAY)[bluray], FULLHDWEBDL)[webdl] ret = ((Quality.FULLHDTV, Quality.FULLHDBLURAY)[bluray], Quality.FULLHDWEBDL)[webdl]
elif height > 680 and height < 800: elif height > 680 and height < 800:
ret = ((Quality.HDTV, Quality.HDBLURAY)[bluray], Quality.HDWEBDL)[webdl] ret = ((Quality.HDTV, Quality.HDBLURAY)[bluray], Quality.HDWEBDL)[webdl]
elif height < 680: elif height < 680:
...@@ -375,9 +380,9 @@ class Quality: ...@@ -375,9 +380,9 @@ class Quality:
if status == UNKNOWN: if status == UNKNOWN:
return (UNKNOWN, Quality.UNKNOWN) return (UNKNOWN, Quality.UNKNOWN)
for x in sorted(Quality.qualityStrings.keys(), reverse=True): for q in sorted(Quality.qualityStrings.keys(), reverse=True):
if status > x * 100: if status > q * 100:
return (status - x * 100, x) return (status - q * 100, q)
return (status, Quality.NONE) return (status, Quality.NONE)
...@@ -431,6 +436,7 @@ qualityPresetStrings = {SD: "SD", ...@@ -431,6 +436,7 @@ qualityPresetStrings = {SD: "SD",
ANY: "Any"} ANY: "Any"}
# pylint: disable=R0903,C1001
class StatusStrings: class StatusStrings:
def __init__(self): def __init__(self):
self.statusStrings = {UNKNOWN: "Unknown", self.statusStrings = {UNKNOWN: "Unknown",
...@@ -463,7 +469,9 @@ class StatusStrings: ...@@ -463,7 +469,9 @@ class StatusStrings:
statusStrings = StatusStrings() statusStrings = StatusStrings()
# pylint: disable=R0903,C1001
class Overview: class Overview:
UNAIRED = UNAIRED # 1 UNAIRED = UNAIRED # 1
QUAL = 2 QUAL = 2
WANTED = WANTED # 3 WANTED = WANTED # 3
...@@ -480,6 +488,7 @@ class Overview: ...@@ -480,6 +488,7 @@ class Overview:
UNAIRED: "unaired", UNAIRED: "unaired",
SNATCHED: "snatched"} SNATCHED: "snatched"}
# Get our xml namespaces correct for lxml # Get our xml namespaces correct for lxml
XML_NSMAP = {'xsi': 'http://www.w3.org/2001/XMLSchema-instance', XML_NSMAP = {'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
'xsd': 'http://www.w3.org/2001/XMLSchema'} 'xsd': 'http://www.w3.org/2001/XMLSchema'}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment