mirror of
https://github.com/moparisthebest/SickRage
synced 2024-11-13 21:05:11 -05:00
d02c0bd6eb
Fixed charmap issues for anime show names. Fixed issues with display show page and epCat key errors. Fixed duplicate log messages for clearing provider caches. Fixed issues with email notifier ep names not properly being encoded to UTF-8. TVDB<->TVRAGE Indexer ID mapping is now performed on demand to be used when needed such as newznab providers can be searched with tvrage_id's and some will return tvrage_id's that later can be used to create show objects from for faster and more accurate name parsing, mapping is done via Trakt API calls. Added stop event signals to schedualed tasks, SR now waits indefinate till task has been fully stopped before completing a restart or shutdown event. NameParserCache is now persistent and stores 200 parsed results at any given time for quicker lookups and better performance, this helps maintain results between updates or shutdown/startup events. Black and White lists for anime now only get used for anime shows as intended, performance gain for non-anime shows that dont need to load these lists. Internal name cache now builds it self on demand when needed per show request plus checks if show is already in cache and if true exits routine to save time. Schedualer and QueueItems classes are now a sub-class of threading.Thread and a stop threading event signal has been added to each. If I forgot to list something it doesn't mean its not fixed so please test and report back if anything is wrong or has been corrected by this new release.
74 lines
2.5 KiB
Python
74 lines
2.5 KiB
Python
# Author: Nic Wolfe <nic@wolfeden.ca>
|
|
# URL: http://code.google.com/p/sickbeard/
|
|
#
|
|
# This file is part of SickRage.
|
|
#
|
|
# SickRage is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# SickRage is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with SickRage. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import os
|
|
|
|
from sickbeard import logger
|
|
import sickbeard
|
|
|
|
# This module tries to deal with the apparently random behavior of python when dealing with unicode <-> utf-8
|
|
# encodings. It tries to just use unicode, but if that fails then it tries forcing it to utf-8. Any functions
|
|
# which return something should always return unicode.
|
|
|
|
def fixStupidEncodings(x, silent=False):
|
|
if type(x) == str:
|
|
try:
|
|
return x.decode(sickbeard.SYS_ENCODING)
|
|
except UnicodeDecodeError:
|
|
logger.log(u"Unable to decode value: " + repr(x), logger.ERROR)
|
|
return None
|
|
elif type(x) == unicode:
|
|
return x
|
|
else:
|
|
logger.log(
|
|
u"Unknown value passed in, ignoring it: " + str(type(x)) + " (" + repr(x) + ":" + repr(type(x)) + ")",
|
|
logger.DEBUG if silent else logger.ERROR)
|
|
return None
|
|
|
|
|
|
|
|
def fixListEncodings(x):
|
|
if type(x) != list and type(x) != tuple:
|
|
return x
|
|
else:
|
|
return filter(lambda x: x != None, map(fixStupidEncodings, x))
|
|
|
|
|
|
def callPeopleStupid(x):
|
|
try:
|
|
return x.encode(sickbeard.SYS_ENCODING)
|
|
except UnicodeEncodeError:
|
|
logger.log(
|
|
u"YOUR COMPUTER SUCKS! Your data is being corrupted by a bad locale/encoding setting. Report this error on the forums or IRC please: " + repr(
|
|
x) + ", " + sickbeard.SYS_ENCODING, logger.ERROR)
|
|
return x.encode(sickbeard.SYS_ENCODING, 'ignore')
|
|
|
|
|
|
def ek(func, *args, **kwargs):
|
|
if os.name == 'nt':
|
|
result = func(*args, **kwargs)
|
|
else:
|
|
result = func(*[callPeopleStupid(x) if type(x) in (str, unicode) else x for x in args], **kwargs)
|
|
|
|
if type(result) in (list, tuple):
|
|
return fixListEncodings(result)
|
|
elif type(result) == str:
|
|
return fixStupidEncodings(result)
|
|
else:
|
|
return result
|