Merge pull request #223 from flakobatako/correccion-XDVideos
Corrección XDVideos
This commit is contained in:
Executable → Regular
+29
-17
@@ -20,8 +20,8 @@ def mainlist(item):
|
|||||||
|
|
||||||
itemlist = list()
|
itemlist = list()
|
||||||
|
|
||||||
itemlist.append(Item(channel=item.channel, action="categorias", title="Categorias", url=host,
|
itemlist.append(Item(channel=item.channel, action="categorias",
|
||||||
thumbnail=thumb_series))
|
title="Categorias", url=host, thumbnail=thumb_series))
|
||||||
itemlist.append(Item(channel=item.channel, action="episodios", title="Dragon Ball Super", url=hosts,
|
itemlist.append(Item(channel=item.channel, action="episodios", title="Dragon Ball Super", url=hosts,
|
||||||
thumbnail=thumb_series))
|
thumbnail=thumb_series))
|
||||||
return itemlist
|
return itemlist
|
||||||
@@ -34,26 +34,27 @@ def categorias(item):
|
|||||||
|
|
||||||
data = httptools.downloadpage(item.url).data
|
data = httptools.downloadpage(item.url).data
|
||||||
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
||||||
patron = '<ul id="menu-menu-2" class="menu">(.+)>Problemas'
|
patron = '(?s)<ul id="nav">(.*)<li class="hd-search">'
|
||||||
data = scrapertools.find_single_match(data, patron)
|
data = scrapertools.find_single_match(data, patron)
|
||||||
patron_cat = '<li id="menu-item-[^"]+" class=".+?"><a href="([^"]+)">([^"]+)<\/a><ulclass="sub-menu">'
|
patron_cat = '(?s)<li id="menu-item-[^"]+" class=".+?"><a href="([^"]+)">([^"]+)<\/a><ul class="sub-menu">'
|
||||||
matches = scrapertools.find_multiple_matches(data, patron_cat)
|
matches = scrapertools.find_multiple_matches(data, patron_cat)
|
||||||
for url, name in matches:
|
for url, name in matches:
|
||||||
if name != 'Clasicos':
|
if name != 'Clasicos':
|
||||||
title = name
|
title = name
|
||||||
itemlist.append(item.clone(title=title, url=url, action="lista", show=title))
|
itemlist.append(item.clone(title=title, url=url,
|
||||||
|
action="lista", show=title))
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
|
|
||||||
def lista(item):
|
def lista(item):
|
||||||
logger.info()
|
logger.info()
|
||||||
|
|
||||||
itemlist = []
|
itemlist = []
|
||||||
|
|
||||||
data = httptools.downloadpage(item.url).data
|
data = httptools.downloadpage(item.url).data
|
||||||
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
||||||
|
|
||||||
category = item.title
|
category = item.title
|
||||||
patron = '<li id="menu-item-[^"]+" class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item page-item-[^"]+ current_page_item menu-item-has-children menu-item-[^"]+"><a href="[^"]+">[^"]+<\/a>(.+?)<\/a><\/li><\/ul><\/li>'
|
patron = '<li id="menu-item-[^"]+" class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item page-item-[^"]+ current_page_item menu-item-has-children menu-item-[^"]+"><a href="[^"]+">[^"]+<\/a>(.+?)<\/ul><\/li>'
|
||||||
content = scrapertools.find_single_match(data, patron)
|
content = scrapertools.find_single_match(data, patron)
|
||||||
patron_lista = '<a href="([^"]+)">([^"]+)<\/a>'
|
patron_lista = '<a href="([^"]+)">([^"]+)<\/a>'
|
||||||
match_series = scrapertools.find_multiple_matches(content, patron_lista)
|
match_series = scrapertools.find_multiple_matches(content, patron_lista)
|
||||||
@@ -65,30 +66,41 @@ def lista(item):
|
|||||||
show = show.rstrip(")")
|
show = show.rstrip(")")
|
||||||
else:
|
else:
|
||||||
show = title
|
show = title
|
||||||
itemlist.append(item.clone(title=title, url=url, action="episodios", show=show, plot=show))
|
itemlist.append(item.clone(title=title, url=url,
|
||||||
|
action="episodios", show=show, plot=show))
|
||||||
tmdb.set_infoLabels(itemlist)
|
tmdb.set_infoLabels(itemlist)
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
|
|
||||||
def episodios(item):
|
def episodios(item):
|
||||||
logger.info()
|
logger.info()
|
||||||
|
|
||||||
itemlist = []
|
itemlist = []
|
||||||
|
|
||||||
data = httptools.downloadpage(item.url).data
|
data = httptools.downloadpage(item.url).data
|
||||||
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
||||||
scrapedshow, scrapedthumbnail = scrapertools.find_single_match(data,
|
|
||||||
'<h1 class="entry-title">([^"]+)<\/h1>.+?<img .+? src="([^"]+)"')
|
scrapedshow = scrapertools.find_single_match(
|
||||||
data = scrapertools.find_single_match(data, '<div class="entry-content">(.+?)<div id="wpdevar')
|
data, '(?s)<h1 class="post-title">([^"]+)<\/h1>')
|
||||||
|
|
||||||
|
scrapedthumbnail = scrapertools.find_single_match(
|
||||||
|
data, '(?s)<h1 class="post-title">*?<img .+? src="([^"]+)"')
|
||||||
|
|
||||||
|
data = scrapertools.find_single_match(
|
||||||
|
data, '(?s)<div class="post-content">(.+?)<ul class="single-share">')
|
||||||
|
|
||||||
patron_caps = '<a href="([^"]+)">([^"]+)<\/a>'
|
patron_caps = '<a href="([^"]+)">([^"]+)<\/a>'
|
||||||
matches = scrapertools.find_multiple_matches(data, patron_caps)
|
matches = scrapertools.find_multiple_matches(data, patron_caps)
|
||||||
i = 0
|
|
||||||
for url, name in matches:
|
for url, name in matches:
|
||||||
i = i + 1
|
patron_validation = 'temporada.*?-([0-9]+).*?[capitulo|episodio]-([0-9]+)'
|
||||||
if i < 10:
|
validation = re.compile(patron_validation, re.DOTALL).findall(url)
|
||||||
title = "1x0" + str(i) + " " + name
|
if validation:
|
||||||
|
season, chapter = scrapertools.find_single_match(
|
||||||
|
url, patron_validation)
|
||||||
|
title = season + "x" + chapter.zfill(2) + " " + name
|
||||||
else:
|
else:
|
||||||
title = "1x" + str(i) + " " + name
|
title = name
|
||||||
|
|
||||||
itemlist.append(
|
itemlist.append(
|
||||||
item.clone(title=title, url=url, action="findvideos", show=scrapedshow, thumbnail=scrapedthumbnail))
|
item.clone(title=title, url=url, action="findvideos", show=scrapedshow, thumbnail=scrapedthumbnail))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user