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/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/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'