Eliminado Renumber tools porque era innecesario, y se agrego la renumeración a la única serie que no lo tenia (Ranma 1/2)

This commit is contained in:
danielr460
2017-10-23 12:22:51 -05:00
parent 4dcc6395be
commit 597fa9a7e0
+20 -26
View File
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
from channels import renumbertools
from channelselector import get_thumb from channelselector import get_thumb
from core import httptools from core import httptools
from core import scrapertools from core import scrapertools
@@ -33,7 +32,6 @@ def mainlist(item):
itemlist.append(Item(channel=item.channel, action="lista", title="Series", url=host, itemlist.append(Item(channel=item.channel, action="lista", title="Series", url=host,
thumbnail=thumb_series)) thumbnail=thumb_series))
itemlist = renumbertools.show_option(item.channel, itemlist)
autoplay.show_option(item.channel, itemlist) autoplay.show_option(item.channel, itemlist)
return itemlist return itemlist
@@ -71,9 +69,8 @@ def lista_gen(item):
title = scrapedtitle + " [ " + scrapedlang + "]" title = scrapedtitle + " [ " + scrapedlang + "]"
itemlist.append( itemlist.append(
Item(channel=item.channel, title=title, url=scrapedurl, thumbnail=scrapedthumbnail, action="episodios", Item(channel=item.channel, title=title, url=scrapedurl, thumbnail=scrapedthumbnail, action="episodios",
show=scrapedtitle, context=renumbertools.context(item))) show=scrapedtitle))
tmdb.set_infoLabels(itemlist) tmdb.set_infoLabels(itemlist)
logger.info("Prueba git"+item.title)
# Paginacion # Paginacion
patron_pag = '<a class="nextpostslink" rel="next" href="([^"]+)">' patron_pag = '<a class="nextpostslink" rel="next" href="([^"]+)">'
next_page_url = scrapertools.find_single_match(data, patron_pag) next_page_url = scrapertools.find_single_match(data, patron_pag)
@@ -99,7 +96,7 @@ def lista(item):
for link, name in matches: for link, name in matches:
title = name + " [Latino]" title = name + " [Latino]"
url = link url = link
context1=[renumbertools.context(item), autoplay.context] context1=[autoplay.context]
itemlist.append( itemlist.append(
item.clone(title=title, url=url, plot=title, action="episodios", show=title, item.clone(title=title, url=url, plot=title, action="episodios", show=title,
context=context1)) context=context1))
@@ -130,31 +127,23 @@ def episodios(item):
number = 0 number = 0
ncap = 0 ncap = 0
A = 1 A = 1
tempo=1
for temp, link, name in matches: for temp, link, name in matches:
if A != temp: if A != temp and "Ranma" not in show:
number = 0 number = 0
number = number + 1
if "Ranma" in show: if "Ranma" in show:
number = int(temp) number,tempo=renumerar_ranma(number,tempo,18+1,1)
temp = str(1) number,tempo=renumerar_ranma(number,tempo,22+1,2)
else: number,tempo=renumerar_ranma(number,tempo,24+1,3)
number = number + 1 number,tempo=renumerar_ranma(number,tempo,24+1,4)
if number < 10: number,tempo=renumerar_ranma(number,tempo,24+1,5)
capi = "0" + str(number) number,tempo=renumerar_ranma(number,tempo,24+1,6)
else: capi=str(number).zfill(2)
capi = str(number)
if "Ranma" in show: if "Ranma" in show:
season = 1 title = "{0}x{1} - ({2})".format(str(tempo), capi, name)
episode = number
season, episode = renumbertools.numbered_for_tratk(
item.channel, item.show, season, episode)
date = name
if episode < 10:
capi = "0" + str(episode)
else:
capi = episode
title = str(season) + "x" + str(capi) + " - " + name # "{0}x{1} - ({2})".format(season, episode, date)
else: else:
title = str(temp) + "x" + capi + " - " + name title = "{0}x{1} - ({2})".format(str(temp), capi, name)
url = link url = link
A = temp A = temp
itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, show=show)) itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, show=show))
@@ -166,6 +155,11 @@ def episodios(item):
return itemlist return itemlist
def renumerar_ranma(number,tempo,final,actual):
if number==final and tempo==actual:
tempo=tempo+1
number=1
return number, tempo
def findvideos(item): def findvideos(item):
logger.info() logger.info()