From 3202c71141125efc0e2ff91bbf3e36b02679e2e8 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 1 Jun 2019 16:15:20 +0200 Subject: [PATCH 01/11] Fix Guardaserieclick, sorry 4l3x87 --- channels/guardaserieclick.py | 63 +++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py index 1617cc92..c451326f 100644 --- a/channels/guardaserieclick.py +++ b/channels/guardaserieclick.py @@ -95,6 +95,7 @@ def cleantitle(scrapedtitle): # ================================================================================================================ # ---------------------------------------------------------------------------------------------------------------- + def nuoveserie(item): log() itemlist = [] @@ -109,8 +110,26 @@ def nuoveserie(item): else: patron_block = r'
(.*?)
\s[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)

' - return support.scrape(item, patron, ['url', 'thumb', 'title'], patron_block=patron_block, action='episodios') + patron = r'[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<\/p>' + + matches = support.match(item, patron, patron_block, headers)[0] + + for scrapedurl, scrapedthumbnail, scrapedtitle in matches: + scrapedtitle = cleantitle(scrapedtitle) + + itemlist.append( + Item(channel=item.channel, + action="episodios", + contentType="episode", + title=scrapedtitle, + fulltitle=scrapedtitle, + url=scrapedurl, + show=scrapedtitle, + thumbnail=scrapedthumbnail, + folder=True)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + return itemlist # ================================================================================================================ @@ -121,9 +140,45 @@ def serietvaggiornate(item): itemlist = [] patron_block = r'
(.*?)<\/div><\/div>]+> ]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^(?:<|\()]+)(?:\(([^\)]+)\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>' + patron = r']+>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>' - return support.scrape(item, patron, ['url', 'thumb', 'episode', 'lang', 'title'], patron_block=patron_block, action='findvideos') + matches = support.match(item, patron, patron_block, headers)[0] + + for scrapedurl, scrapedthumbnail, scrapedep, scrapedtitle in matches: + episode = re.compile(r'^(\d+)x(\d+)', re.DOTALL).findall(scrapedep) # Prendo stagione ed episodioso + scrapedtitle = cleantitle(scrapedtitle) + + contentlanguage = "" + if 'sub-ita' in scrapedep.strip().lower(): + contentlanguage = 'Sub-ITA' + + extra = r']*>' % ( + episode[0][0], episode[0][1].lstrip("0")) + + infoLabels = {} + infoLabels['episode'] = episode[0][1].zfill(2) + infoLabels['season'] = episode[0][0] + + title = str( + "%s - %sx%s %s" % (scrapedtitle, infoLabels['season'], infoLabels['episode'], contentlanguage)).strip() + + itemlist.append( + Item(channel=item.channel, + action="findepvideos", + contentType="episode", + title=title, + show=scrapedtitle, + fulltitle=scrapedtitle, + url=scrapedurl, + extra=extra, + thumbnail=scrapedthumbnail, + contentLanguage=contentlanguage, + infoLabels=infoLabels, + folder=True)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist # ================================================================================================================ From 537ca12076a4d1b4167838a8a7e4e6ba20352b65 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 1 Jun 2019 16:42:21 +0200 Subject: [PATCH 02/11] Removed Colors --- specials/videolibrary.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specials/videolibrary.py b/specials/videolibrary.py index b8876ee1..b32d338b 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -105,7 +105,7 @@ def list_movies(item, silent=False): new_item.nfo = nfo_path new_item.path = raiz new_item.thumbnail = new_item.contentThumbnail - new_item.text_color = "blue" + # new_item.text_color = "blue" strm_path = new_item.strm_path.replace("\\", "/").rstrip("/") if '/' in new_item.path: new_item.strm_path = strm_path @@ -246,11 +246,11 @@ def list_tvshows(item): if item_tvshow.active and int(item_tvshow.active) > 0: texto_update = config.get_localized_string(60022) value = 0 - item_tvshow.text_color = "green" + # item_tvshow.text_color = "green" else: texto_update = config.get_localized_string(60023) value = 1 - item_tvshow.text_color = "0xFFDF7401" + # item_tvshow.text_color = "0xFFDF7401" # Menu contextual: Eliminar serie/canal num_canales = len(item_tvshow.library_urls) From 845daabef4304326a6766e9743bd9587ce024d62 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 1 Jun 2019 17:44:42 +0200 Subject: [PATCH 03/11] Bold in menu --- channels/animeworld.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/animeworld.py b/channels/animeworld.py index f2ef7dd6..94b10340 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -28,8 +28,8 @@ def mainlist(item): itemlist =[] - support.menu(itemlist, 'ITA submenu', 'build_menu', host + '/filter?', args=["anime", 'language[]=1']) - support.menu(itemlist, 'Sub-ITA submenu', 'build_menu', host + '/filter?', args=["anime", 'language[]=0']) + support.menu(itemlist, 'ITA submenu bold', 'build_menu', host + '/filter?', args=["anime", 'language[]=1']) + support.menu(itemlist, 'Sub-ITA submenu bold', 'build_menu', host + '/filter?', args=["anime", 'language[]=0']) support.menu(itemlist, 'Archivio A-Z submenu', 'alfabetico', host+'/az-list', args=["tvshow","a-z"]) support.menu(itemlist, 'In corso submenu', 'video', host+'/', args=["in sala"]) support.menu(itemlist, 'Generi submenu', 'generi', host+'/') From a40ca80b98b99b7d1093dc18c13020e6a92ef8c4 Mon Sep 17 00:00:00 2001 From: Dexter Morgan <9434916+32Dexter@users.noreply.github.com> Date: Sat, 1 Jun 2019 17:50:50 +0200 Subject: [PATCH 04/11] Some Updates (#44) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update UpVid Update UpVid * Update Upvid Update Upvid * Update Upvid Update Upvid * Update Upvid.py Update Upvid.py * Updates TooItalia Channel Updates TooItalia Channel * Image Filmi Gratis Image Filmi Gratis * New Channel Filmigratis New Channel Filmigratis * Update ToonItalia Update ToonItalia * Add files via upload * Updates FilmiGratis Updates FilmiGratis * Updates ToonItalia Updates ToonItalia * Update regex Upvid Update regex Upvid * Update FilmiGratis Update FilmiGratis * Update Updvid regex Update Updvid regex * Update Filmigratis: Deleted print Update Filmigratis: Deleted print * Add thumb_add.png Add thumb_add.png * Updates and Add Thumbnail and Fanart in Community Updates and Add Thumbnail and Fanart in Community * Updates Community, add Thumbnail and Fanart Updates Community, add Thumbnail and Fanart * Add files via upload * Update openload.json Update regex in pattern * Updates Updates * Add files via upload * Add MondoLunatico 2.0 Add MondoLunatico 2.0 * Delete community.py * Delete toonitalia.py * Delete toonitalia.json * Delete filmigratis.json * Delete filmigratis.py * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update Update * Add files via upload * Add files via upload * Add files via upload * Update community.py * Update wstream.py * Add files via upload * Fix Mondolunatico SerieTV Fix line 353 * Fixes Fixes --- channels/filmigratis.py | 2 +- channels/mondolunatico2.json | 65 +++ channels/mondolunatico2.py | 500 ++++++++++++++++++ channels/toonitalia.py | 77 ++- .../media/channels/thumb/mondolunatico2.png | Bin 0 -> 3830 bytes resources/media/themes/default/thumb_add.png | Bin 0 -> 2384 bytes servers/openload.json | 2 +- specials/community.py | 44 +- 8 files changed, 651 insertions(+), 39 deletions(-) create mode 100644 channels/mondolunatico2.json create mode 100644 channels/mondolunatico2.py create mode 100644 resources/media/channels/thumb/mondolunatico2.png create mode 100644 resources/media/themes/default/thumb_add.png diff --git a/channels/filmigratis.py b/channels/filmigratis.py index a7bc6a09..a900ae40 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -191,7 +191,7 @@ def peliculas_serie(item): data = httptools.downloadpage(item.url, headers=headers).data - patron = r'div class="cnt">.*?src="(.*?)".*?title="([A-Z|0-9].*?)".*?[^s]+src="([^"]+).*?small>\s+[^A-Z](.*?)<.*?Ultime Richieste Inserite(.*?)
', contentType="movie"): + logger.info("[mondolunatico2.py] carousel") + itemlist = [] + + data = httptools.downloadpage(item.url, headers=headers).data + + block = scrapertools.find_single_match(data,regex) + + patron = r'
Film SubITA(.*?)
', contentType="movie") +# --------------------------------------------------------------------------------------------------------------------------------------------- +def carousel_request(item): + return carousel(item, regex=r'

Ultime Richieste Inserite

(.*?)
', contentType="movie") +# --------------------------------------------------------------------------------------------------------------------------------------------- +def carousel_cinema(item): + return carousel(item, regex=r'

Nelle Sale

(.*?)
', contentType="movie") +# --------------------------------------------------------------------------------------------------------------------------------------------- +def carousel_last(item): + return carousel(item, regex=r'

Ultimi Film Inseriti

(.*?)
', contentType="movie") +# --------------------------------------------------------------------------------------------------------------------------------------------- +def carousel_episodes(item): + return carousel(item, regex=r'

Serie TV

(.*?)
', contentType="episode") +# --------------------------------------------------------------------------------------------------------------------------------------------- + +def top_imdb(item, contentType='movie', regex=r'(.*?)

'): + logger.info("[mondolunatico2.py] top_imdb") + itemlist = [] + + minpage = 20 + p = 1 + if '{}' in item.url: + item.url, p = item.url.split('{}') + p = int(p) + + data = httptools.downloadpage(item.url, headers=headers).data + + block = scrapertools.find_single_match(data, regex) + + patron = r"
i: continue + if i >= p * minpage: break + scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) + scrapedtitle = re.sub(r'[0-9]{4}', "", scrapedtitle) + scrapedthumbnail = scrapedthumbnail.replace ("-90x135","").replace("/w92/", "/w600_and_h900_bestv2/") + itemlist.append( + Item(channel=channel, + action="findvideos" if "movie" in contentType else "episodios", + contentType=item.contentType, + contentTitle=scrapedtitle, + title=scrapedtitle, + fulltitle=scrapedtitle, + url=scrapedurl, + show=scrapedtitle, + thumbnail=scrapedthumbnail, + args=item.args)) + + if len(matches) >= p * minpage: + thumbnail = thumb(itemlist=[]) + scrapedurl = item.url + '{}' + str(p + 1) + itemlist.append( + Item(channel=channel, + contentType=item.contentType, + action="top_imdb", + title="[COLOR blue][B]Successivo >[/B][/COLOR]", + thumbnail=thumbnail, + url=scrapedurl)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist + +# --------------------------------------------------------------------------------------------------------------------------------------------- +def top_serie(item): + return top_imdb(item, contentType='episode', regex=r'

TVShows

(.*?)
') +# --------------------------------------------------------------------------------------------------------------------------------------------- + +def search(item, texto): + logger.info("[mondolunatico2.py] " + item.url + " search " + texto) + item.url = host + "?s=" + texto + + try: + return peliculas(item) + + except: + import sys + for line in sys.exc_info(): + logger.error("%s" % line) + return [] + +# --------------------------------------------------------------------------------------------------------------------------------------------- + +def peliculas(item): + logger.info("[mondolunatico2.py] peliculas") + itemlist = [] + + data = httptools.downloadpage(item.url, headers=headers).data + + patron = r'
.*?([^<]+).*?

([^<]+)' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedthumbnail, scrapedtitle, args, year, scrapedplot in matches: + scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) + scrapedtitle = re.sub(r'[0-9]{4}', "", scrapedtitle) + type = "[COLOR aqua][Serie][/COLOR]" if "tvshows" in item.args else "[COLOR aqua][Film][/COLOR]" + itemlist.append( + Item(channel=channel, + action="episodios" if "tvshows" in item.args else "findvideos", + contentType="episode" if "tvshows" in item.args else "movie", + title=scrapedtitle + " " + "[COLOR orange][" + year + "][/COLOR]" + " " + type, + fulltitle=scrapedtitle, + thumbnail=scrapedthumbnail, + url=scrapedurl, + show=scrapedtitle, + args=args, + infoLabels={'year':year}, + plot=scrapedplot)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + return itemlist + +# --------------------------------------------------------------------------------------------------------------------------------------------- + +def findvideos(item): + logger.info("[mondolunatico2.py] findvideos") + + if item.args == "tvshows": + ret=support.dooplay_get_links(item, host) + + if ret == []: + return episodios(item) + else: + item.url = ret[0]["url"] + return videoplayer(item) + + if item.args == "movies" or "movie": + return videoplayer(item) + + else: + return halfplayer(item) + +# --------------------------------------------------------------------------------------------------------------------------------------------- + +def episodios(item): + logger.info("[mondolunatico2.py] episodios") + itemlist = [] + + data = httptools.downloadpage(item.url, headers=headers).data + + if "

Stagioni ed Episodi

" in data: + # Se è presente direttamente la lista Stagioni con i relativi episodi + block = scrapertools.find_single_match(data, r'

Stagioni ed Episodi

(.*?)
') + patron = r'episodiotitle.*?href=\'([^\']+)\'>([^<]+)' + matches = re.compile(patron, re.DOTALL).findall(block) + for scrapedurl, scrapedtitle in matches: + itemlist.append( + Item(channel=channel, + action="videoplayer", + contentType=item.contentType, + title=scrapedtitle, + thumbnail=item.thumbnail, + fulltitle=scrapedtitle, + url=scrapedurl, + args=item.args, + show=item.show)) + support.videolibrary(itemlist, item, 'color kod') + return itemlist + + if "File Unico..." in data: + #Se è direttamente un file unico + return dooplayer(item) + + if "http://mondolunatico.org/stream/wp-content/uploads/2017/08/hand.gif" in data: + # Keeplinks + return keeplink(item) + + else: + # Se nella lista è presente Dooplayer con elenco episodi + patron = r'
([^<]+).*? 1: + for scrapedtitle, scrapedurl in matches: + itemlist.append( + Item(channel=channel, + action="player_list", + contentType=item.contentType, + title=scrapedtitle, + thumbnail=item.thumbnail, + fulltitle=scrapedtitle, + url=scrapedurl, + show=item.show)) + return itemlist + else: + return dooplayer(item) + +# --------------------------------------------------------------------------------------------------------------------------------------------- + +def player(item): + logger.info ("[mondolunatico2.py] player") + + data = httptools.downloadpage(item.url, headers=headers).data + + item.url = scrapertools.find_single_match(item.url, r'([^/]+//[^/]+/[^/]+/[^/]+)') + + if "https://mondolunatico.tk" in data: + data = httptools.downloadpage(item.url, headers=headers).data + link = scrapertools.find_single_match(data, r'