Episodio 0','>Episodio-0')
+ # matches = scrapertools.find_multiple_matches(blocco, r'Episodio[^\d](\d*)')
+ # logger.debug(blocco)
+ # logger.debug(matches)
+ # episodes = []
+ # if len(matches) > 0:
+ # for string, episode in matches:
+ # episodes.append([
+ # "".join([season, "x", episode]),
+ # season,
+ # episode
+ # ])
+
+ else:
+ title = scrapedtitle.split(" S0")[0].strip()
+ title = title.split(" S1")[0].strip()
+ title = title.split(" S2")[0].strip()
+ episodes = scrapertools.find_multiple_matches(scrapedtitle,r'((\d*)x(\d*))')
+ # logger.debug(scrapedtitle)
+ # logger.debug(episodes)
+
+ for fullepisode, season, episode in episodes:
+ infoLabels = {}
+ infoLabels['season'] = season
+ infoLabels['episode'] = episode
+
+ itemlist.append(
+ Item(channel=item.channel,
+ extra=item.extra,
+ action="findvideos",
+ fulltitle=scrapedtitle,
+ show=scrapedtitle,
+ title=fullepisode,
+ url=scrapedurl,
+ thumbnail=scrapedthumbnail,
+ plot=scrapedplot,
+ contentSerieName=title,
+ infoLabels=infoLabels,
+ folder=True))
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
@@ -154,16 +216,11 @@ def episodes(item):
patron = '\d+\s*\d+'
next_page = scrapertools.find_single_match(data, patron)
if next_page != "":
- itemlist.append(
- Item(channel=item.channel,
- action='episodes',
- contentType=item.contentType,
- title=support.typo(config.get_localized_string(30992), 'color kod bold'),
- url=next_page,
- args=item.args,
- thumbnail=support.thumb()))
-
- # support.videolibrary(itemlist,item,'bold color kod')
+ item.url = next_page
+ itemlist = episodios(item,itemlist)
+ else:
+ item.url = item.originalUrl
+ support.videolibrary(itemlist,item,'bold color kod')
return itemlist
@@ -175,6 +232,24 @@ def findvideos(item):
data = httptools.downloadpage(item.url).data
+ # recupero il blocco contenente i link
+ blocco = scrapertools.find_single_match(data,'
[\s\S.]*?
\d+\s*\d+'
- next_page = scrapertools.find_single_match(data, patron)
- if next_page != "":
- if item.extra == "search_tv":
- next_page = next_page.replace('&', '&')
- itemlist.append(
- Item(channel=item.channel,
- action='peliculas_tv',
- contentType=item.contentType,
- title=support.typo(config.get_localized_string(30992), 'color kod bold'),
- url=next_page,
- args=item.args,
- extra=item.extra,
- thumbnail=support.thumb()))
+ support.nextPage(itemlist,item,data,patron)
+ # next_page = scrapertools.find_single_match(data, patron)
+ # if next_page != "":
+ # if item.extra == "search_tv":
+ # next_page = next_page.replace('&', '&')
+ # itemlist.append(
+ # Item(channel=item.channel,
+ # action='peliculas_tv',
+ # contentType=item.contentType,
+ # title=support.typo(config.get_localized_string(30992), 'color kod bold'),
+ # url=next_page,
+ # args=item.args,
+ # extra=item.extra,
+ # thumbnail=support.thumb()))
return itemlist
@@ -257,11 +338,11 @@ def peliculas_tv(item):
# ----------------------------------------------------------------------------------------------------------------
def newest(categoria):
- logger.info('serietvsubita' + " newest" + categoria)
+ logger.info(__channel__ + " newest" + categoria)
itemlist = []
item = Item()
- item.url = host;
- item.extra = 'serie';
+ item.url = host
+ item.extra = 'serie'
try:
if categoria == "series":
itemlist = peliculas_tv(item)
@@ -282,32 +363,6 @@ def newest(categoria):
def search(item, texto):
logger.info(item.channel + " search")
itemlist = []
- item.extra = "search_tv"
-
- item.url = host + "/?s=" + texto + "&op.x=0&op.y=0"
-
- try:
- return peliculas_tv(item)
-
- except:
- import sys
- for line in sys.exc_info():
- logger.error("%s" % line)
- return []
-
-
-# ================================================================================================================
-
-# ----------------------------------------------------------------------------------------------------------------
-def list_az(item):
- support.log(item.channel+" list_az")
- itemlist = []
- PERPAGE = 50
-
- p = 1
- if '{}' in item.url:
- item.url, p = item.url.split('{}')
- p = int(p)
# Scarico la pagina
data = httptools.downloadpage(item.url).data
@@ -317,35 +372,72 @@ def list_az(item):
matches = re.compile(patron, re.DOTALL).findall(data)
for i, (scrapedurl, scrapedtitle) in enumerate(matches):
- scrapedplot = ""
- scrapedthumbnail = ""
- if (p - 1) * PERPAGE > i: continue
- if i >= p * PERPAGE: break
- title = cleantitle(scrapedtitle)
- itemlist.append(
- Item(channel=item.channel,
- extra=item.extra,
- action="episodes",
- title=title,
- url=scrapedurl,
- fulltitle=title,
- show=title,
- plot=scrapedplot,
- folder=True))
+ if texto.upper() in scrapedtitle.upper():
+ scrapedthumbnail = ""
+ scrapedplot = ""
+ title = cleantitle(scrapedtitle)
+ itemlist.append(
+ Item(channel=item.channel,
+ extra=item.extra,
+ action="episodios",
+ title=title,
+ url=scrapedurl,
+ thumbnail=scrapedthumbnail,
+ fulltitle=title,
+ show=title,
+ plot=scrapedplot,
+ contentType='episode',
+ originalUrl=scrapedurl,
+ folder=True))
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- # Paginazione
- if len(matches) >= p * PERPAGE:
- scrapedurl = item.url + '{}' + str(p + 1)
+ return itemlist
+
+ # item.extra = "search_tv"
+ #
+ # item.url = host + "/?s=" + texto + "&op.x=0&op.y=0"
+ #
+ # try:
+ # return peliculas_tv(item)
+ #
+ # except:
+ # import sys
+ # for line in sys.exc_info():
+ # logger.error("%s" % line)
+ # return []
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+
+
+def list_az(item):
+ support.log(item.channel+" list_az")
+ itemlist = []
+
+ alphabet = dict()
+
+ # Scarico la pagina
+ data = httptools.downloadpage(item.url).data
+
+ # Articoli
+ patron = '([^<]+)'
+ matches = re.compile(patron, re.DOTALL).findall(data)
+
+ for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+ letter = scrapedtitle[0].upper()
+ if letter not in alphabet:
+ alphabet[letter] = []
+ alphabet[letter].append(scrapedurl+'||'+scrapedtitle)
+
+ for letter in sorted(alphabet):
itemlist.append(
Item(channel=item.channel,
- action='list_az',
- contentType=item.contentType,
- title=support.typo(config.get_localized_string(30992), 'color kod bold'),
- url=scrapedurl,
- args=item.args,
- extra=item.extra,
- thumbnail=support.thumb()))
+ action="lista_serie",
+ url='\n\n'.join(alphabet[letter]),
+ title=letter,
+ fulltitle=letter))
return itemlist