diff --git a/lib/unshortenit.py b/lib/unshortenit.py index ccd9d725..f13938cc 100644 --- a/lib/unshortenit.py +++ b/lib/unshortenit.py @@ -482,6 +482,7 @@ class UnshortenIt(object): def _unshorten_vcrypt(self, uri): + uri = uri.replace('.net','.pw') try: headers = {} if 'myfoldersakstream.php' in uri or '/verys/' in uri: @@ -522,10 +523,10 @@ class UnshortenIt(object): prev_uri = uri uri = r.headers['location'] if uri == prev_uri: + logger.info('Use Cloudscraper') uri = httptools.downloadpage(uri, timeout=self._timeout, headers=headers, follow_redirects=False, cf=True).headers['location'] if "4snip" in uri: - logger.info('4SNIP: ' + uri) if 'out_generator' in uri: uri = re.findall('url=(.*)$', uri)[0] elif '/decode/' in uri: diff --git a/specials/autorenumber.py b/specials/autorenumber.py index d316ae89..63293a48 100644 --- a/specials/autorenumber.py +++ b/specials/autorenumber.py @@ -52,11 +52,16 @@ TAG_TYPE = "Type" def renumber(itemlist, item='', typography=''): log() - dict_series = load(itemlist[0]) + dict_series = load(itemlist[0]) if len(itemlist) > 0 else {} if item: item.channel = item.from_channel if item.from_channel else item.channel title = item.fulltitle.rstrip() + if item.channel in item.channel_prefs and TAG_TVSHOW_RENUMERATE in item.channel_prefs[item.channel] and title not in dict_series: + from core.videolibrarytools import check_renumber_options + from specials.videolibrary import update_videolibrary + check_renumber_options(item) + update_videolibrary(item) if inspect.stack()[2][3] == 'find_episodes': return itemlist