') - patron = r'(?:
\s*\s*
]+>'
+ list_groups = ["url", "title", "thumb"]
- # Carica la pagina
- data = httptools.downloadpage(item.url).data
+ if item.args == "latest":
+ patron += r'.*?aj-eps">(.*?)'
+ data = httptools.downloadpage(item.url).data
- # Estrae i contenuti
- patron = '
\s*\s*]+>'
- matches = re.compile(patron, re.DOTALL).findall(data)
+ matches = re.compile(patron, re.S).findall(data)
+ itemlist = []
- for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
- scrapedplot = ""
- scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
- scrapedurl = scrapedurl.replace("-1/", "-links/")
+ for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedep in matches:
+ s, ep = scrapertools.find_single_match(scrapedep, r'(\d+)x(\d+)\s')
+ itemlist.append(
+ Item(channel=item.channel,
+ action="episodios",
+ contentType=item.contentType,
+ title="[B]" + scrapedtitle + "[/B] " + scrapedep,
+ fulltitle=scrapedtitle,
+ show=scrapedtitle,
+ url=scrapedurl,
+ extra=item.extra,
+ args={"season": s, "episode": ep}
+ ))
- itemlist.append(
- Item(channel=item.channel,
- action="episodios",
- fulltitle=scrapedtitle,
- show=scrapedtitle,
- title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
- url=scrapedurl,
- thumbnail=scrapedthumbnail,
- plot=scrapedplot,
- folder=True))
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+ return itemlist
+ else:
+ patron_next = r''
+ itemlist = support.scrape(item, patron, list_groups, patronNext=patron_next, action="episodios")
- # Paginazione
- patronvideos = ''
- matches = re.compile(patronvideos, re.DOTALL).findall(data)
+ if itemlist[-1].action != "peliculas":
+ itemlist.pop()
- if len(matches) > 0:
- scrapedurl = urlparse.urljoin(item.url, matches[0])
- itemlist.append(
- Item(channel=item.channel,
- action="peliculas",
- title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
- url=scrapedurl,
- thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
- folder=True))
+ return itemlist
- tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- return itemlist
def search(item, texto):
- logger.info("[italiaserie.py] " + item.url + " search " + texto)
+ support.log("s=", texto)
item.url = host + "/?s=" + texto
try:
return peliculas(item)
@@ -173,129 +111,60 @@ def search(item, texto):
return []
-def episodios(item):
- def load_episodios(html, item, itemlist, lang_title):
- patron = '((?:.*?]+>[^<][^<]+<(?:b|\/)[^>]+>)+)'
- matches = re.compile(patron).findall(html)
- for data in matches:
- # Estrazione
- scrapedtitle = data.split(']*>', '', scrapedtitle).strip()
- if scrapedtitle != 'Categorie':
- scrapedtitle = scrapedtitle.replace('×', 'x')
- scrapedtitle = scrapedtitle.replace('×', 'x')
- itemlist.append(
- Item(channel=item.channel,
- action="findvideos",
- contentType="episode",
- title="[COLOR azure]%s[/COLOR]" % (scrapedtitle + " (" + lang_title + ")"),
- url=data,
- thumbnail=item.thumbnail,
- extra=item.extra,
- fulltitle=scrapedtitle + " (" + lang_title + ")" + ' - ' + item.show,
- show=item.show))
+def menu(item):
+ support.log()
+ patron = r'(.*?) '
+ return support.scrape(item, patron, ["url", "title"], action="peliculas")
- logger.info("[italiaserie.py] episodios")
+
+def episodios(item):
+ support.log()
+
+ patron = r'
'
+ data = httptools.downloadpage(item.url).data
+ matches = re.compile(patron, re.S).findall(data)
+
+ if item.args:
+ s = (int(item.args["season"]))
+ try:
+ matches = [matches[s]]
+ except:
+ matches = [matches[(s - 1)]]
itemlist = []
- # Download pagina
- data = httptools.downloadpage(item.url).data
- data = scrapertools.decodeHtmlentities(data)
- if 'CLICCA QUI PER GUARDARE TUTTI GLI EPISODI' in data:
- item.url = re.sub('\-\d+[^\d]+$', '-links', item.url)
- data = httptools.downloadpage(item.url).data
- data = scrapertools.decodeHtmlentities(data)
- data = scrapertools.find_single_match(data, '
(.*?)')
+ for season, block in matches:
+ patron = r'
\s+(.*?)\s+\s(Episodio ' + str(ep) + r') .*?', data, re.DOTALL)
-
- data = []
- for url in matches:
- url, c = unshortenit.unshorten(url)
- data.append(url)
-
- itemlist = servertools.find_video_items(data=str(data))
-
- for videoitem in itemlist:
- videoitem.title = item.title + videoitem.title
- videoitem.fulltitle = item.fulltitle
- videoitem.thumbnail = item.thumbnail
- videoitem.show = item.show
- videoitem.plot = item.plot
- videoitem.channel = item.channel
- videoitem.contentType = item.contentType
-
- return itemlist
-
-
-def findepvideos(item):
- logger.info("kod.italiaserie findepvideos")
-
- itemlist = []
-
- # Carica la pagina
- data = item.url
-
- matches = re.findall(r']*>[^<]+', data, re.DOTALL)
-
- data = []
- for url in matches:
- url, c = unshortenit.unshorten(url)
- data.append(url)
-
- itemlist = servertools.find_video_items(data=str(data))
-
- for videoitem in itemlist:
- videoitem.title = item.title + videoitem.title
- videoitem.fulltitle = item.fulltitle
- videoitem.thumbnail = item.thumbnail
- videoitem.show = item.show
- videoitem.plot = item.plot
- videoitem.channel = item.channel
- videoitem.contentType = item.contentType
+ autoplay.start(itemlist, item)
return itemlist
diff --git a/plugin.video.alfa/channels/vedohd.py b/plugin.video.alfa/channels/vedohd.py
index 71e3c5ba..4850640c 100644
--- a/plugin.video.alfa/channels/vedohd.py
+++ b/plugin.video.alfa/channels/vedohd.py
@@ -101,12 +101,14 @@ def findvideos(item):
def generos(item):
+ findhost()
patron = '([a-zA-Z]+)'
return support.scrape(item, patron, ['url', 'title'], patron_block='Genere', action='peliculas', url_host=host)
def year(item):
- patron = '([a-zA-Z]+)'
+ findhost()
+ patron = r'(\d+)'
return support.scrape(item, patron, ['url', 'title'], patron_block='Anno', action='peliculas', url_host=host)
diff --git a/plugin.video.alfa/core/scrapertools.py b/plugin.video.alfa/core/scrapertools.py
index 8a45645f..5d0be133 100755
--- a/plugin.video.alfa/core/scrapertools.py
+++ b/plugin.video.alfa/core/scrapertools.py
@@ -367,7 +367,7 @@ def get_season_and_episode(title):
filename = ""
patrons = ["(\d+)\s*[x-]\s*(\d+)", "(\d+)\s*×\s*(\d+)", "(?:s|t)(\d+)e(\d+)",
- "(?:season|temp\w*)\s*(\d+)\s*(?:capitulo|epi|episode\w*)\s*(\d+)"]
+ "(?:season|temp|stagione\w*)\s*(\d+)\s*(?:capitulo|epi|episode|episodio\w*)\s*(\d+)"]
for patron in patrons:
try: