From fd02f208c096c6b00a6b2db76af8019a3e1bee8e Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 8 Jun 2019 11:58:00 +0200 Subject: [PATCH] Rewritten Dreamsub with autorenumber support --- channels/animeworld.py | 1 - channels/dreamsub.py | 247 +++++++++-------------------------------- channelselector.py | 10 +- core/support.py | 7 +- 4 files changed, 61 insertions(+), 204 deletions(-) diff --git a/channels/animeworld.py b/channels/animeworld.py index aa8204e0..671ede36 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -286,7 +286,6 @@ def findvideos(item): log() itemlist = [] - data = httptools.downloadpage(item.url, headers=headers).data matches, data = support.match(item, r'class="tab.*?data-name="([0-9]+)">([^<]+)\s*', ['url', 'title', 'year'], action='episodios', patron_block='(.*?)
', patronNext='
  • [^>]+>') + return renumber(itemlist) + - # Carica la pagina - data = httptools.downloadpage(item.url).data - bloque = scrapertools.find_single_match(data, - '(.*?)
    ') - - # Estrae i contenuti - patron = 'Lingua[^<]+
    \s*    ' - matches = re.compile(patron, re.DOTALL).findall(bloque) - - for scrapedurl, scrapedtitle in matches: - scrapedurl = host + scrapedurl - scrapedplot = "" - scrapedthumbnail = "" - scrapedtitle = scrapedtitle.replace("Streaming", "") - scrapedtitle = scrapedtitle.replace("Lista episodi ", "") - itemlist.append( - Item(channel=item.channel, - action="episodios", - contentType="tvshow", - title="[COLOR azure]%s[/COLOR]" % scrapedtitle, - fulltitle=scrapedtitle, - url=scrapedurl, - thumbnail=scrapedthumbnail, - show=scrapedtitle, - plot=scrapedplot, - folder=True)) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - - # Paginazione - patronvideos = '
  • [^>]+>' - matches = re.compile(patronvideos, re.DOTALL).findall(data) - - if len(matches) > 0: - scrapedurl = urlparse.urljoin(item.url, matches[0]) - itemlist.append( - Item(channel=item.channel, - action="serietv", - title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]", - url=scrapedurl, - thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", - folder=True)) - - return itemlist - - -def ultimiep(item): - logger.info("kod.dreamsub ultimiep") - itemlist = [] - - # Carica la pagina - data = httptools.downloadpage(item.url).data - bloque = scrapertools.find_single_match(data, '
      (.*?)
    ') - - # Estrae i contenuti - patron = '
  • ]+>([^<]+)
    ' - matches = re.compile(patron, re.DOTALL).findall(bloque) - - for scrapedurl, scrapedtitle in matches: - ep = scrapertools.find_single_match(scrapedtitle, r'\d+$').zfill(2) - scrapedtitle = re.sub(r'\d+$', ep, scrapedtitle) - scrapedurl = host + scrapedurl - scrapedplot = "" - scrapedthumbnail = "" - cleantitle = re.sub(r'\d*-?\d+$', '', scrapedtitle).strip() - itemlist.append( - Item(channel=item.channel, - action="findvideos", - contentType="tvshow", - title=scrapedtitle, - fulltitle=cleantitle, - text_color="azure", - url=scrapedurl, - thumbnail=scrapedthumbnail, - show=cleantitle, - plot=scrapedplot, - folder=True)) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - - for itm in itemlist: - itm.contentType = "episode" - - return itemlist +def last(item): + return scrape(item, r'
  • ]+>([^<]+)(\d+)
    ', ['url', 'title', 'episode'], patron_block='
      (.*?)
    ' ) def categorie(item): - logger.info("[dreamsub.py] categorie") + log() itemlist = [] - - data = httptools.downloadpage(item.url).data - blocco = scrapertools.find_single_match(data, - r'') - patron = r'
  • (.*?)<\/b>[^>]+>([^<]+)<\/i>(.*?)<' - matches = re.compile(patron, re.DOTALL).findall(bloque) - - for scrapedurl, title1, title2, title3 in matches: - scrapedurl = host + scrapedurl - scrapedtitle = title1 + " " + title2 + title3 - scrapedtitle = scrapedtitle.replace("Download", "") - scrapedtitle = scrapedtitle.replace("Streaming", "") - scrapedtitle = scrapedtitle.replace("& ", "") - scrapedtitle = re.sub(r'\s+', ' ', scrapedtitle) - - itemlist.append( - Item(channel=item.channel, - action="findvideos", - contentType="episode", - fulltitle=scrapedtitle, - show=item.show, - title="[COLOR azure]" + scrapedtitle + "[/COLOR]", - url=scrapedurl, - thumbnail=item.thumbnail, - plot=item.plot, - folder=True)) - - if config.get_videolibrary_support() and len(itemlist) != 0: - itemlist.append( - Item(channel=item.channel, - title="[COLOR lightblue]%s[/COLOR]" % config.get_localized_string(30161), - url=item.url, - action="add_serie_to_library", - extra="episodios", - show=item.show)) - - return itemlist - + itemlist = scrape(item, r'
  • (.*?)<\/b>[^>]+>([^<]+)<\/i>', ['url','title','title2'], patron_block='
    (.*?)
    ') + return renumber(itemlist, item, 'bold') def findvideos(item): - logger.info() - - print item.url + log() + itemlist = [] data = httptools.downloadpage(item.url).data - itemlist = servertools.find_video_items(data=data) if 'keepem.online' in data: - urls = scrapertools.find_multiple_matches(data, r'(https://keepem\.online/f/[^"]+)"') + urls = scrapertoolsV2.find_multiple_matches(data, r'(https://keepem\.online/f/[^"]+)"') for url in urls: url = httptools.downloadpage(url).url itemlist += servertools.find_video_items(data=url) - for videoitem in itemlist: - server = re.sub(r'[-\[\]\s]+', '', videoitem.title) - videoitem.title = "".join( - ["[[COLOR orange]%s[/COLOR]] " % server.capitalize(), "[COLOR azure]%s[/COLOR]" % item.title]) - videoitem.fulltitle = item.fulltitle - videoitem.show = item.show - videoitem.thumbnail = item.thumbnail - videoitem.channel = item.channel - videoitem.contentType = item.contentType - - return itemlist + return support.server(item, data, itemlist) diff --git a/channelselector.py b/channelselector.py index 35c28ff6..50e05744 100644 --- a/channelselector.py +++ b/channelselector.py @@ -321,25 +321,27 @@ def thumb(itemlist=[]): icon_dict = {'channels_movie':['film'], 'channels_tvshow':['serie','tv','episodi','episodio'], 'channels_documentary':['documentari','documentario'], + 'channels_all':['tutti'], 'news':['novità', "novita'", 'aggiornamenti'], 'now_playing':['cinema', 'in sala'], 'channels_anime':['anime'], 'genres':['genere', 'generi', 'categorie', 'categoria'], 'channels_animation': ['animazione', 'cartoni'], 'channels_adventure': ['avventura'], - 'channels_action':['azione'], + 'channels_action':['azione', 'arti marziali'], 'channels_biographical':['biografico'], - 'channels_comedy':['comico','commedia'], - 'channels_adult':['erotico'], + 'channels_comedy':['comico','commedia', 'demenziale'], + 'channels_adult':['erotico', 'hentai'], 'channels_drama':['drammatico'], 'channels_syfy':['fantascienza'], 'channels_fantasy':['fantasy'], 'channels_crime':['gangster','poliziesco'], 'channels_grotesque':['grottesco'], 'channels_war':['guerra'], + 'channels_children':['bambini'], 'horror':['horror'], 'lucky': ['fortunato'], - 'channels_musical':['musical'], + 'channels_musical':['musical', 'musica'], 'channels_mistery':['mistero', 'giallo'], 'channels_noir':['noir'], 'popular' : ['popolari','popolare', 'più visti'], diff --git a/core/support.py b/core/support.py index 622e61dd..d08bc3f2 100644 --- a/core/support.py +++ b/core/support.py @@ -217,8 +217,8 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="" if scraped['type'] in variants: action = name - if inspect.stack()[1][3] == 'episodios': item.contentType = 'episode' - + if inspect.stack()[1][3] == 'episodios': item.contentType = 'episode' + if scraped["title"] not in blacklist: it = Item( channel=item.channel, @@ -240,7 +240,8 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="" itemlist.append(it) checkHost(item, itemlist) - if (item.contentType == "episode" and (action != "findvideos" and action != "play")) \ + if (item.contentType == "tvshow" and (action != "findvideos" and action != "play")) \ + or (item.contentType == "episode" and action != "play") \ or (item.contentType == "movie" and action != "play"): tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) else: