From 863ca6b0adebffdda7d3d50af1a2b59b3b9276f6 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 18 Jan 2020 11:46:01 +0100 Subject: [PATCH 1/4] Fix AkVideo --- servers/akstream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/akstream.py b/servers/akstream.py index 72fb5ddb..cb0dfd7a 100644 --- a/servers/akstream.py +++ b/servers/akstream.py @@ -37,7 +37,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= i = 0 for media_url in matches: # URL del vídeo - video_urls.append([vres[i] + " mp4 [Akvideo] ", media_url + '|' + _headers]) + video_urls.append([vres[i] + " mp4 [Akvideo] ", media_url.replace('https://', 'http://') + '|' + _headers]) i = i + 1 for video_url in video_urls: From ac1d59a35b60c31aeb73ca157e2e9345bc3afa5b Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 18 Jan 2020 12:09:46 +0100 Subject: [PATCH 2/4] Aggiornamento Icone Canali --- channels/altadefinizione01.json | 4 ++-- channels/altadefinizioneclick.json | 4 ++-- channels/italiaserie.json | 4 ++-- channels/vedohd.json | 31 +++--------------------------- 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/channels/altadefinizione01.json b/channels/altadefinizione01.json index 8f0d698a..f7589d50 100644 --- a/channels/altadefinizione01.json +++ b/channels/altadefinizione01.json @@ -4,8 +4,8 @@ "language": ["ita", "sub-ita"], "active": true, "adult": false, - "thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/altadefinizione01.png", - "banner": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/altadefinizione01.png", + "thumbnail": "altadefinizione01.png", + "banner": "altadefinizione01.png", "categories": ["movie", "vos"], "settings": [] } diff --git a/channels/altadefinizioneclick.json b/channels/altadefinizioneclick.json index d5190e8c..8ca67198 100644 --- a/channels/altadefinizioneclick.json +++ b/channels/altadefinizioneclick.json @@ -4,8 +4,8 @@ "active": true, "adult": false, "language": ["ita","sub-ita"], - "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/altadefinizioneclick.png", - "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/altadefinizioneciclk.png", + "thumbnail": "altadefinizioneclick.png", + "bannermenu": "altadefinizioneciclk.png", "categories": ["movie","vos"], "settings": [] } diff --git a/channels/italiaserie.json b/channels/italiaserie.json index fe68c5c1..a8d184b6 100644 --- a/channels/italiaserie.json +++ b/channels/italiaserie.json @@ -4,8 +4,8 @@ "active": true, "adult": false, "language": ["ita","sub-ita"], - "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png", - "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png", + "thumbnail": "italiaserie.png", + "bannermenu": "italiaserie.png", "categories": ["tvshow", "vos"], "not_active": ["include_in_newest_peliculas", "include_in_newest_anime"], "settings": [] diff --git a/channels/vedohd.json b/channels/vedohd.json index 2109a2b1..e21ccead 100644 --- a/channels/vedohd.json +++ b/channels/vedohd.json @@ -4,33 +4,8 @@ "language": ["ita"], "active": true, "adult": false, - "thumbnail": "https://vedohd.pw/wp-content/uploads/2018/12/imgpsh_fullsize.png", - "banner": "https://vedohd.pw/wp-content/uploads/2018/12/imgpsh_fullsize.png", + "thumbnail": "vedohd.png", + "banner": "vedohd.png", "categories": ["movie"], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Includi in Ricerca Globale", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_peliculas", - "type": "bool", - "label": "Includi in Novità - Film", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_italiano", - "type": "bool", - "label": "Includi in Novità - Italiano", - "default": true, - "enabled": true, - "visible": true - } - ] + "settings": [] } From f372c834f19f0f38faeda075bf65f66d54f7dd61 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sun, 19 Jan 2020 10:50:44 +0100 Subject: [PATCH 3/4] Fix Animeunity e Dreamsub: N.B. se Dreamsub non funziona cancellare le 2 righe: quality e servers relative a dreamsub nel file addon_data/plugin.video.kod/settings_channels/autoplay_data.json --- channels/animeunity.py | 7 ++++--- core/support.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/channels/animeunity.py b/channels/animeunity.py index cced6c5a..09a628ad 100644 --- a/channels/animeunity.py +++ b/channels/animeunity.py @@ -86,10 +86,11 @@ def peliculas(item): @support.scrape def episodios(item): + # debug = True data = item.data anime = True pagination = 50 - patron = r'(?P\d+)' + patron = r'(?P\d+)' def itemHook(item): item.title = item.title + support.typo(item.fulltitle,'-- bold') return item @@ -99,14 +100,14 @@ def episodios(item): def findvideos(item): support.log() html = support.match(item, patron=r'TIPO:\s*\s*([A-Za-z]+)') - if html.match == 'TV': + if html.match == 'TV' and item.contentType != 'episode': item.contentType = 'tvshow' item.data = html.data return episodios(item) else: itemlist = [] + if item.contentType != 'episode': item.contentType = 'movie' video = support.match(html.data, patron=r' Date: Sun, 19 Jan 2020 11:38:02 +0100 Subject: [PATCH 4/4] Fix Animepertutti --- channels/animeleggendari.py | 8 ++++---- servers/mixdrop.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index 3e814de3..a26e8314 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -74,10 +74,10 @@ def peliculas(item): @support.scrape def episodios(item): - data = support.match(item, headers=headers).data - if not any(x in data for x in ['Lista Episodi', 'Movie Parte']): + data = support.match(item, headers=headers, patronBlock=r'entry-content clearfix">(.*?)class="mh-widget mh-posts-2 widget_text').block + if not 'pagination clearfix' in data: support.log('NOT IN DATA') - patron = r'(?:iframe src|str)="(?P[^"]+)"' + patron = r'[^"]+)"' title = item.title def fullItemlistHook(itemlist): url = '' @@ -120,7 +120,7 @@ def findvideos(item): if item.data: data = item.data else: - matches = support.match(item, patron=r'(?:str="([^"]+)"|iframe src="([^"]+)")').matches + matches = support.match(item, patron=r'[^"]+)"').matches data = '' if matches: for match in matches: diff --git a/servers/mixdrop.json b/servers/mixdrop.json index 6d39077a..6977131e 100644 --- a/servers/mixdrop.json +++ b/servers/mixdrop.json @@ -4,7 +4,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "mixdrop.co/(?:f|e)/([a-z0-9]+)", + "pattern": "mixdrop.[^/]+/(?:f|e)/([a-z0-9]+)", "url": "https://mixdrop.co/e/\\1" } ]