diff --git a/plugin.video.alfa/channels/doomtv.json b/plugin.video.alfa/channels/doomtv.json
index 7e45d32d..f51eb8e8 100755
--- a/plugin.video.alfa/channels/doomtv.json
+++ b/plugin.video.alfa/channels/doomtv.json
@@ -10,31 +10,10 @@
"thumbnail": "https://s2.postimg.org/jivgi4ak9/doomtv.png",
"banner": "https://s32.postimg.org/6gxyripvp/doomtv_banner.png",
"version": 1,
- "changes": [
- {
- "date": "24/06/2017",
- "description": "Cambios para autoplay"
- },
- {
- "date": "06/06/2017",
- "description": "COmpatibilida con AutoPlay"
- },
- {
- "date": "12/05/2017",
- "description": "Fix generos y enlaces"
- },
- {
- "date": "15/03/2017",
- "description": "limpieza código"
- },
- {
- "date": "01/02/2017",
- "description": "Release."
- }
- ],
"categories": [
"latino",
- "movie"
+ "movie",
+ "direct"
],
"settings": [
{
diff --git a/plugin.video.alfa/channels/doomtv.py b/plugin.video.alfa/channels/doomtv.py
old mode 100755
new mode 100644
index 35df32a3..0ab1fe6e
--- a/plugin.video.alfa/channels/doomtv.py
+++ b/plugin.video.alfa/channels/doomtv.py
@@ -18,7 +18,7 @@ list_language = IDIOMAS.values()
CALIDADES = {'1080p': '1080p', '720p': '720p', '480p': '480p', '360p': '360p'}
list_quality = CALIDADES.values()
-list_servers = ['directo']
+list_servers = ['directo', 'openload']
host = 'http://doomtv.net/'
headers = {
@@ -32,10 +32,10 @@ tgenero = {"Comedia": "https://s7.postimg.org/ne9g9zgwb/comedia.png",
"Aventura": "https://s10.postimg.org/6su40czih/aventura.png",
"Romance": "https://s15.postimg.org/fb5j8cl63/romance.png",
"Animación": "https://s13.postimg.org/5on877l87/animacion.png",
- "Ciencia Ficción": "https://s9.postimg.org/diu70s7j3/cienciaficcion.png",
+ "Ciencia ficción": "https://s9.postimg.org/diu70s7j3/cienciaficcion.png",
"Terror": "https://s7.postimg.org/yi0gij3gb/terror.png",
- "Documentales": "https://s16.postimg.org/7xjj4bmol/documental.png",
- "Musical": "https://s29.postimg.org/bbxmdh9c7/musical.png",
+ "Documental": "https://s16.postimg.org/7xjj4bmol/documental.png",
+ "Música": "https://s29.postimg.org/bbxmdh9c7/musical.png",
"Fantasía": "https://s13.postimg.org/65ylohgvb/fantasia.png",
"Bélico Guerra": "https://s23.postimg.org/71itp9hcr/belica.png",
"Misterio": "https://s1.postimg.org/w7fdgf2vj/misterio.png",
@@ -56,7 +56,6 @@ tgenero = {"Comedia": "https://s7.postimg.org/ne9g9zgwb/comedia.png",
def mainlist(item):
logger.info()
- autoplay.init(item.channel, list_servers, list_quality)
itemlist = []
itemlist.append(
@@ -64,7 +63,7 @@ def mainlist(item):
action="lista",
thumbnail='https://s18.postimg.org/fwvaeo6qh/todas.png',
fanart='https://s18.postimg.org/fwvaeo6qh/todas.png',
- url=host
+ url='%s%s'%(host,'peliculas/page/1')
))
itemlist.append(
@@ -72,34 +71,15 @@ def mainlist(item):
action="seccion",
thumbnail='https://s3.postimg.org/5s9jg2wtf/generos.png',
fanart='https://s3.postimg.org/5s9jg2wtf/generos.png',
- url=host,
- extra='generos'
+ url='%s%s' % (host, 'peliculas/page/1'),
))
itemlist.append(
- item.clone(title="Mas vistas",
- action="seccion",
+ item.clone(title="Mas Vistas",
+ action="lista",
thumbnail='https://s9.postimg.org/wmhzu9d7z/vistas.png',
fanart='https://s9.postimg.org/wmhzu9d7z/vistas.png',
- url=host,
- extra='masvistas'
- ))
-
- itemlist.append(
- item.clone(title="Recomendadas",
- action="lista",
- thumbnail='https://s12.postimg.org/s881laywd/recomendadas.png',
- fanart='https://s12.postimg.org/s881laywd/recomendadas.png',
- url=host,
- extra='recomendadas'
- ))
-
- itemlist.append(
- item.clone(title="Por año",
- action="seccion",
- thumbnail='https://s8.postimg.org/7eoedwfg5/pora_o.png',
- fanart='https://s8.postimg.org/7eoedwfg5/pora_o.png',
- url=host, extra='poraño'
+ url='%s%s'%(host,'top-imdb/page/1'),
))
itemlist.append(
@@ -110,8 +90,6 @@ def mainlist(item):
fanart='https://s30.postimg.org/pei7txpa9/buscar.png'
))
- autoplay.show_option(item.channel, itemlist)
-
return itemlist
@@ -123,23 +101,11 @@ def lista(item):
next_page_url = ''
data = httptools.downloadpage(item.url).data
+ data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data)
+
+ patron = 'movie-id=.*?href=(.*?) data-url.*?quality>(.*?)'
+ patron += '(.*?)<\/h2>.*?
(.*?)<\/p>'
- if item.extra == 'recomendadas':
- patron = '.*?'
- patron += '.*?'
- patron += '<\/a>.*?'
- patron += '.*?<\/span>.*?'
- patron += '(.*?)<\/span><\/div>'
- elif item.extra in ['generos', 'poraño', 'buscar']:
- patron = '
.*?'
- patron += '
.*?<\/h2>.*?(?:(.*?)<\/span>)?.*?<\/div>'
- else:
- patron = '
<(?:span) class="player"><\/span><\/a>.*?'
- patron += 'h2>\s*.*?(?:year)">(.*?)<\/span>.*?<\/div>'
matches = re.compile(patron, re.DOTALL).findall(data)
if item.next_page != 'b':
@@ -150,39 +116,36 @@ def lista(item):
else:
matches = matches[max_items:]
next_page = 'a'
- patron_next_page = '
|\s{2,}', "", data)
- accion = 'lista'
- if item.extra == 'masvistas':
- patron = '\d*<\/b>\s*(.*?<\/a>\s*.*?<\/span>\s*.*?<\/i><\/li>)'
- accion = 'findvideos'
- elif item.extra == 'poraño':
- patron = '
|\s{2,}', "", data)
+ patron = 'menu-item-object-category menu-item-\d+>(.*?)<\/a><\/li>'
matches = re.compile(patron, re.DOTALL).findall(data)
@@ -221,61 +175,19 @@ def seccion(item):
url = scrapedurl
title = scrapedtitle
thumbnail = ''
- fanart = ''
- plot = ''
- year = ''
- contentTitle = ''
- if item.extra == 'masvistas':
- year = re.findall(r'\b\d{4}\b', scrapedtitle)
- title = re.sub(r'<\/a>\s*.*?<\/span>\s*.*?<\/i><\/li>', '', scrapedtitle)
- contentTitle = title
- title = title + ' (' + year[0] + ')'
-
- elif item.extra == 'generos':
- title = re.sub(r'<\/a> \d+', '', scrapedtitle)
- cantidad = re.findall(r'.*?<\/a> (\d+)', scrapedtitle)
- th_title = title
- title = title + ' (' + cantidad[0] + ')'
- thumbnail = tgenero[th_title]
- fanart = thumbnail
-
+ if title in tgenero:
+ thumbnail = tgenero[title]
if url not in duplicado:
itemlist.append(
Item(channel=item.channel,
- action=accion,
+ action='lista',
title=title,
url=url,
- thumbnail=thumbnail,
- plot=plot,
- fanart=fanart,
- contentTitle=contentTitle,
- infoLabels={'year': year}
+ thumbnail = thumbnail
))
- duplicado.append(url)
- tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
return itemlist
-def unpack(packed):
- p, c, k = re.search("}\('(.*)', *\d+, *(\d+), *'(.*)'\.", packed, re.DOTALL).groups()
- for c in reversed(range(int(c))):
- if k.split('|')[c]: p = re.sub(r'(\b%s\b)' % c, k.split('|')[c], p)
- p = p.replace('\\', '')
- p = p.decode('string_escape')
- return p
-
-
-def getinfo(page_url):
- info = ()
- logger.info()
- data = httptools.downloadpage(page_url).data
- thumbnail = scrapertools.find_single_match(data, '
|\s{2,}', "", data)
+ patron = 'id=(tab\d+)>