diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index ffa7eaf9..ce616fb3 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -38,7 +38,6 @@ def mainlist(item): def search(item, text): - findhost() support.log("[streamingaltadefinizione.py] " + item.url + " search " + text) item.url = item.url + "/?s=" + text diff --git a/core/support.py b/core/support.py index 1d79d976..105463c9 100644 --- a/core/support.py +++ b/core/support.py @@ -239,7 +239,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t title = episode + (s if episode and title else '') + title longtitle = title + (s if title and title2 else '') + title2 longtitle = typo(longtitle, 'bold') - longtitle += (typo(Type,'_ () bold') if Type else '') + (typo(quality, '_ [] color kod') if quality else '') + longtitle += typo(quality, '_ [] color kod') if quality else '' lang1, longtitle = scrapeLang(scraped, lang, longtitle) @@ -530,7 +530,11 @@ def dooplay_search(item, blacklist=""): def dooplay_search_vars(item, blacklist): - if item.contentType == 'movie': + if item.contentType == 'list': # ricerca globale + type = '(?Pmovies|tvshows)' + typeActionDict = {'findvideos': ['movies'], 'episodios': ['tvshows']} + typeContentDict = {'movie': ['movies'], 'episode': ['tvshows']} + elif item.contentType == 'movie': type = 'movies' action = 'findvideos' else: diff --git a/platformcode/updater.py b/platformcode/updater.py index 5a11a75f..2ecc72fb 100644 --- a/platformcode/updater.py +++ b/platformcode/updater.py @@ -243,11 +243,12 @@ def updateFromZip(): try: hash = fixZipGetHash(localfilename) import zipfile - with zipfile.ZipFile(localfilename, "r") as zip_ref: + with zipfile.ZipFile(io.FileIO(localfilename), "r") as zip_ref: zip_ref.extractall(destpathname) except Exception as e: logger.info('Non sono riuscito ad estrarre il file zip') logger.info(e) + dp.close() return False dp.update(95)