mirror of
https://github.com/moparisthebest/SickRage
synced 2024-12-12 19:12:26 -05:00
Fix for anime showObj regex matching.
Fix for xbmc notifier.
This commit is contained in:
parent
c7e58cadb5
commit
9dd679e30f
@ -125,7 +125,7 @@ class NameParser(object):
|
|||||||
# Regex pattern to return the Show / Series Name regardless of the file pattern tossed at it, matched 53 show name examples from regexes.py
|
# Regex pattern to return the Show / Series Name regardless of the file pattern tossed at it, matched 53 show name examples from regexes.py
|
||||||
show_patterns = [
|
show_patterns = [
|
||||||
'''^(?P<show_name>.*)\W+(?:(?:S\d[\dE._ -])|(?:\d\d?x)|(?:\d{4}\W\d\d\W\d\d)|(?:(?:part|pt)[\._ -]?(\d|[ivx]))|Season\W+\d+\W+|E\d+\W+|(?:\d{1,3}.+\d{1,}[a-zA-Z]{2}\W+[a-zA-Z]{3,}\W+\d{4}.+))''',
|
'''^(?P<show_name>.*)\W+(?:(?:S\d[\dE._ -])|(?:\d\d?x)|(?:\d{4}\W\d\d\W\d\d)|(?:(?:part|pt)[\._ -]?(\d|[ivx]))|Season\W+\d+\W+|E\d+\W+|(?:\d{1,3}.+\d{1,}[a-zA-Z]{2}\W+[a-zA-Z]{3,}\W+\d{4}.+))''',
|
||||||
'''^((\[.*?\])|(\d+[\.-]))*[ _\.]*(?P<show_name>.*)(([ ._-]+\d+)|([ ._-]+s\d{2})).*'''
|
'''^((\[.*?\])|(\d+[\.-]))*[ _\.]*(?P<show_name>.*?)(([ ._-]+\d+)|([ ._-]+s\d{2})).*'''
|
||||||
]
|
]
|
||||||
|
|
||||||
# find show object
|
# find show object
|
||||||
|
@ -460,7 +460,7 @@ class XBMCNotifier:
|
|||||||
pathResponse = self._send_to_xbmc_json(pathCommand, host)
|
pathResponse = self._send_to_xbmc_json(pathCommand, host)
|
||||||
|
|
||||||
path = pathResponse["result"]["tvshowdetails"]["file"]
|
path = pathResponse["result"]["tvshowdetails"]["file"]
|
||||||
logger.log(u"Received Show: " + show["label"] + " with ID: " + str(tvshowid) + " Path: " + path,
|
logger.log(u"Received Show: " + showName + " with ID: " + str(tvshowid) + " Path: " + path,
|
||||||
logger.DEBUG)
|
logger.DEBUG)
|
||||||
|
|
||||||
if (len(path) < 1):
|
if (len(path) < 1):
|
||||||
|
Loading…
Reference in New Issue
Block a user