diff --git a/plugin.video.alfa/channels/czechvideo.py b/plugin.video.alfa/channels/czechvideo.py
index 84e0852b..63268dfb 100644
--- a/plugin.video.alfa/channels/czechvideo.py
+++ b/plugin.video.alfa/channels/czechvideo.py
@@ -3,21 +3,18 @@
import urlparse,urllib2,urllib,re
import os, sys
-from core import jsontools as json
from core import scrapertools
from core import servertools
from core.item import Item
from platformcode import config, logger
from core import httptools
-from core import tmdb
host = 'http://czechvideo.org'
-
def mainlist(item):
logger.info()
itemlist = []
- itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
+ itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
return itemlist
@@ -28,7 +25,7 @@ def search(item, texto):
texto = texto.replace(" ", "+")
item.url = host + "/tags/%s/" % texto
try:
- return peliculas(item)
+ return lista(item)
except:
import sys
for line in sys.exc_info():
@@ -40,43 +37,46 @@ def categorias(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
- data = scrapertools.get_match(data,'
')
+ data = scrapertools.get_match(data,'(.*?)')
patron = '
(.*?)'
matches = re.compile(patron,re.DOTALL).findall(data)
scrapertools.printMatches(matches)
for scrapedurl,scrapedtitle in matches:
scrapedplot = ""
scrapedthumbnail = ""
- scrapedtitle = str(scrapedtitle)
- scrapedurl = host + scrapedurl
+ scrapedurl = urlparse.urljoin(item.url,scrapedurl)
thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
- itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+ itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+ thumbnail=scrapedthumbnail, plot=scrapedplot) )
return itemlist
-def peliculas(item):
+def lista(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
- patron = '
'
+ patron = '
.*?'
+ patron += '
(.*?)'
matches = re.compile(patron,re.DOTALL).findall(data)
scrapertools.printMatches(matches)
for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
scrapedthumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
scrapedplot = ""
- itemlist.append( Item(channel=item.channel, action="play", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
- next_page_url = scrapertools.find_single_match(data,'
Next')
- if next_page_url!="":
- next_page_url = urlparse.urljoin(item.url,next_page_url)
- itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+ itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+ thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+ next_page = scrapertools.find_single_match(data,'
Next')
+ if next_page!="":
+ next_page = urlparse.urljoin(item.url,next_page)
+ itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
return itemlist
def play(item):
logger.info()
data = scrapertools.cachePage(item.url)
- url = scrapertools.find_single_match(data,'