From 147f22b1d526f7873e14e11b22839a7e16c29997 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Thu, 18 Jul 2019 14:06:42 +0200 Subject: [PATCH] reverse --- channels/altadefinizione01.py | 54 ++++++++++++++++++----------------- platformcode/updater.py | 2 +- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index dd186a5e..55774576 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -8,8 +8,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay -#URL che reindirizza sempre al dominio corrente -#host = "https://altadefinizione01.to" +# URL che reindirizza sempre al dominio corrente +# host = "https://altadefinizione01.to" __channel__ = "altadefinizione01" host = config.get_channel_url(__channel__) @@ -29,15 +29,15 @@ blacklist_categorie = ['Altadefinizione01', 'Altadefinizione.to'] def mainlist(item): support.log() - itemlist =[] + itemlist = [] + + support.menu(itemlist, 'Al Cinema', 'peliculas', host + '/cinema/') + support.menu(itemlist, 'Ultimi Film Inseriti', 'peliculas', host) + support.menu(itemlist, 'Film Sub-ITA', 'peliculas', host + '/sub-ita/') + support.menu(itemlist, 'Film Ordine Alfabetico ', 'AZlist', host + '/catalog/') + support.menu(itemlist, 'Categorie Film', 'categories', host) + support.menu(itemlist, 'Cerca...', 'search') - support.menu(itemlist, 'Al Cinema','peliculas',host+'/cinema/') - support.menu(itemlist, 'Ultimi Film Inseriti','peliculas',host) - support.menu(itemlist, 'Film Sub-ITA','peliculas',host+'/sub-ita/') - support.menu(itemlist, 'Film Ordine Alfabetico ','AZlist',host+'/catalog/') - support.menu(itemlist, 'Categorie Film','categories',host) - support.menu(itemlist, 'Cerca...','search') - autoplay.init(item.channel, list_servers, list_quality) autoplay.show_option(item.channel, itemlist) @@ -46,12 +46,16 @@ def mainlist(item): def categories(item): support.log(item) - itemlist = support.scrape(item,'
  • (.*?)
    • ',['url','title'],headers,'Altadefinizione01',patron_block='',action='peliculas') + itemlist = support.scrape(item, '
  • (.*?)
    • ', ['url', 'title'], headers, + 'Altadefinizione01', patron_block='', + action='peliculas') return support.thumb(itemlist) + def AZlist(item): support.log() - return support.scrape(item,r'(.*?)<\/div>',action='peliculas_list') + return support.scrape(item, r'(.*?)<\/div>', action='peliculas_list') def newest(categoria): @@ -67,7 +71,7 @@ def newest(categoria): if itemlist[-1].action == "peliculas": itemlist.pop() - # Continua la ricerca in caso di errore + # Continua la ricerca in caso di errore except: import sys for line in sys.exc_info(): @@ -82,11 +86,8 @@ def search(item, texto): item.url = "%s/index.php?do=search&story=%s&subaction=search" % ( host, texto) try: - if item.extra == "movie": - return subIta(item) - if item.extra == "tvshow": - return peliculas_tv(item) - # Continua la ricerca in caso di errore + return peliculas(item) + # Continua la ricerca in caso di errore except: import sys for line in sys.exc_info(): @@ -101,9 +102,10 @@ def peliculas(item): data = httptools.downloadpage(item.url, headers=headers).data patron = r'
    (.*?)<\/a>.*?(.*?)<\/div>.(
    (.*?)<\/div>|())' matches = scrapertoolsV2.find_multiple_matches(data, patron) - + for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedquality, subDiv, subText, empty in matches: - info = scrapertoolsV2.find_multiple_matches(data, r'([0-9]+)+<\/span>.*?(.*?)<\/span>.*?

    (.*?)<\/p>.*?') + info = scrapertoolsV2.find_multiple_matches(data, + r'([0-9]+)+<\/span>.*?(.*?)<\/span>.*?

    (.*?)<\/p>.*?') infoLabels = {} for infoLabels['year'], duration, scrapedplot, checkUrl in info: if checkUrl == scrapedurl: @@ -115,7 +117,7 @@ def peliculas(item): fulltitle = scrapedtitle if subDiv: fulltitle += support.typo(subText + ' _ () color limegreen') - fulltitle += support.typo(scrapedquality.strip()+ ' _ [] color kod') + fulltitle += support.typo(scrapedquality.strip() + ' _ [] color kod') itemlist.append( Item(channel=item.channel, @@ -132,22 +134,22 @@ def peliculas(item): thumbnail=scrapedthumbnail)) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - support.nextPage(itemlist,item,data,'[^<]+[^<]+') + support.nextPage(itemlist, item, data, '[^<]+[^<]+') return itemlist + def peliculas_list(item): support.log() item.fulltitle = '' block = r'(.*)<\/tbody>' patron = r' ([0-9]{4}).*?mlnh-4">([A-Z]+)' - return support.scrape(item,patron, ['url', 'title', 'thumb', 'year', 'quality'], patron_block=block) - + return support.scrape(item, patron, ['url', 'title', 'thumb', 'year', 'quality'], patron_block=block) def findvideos(item): support.log() - + itemlist = support.server(item, headers=headers) - return itemlist + return itemlist \ No newline at end of file diff --git a/platformcode/updater.py b/platformcode/updater.py index eab27da1..7da7e6e6 100644 --- a/platformcode/updater.py +++ b/platformcode/updater.py @@ -17,7 +17,7 @@ addon = xbmcaddon.Addon('plugin.video.kod') _hdr_pat = re.compile("^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@.*") -branch = 'stable' +branch = 'master' user = 'kodiondemand' repo = 'addon' addonDir = xbmc.translatePath("special://home/addons/") + "plugin.video.kod/"