Fix Animeworld

This commit is contained in:
Alhaziel
2019-06-17 19:53:40 +02:00
parent a0d0c9e855
commit 2e09c985fc
+24 -23
View File
@@ -245,7 +245,8 @@ def video(item):
fulltitle=title, fulltitle=title,
show=title, show=title,
thumbnail=scrapedthumb, thumbnail=scrapedthumb,
context = autoplay.context)) context = autoplay.context,
number= '1'))
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
autorenumber.renumber(itemlist) autorenumber.renumber(itemlist)
@@ -258,8 +259,7 @@ def video(item):
def episodios(item): def episodios(item):
log() log()
itemlist = [] itemlist = []
patron_block = r'server active(.*?)server hidden '
patron_block = r'<div class="widget servers".*?>(.*?)<div id="download"'
patron = r'<li><a [^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+" href="([^"]+)"[^>]+>([^<]+)<' patron = r'<li><a [^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+" href="([^"]+)"[^>]+>([^<]+)<'
matches = support.match(item, patron, patron_block)[0] matches = support.match(item, patron, patron_block)[0]
@@ -275,7 +275,8 @@ def episodios(item):
show=scrapedtitle, show=scrapedtitle,
plot=item.plot, plot=item.plot,
fanart=item.thumbnail, fanart=item.thumbnail,
thumbnail=item.thumbnail)) thumbnail=item.thumbnail,
number=scrapedtitle))
autorenumber.renumber(itemlist, item,'bold') autorenumber.renumber(itemlist, item,'bold')
support.videolibrary(itemlist, item) support.videolibrary(itemlist, item)
@@ -285,31 +286,31 @@ def episodios(item):
def findvideos(item): def findvideos(item):
log() log()
itemlist = [] itemlist = []
matches, data = support.match(item, r'class="tab.*?data-name="([0-9]+)">([^<]+)</span', headers=headers) matches, data = support.match(item, r'class="tab.*?data-name="([0-9]+)">([^<]+)</span', headers=headers)
videoData = '' videoData = ''
for serverid, servername in matches: for serverid, servername in matches:
block = scrapertoolsV2.find_multiple_matches(data,'data-id="'+serverid+'">(.*?)<div class="server') block = scrapertoolsV2.find_multiple_matches(data,'data-id="'+serverid+'">(.*?)<div class="server')
id = scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="'+item.fulltitle+'"') log('ITEM= ',item)
dataJson = httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, id, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data id = scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="'+item.number+'"')
json = jsontools.load(dataJson) if id:
log('JSON= ',json) dataJson = httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, id, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
json = jsontools.load(dataJson)
videoData +='\n'+json['grabber']
videoData +='\n'+json['grabber'] if serverid == '28':
itemlist.append(
if serverid == '28': Item(
itemlist.append( channel=item.channel,
Item( action="play",
channel=item.channel, title='diretto',
action="play", quality='',
title='diretto', url=json['grabber'],
quality='', server='directo',
url=json['grabber'], show=item.show,
server='directo', contentType=item.contentType,
show=item.show, folder=False))
contentType=item.contentType,
folder=False))
return support.server(item, videoData, itemlist) return support.server(item, videoData, itemlist)