From 029c8a682d1ff96868646cb4bce7b8582e3785e2 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 1 Feb 2020 18:54:22 +0100 Subject: [PATCH 1/6] Fix CB01 --- channels/cineblog01.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index be882be5..55bc14ea 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -145,7 +145,8 @@ def peliculas(item): patron = r'src="(?P[^"]+)" alt="(?P.*?)(?: – \d+×\d+)?(?:"| – )(?:(?P<lang>Sub-ITA|ITA))?[^>]*>[^>]+>[^>]+><a href="(?P<url>[^"]+)".*?<div class="rpwe-summary">.*?\((?P<year>\d{4})[^\)]*\) (?P<plot>[^<]+)<' action = 'episodios' elif '/serietv/' not in item.url: - patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt.*?<a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?.*?<strong>(?P<genre>[^<>&–]+).*?DURATA (?P<duration>[0-9]+).*?<br(?: /)?>(?P<plot>[^<>]+)' + patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<genre>[^<>&–]+)(?:[^ ]+\s*DURATA\s*(?P<duration>[0-9]+)[^>]+>[^>]+>[^>]+>(?P<plot>[^<>]+))?' + # patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt.*?<a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?.*?<strong>(?P<genre>[^<>&–]+).*?DURATA (?P<duration>[0-9]+).*?<br(?: /)?>(?P<plot>[^<>]+)' action = 'findvideos' else: # debug = True From 34d644435c0cff684710429eef623ec1b99adb22 Mon Sep 17 00:00:00 2001 From: Alhaziel <alhaziel01@gmail.com> Date: Sat, 1 Feb 2020 19:01:15 +0100 Subject: [PATCH 2/6] Fix Salva Link --- core/tmdb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/tmdb.py b/core/tmdb.py index a369f6d0..06c919ed 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -183,7 +183,7 @@ def cache_response(fn): # logger.debug("TARDADO %s" % elapsed_time) # error al obtener los datos - except Exception, ex: + except Exception as ex: message = "An exception of type %s occured. Arguments:\n%s" % (type(ex).__name__, repr(ex.args)) logger.error("error in: %s" % message) @@ -217,7 +217,7 @@ def set_infoLabels(source, seekTmdb=True, idioma_busqueda=def_lang, forced=False logger.debug("The data of %i links were obtained in %f seconds" % (len(source), time.time() - start_time)) else: ret = set_infoLabels_item(source, seekTmdb, idioma_busqueda) - logger.debug("The data of %i links were obtained in %f seconds" % (time.time() - start_time)) + logger.debug("The data were obtained in %f seconds" % (time.time() - start_time)) return ret @@ -878,7 +878,7 @@ class Tmdb(object): # logger.debug("result_data es %s" % dict_data) # error al obtener los datos - except Exception, ex: + except Exception as ex: message = "An exception of type %s occured. Arguments:\n%s" % (type(ex).__name__, repr(ex.args)) logger.error("error in: %s" % message) dict_data = {} From b44f5a8acfa7f461af7f4a65492072fc08330221 Mon Sep 17 00:00:00 2001 From: Alhaziel <alhaziel01@gmail.com> Date: Sat, 1 Feb 2020 19:12:21 +0100 Subject: [PATCH 3/6] Eurostreaming aggiornamento server --- channels/eurostreaming.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index 2101e2d4..ae2da54b 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -25,7 +25,7 @@ headers = [['Referer', host]] -list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload'] +list_servers = ['akstream', 'wstream', 'mixdrop', 'vidtome', 'turbovid', 'speedvideo', 'flashx', 'nowvideo', 'deltabit'] list_quality = ['default'] @support.menu From 633528e878f54d536981b2b108d3f07ef09ef410 Mon Sep 17 00:00:00 2001 From: Alhaziel <alhaziel01@gmail.com> Date: Sat, 1 Feb 2020 19:31:01 +0100 Subject: [PATCH 4/6] Aggiunta Sezione Live --- channels/raiplay.json | 2 +- channelselector.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/raiplay.json b/channels/raiplay.json index df743a5c..cf69a5b1 100644 --- a/channels/raiplay.json +++ b/channels/raiplay.json @@ -6,7 +6,7 @@ "language": ["ita"], "thumbnail": "raiplay.png", "banner": "raiplay.png", - "categories": ["movie", "tvshow", "documentary"], + "categories": ["movie", "tvshow", "documentary", "live"], "not_active": ["include_in_newest"], "settings": [], "cloudflare": true diff --git a/channelselector.py b/channelselector.py index 2eeeb8f0..ebafe694 100644 --- a/channelselector.py +++ b/channelselector.py @@ -80,7 +80,7 @@ def getchanneltypes(view="thumb_"): logger.info() # Lista de categorias - channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct"] # , "torrent" + channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct", "live"] # , "torrent" if config.get_setting("adult_mode") != 0: channel_types.append("adult") From 4871ed6fa705c7f0b2395d918a8b0cb52f51e186 Mon Sep 17 00:00:00 2001 From: Alhaziel <alhaziel01@gmail.com> Date: Sat, 1 Feb 2020 19:38:27 +0100 Subject: [PATCH 5/6] Aggiornati server fastsubita e nome server in plot --- channels/fastsubita.py | 2 +- core/support.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/channels/fastsubita.py b/channels/fastsubita.py index b96af5e8..a20d354c 100644 --- a/channels/fastsubita.py +++ b/channels/fastsubita.py @@ -23,7 +23,7 @@ from platformcode import config host = config.get_channel_url() headers = [['Referer', host]] -list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome'] +list_servers = ['wstream', 'upstream', 'flashx', 'vidoza', 'vidtome'] list_quality = ['default'] diff --git a/core/support.py b/core/support.py index b7f4870a..bd7f6802 100755 --- a/core/support.py +++ b/core/support.py @@ -1018,6 +1018,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru item.title = typo(item.contentTitle.strip(),'bold') if item.contentType == 'movie' or (config.get_localized_string(30161) in item.title) else item.title + videoitem.plot= typo(videoitem.title, 'bold') videoitem.title = item.title + (typo(videoitem.title, '_ color kod [] bold') if videoitem.title else "") + (typo(videoitem.quality, '_ color kod []') if videoitem.quality else "") videoitem.fulltitle = item.fulltitle videoitem.show = item.show From 0f549143f1f352c54f012dc4a70e61815c14bdaa Mon Sep 17 00:00:00 2001 From: MaxE <29448127+EMaX0@users.noreply.github.com> Date: Sun, 2 Feb 2020 23:52:40 +0800 Subject: [PATCH 6/6] improved episodios regex (#183) Migliorato regex in episodios - patronBlock funziona anche per gruppi si stagioni (vedi Suits e Greys) - patron, se esiste, ritorna nome puntata e qualita link video (vedi This is us) --- channels/cineblog01.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 55bc14ea..8619b218 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -163,8 +163,8 @@ def peliculas(item): @support.scrape def episodios(item): - patronBlock = r'(?P<block><div class="sp-head[a-z ]*?" title="Espandi">\s*(?:STAGIONE [0-9]+|MINISERIE) - (?P<lang>[^-<]+)(?:- (?P<quality>[^-<]+))?.*?[^<>]*?</div>.*?)<div class="spdiv">\[riduci\]</div>' - patron = '(?:<p>|<strong>)(?P<episode>[0-9]+(?:×|×)[0-9]+)(?P<url>.*?)(?:</p>|<br)' + patronBlock = r'(?P<block><div class="sp-head[a-z ]*?" title="Espandi">\s*(?:STAGION[EI]\s*(?:DA\s*[0-9]+\s*A)?\s*[0-9]+|MINISERIE) - (?P<lang>[^-<]+)(?:- (?P<quality>[^-<]+))?.*?[^<>]*?<\/div>.*?)<div class="spdiv">\[riduci\]<\/div>' + patron = '(?:<p>|<strong>)(?P<episode>[0-9]+(?:×|×)[0-9]+)\s*(?P<title2>[^&<]*)?(?:–|-)?\s*(?P<url>.*?)(?:<\/p>|<br)' return locals()