From d625419219ffc3fdcf11d61b9e9868787418aefa Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Wed, 15 Nov 2017 17:38:52 -0500
Subject: [PATCH 01/49] Update xbmc_config_menu.py
---
plugin.video.alfa/platformcode/xbmc_config_menu.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugin.video.alfa/platformcode/xbmc_config_menu.py b/plugin.video.alfa/platformcode/xbmc_config_menu.py
index 34226f97..6990071b 100755
--- a/plugin.video.alfa/platformcode/xbmc_config_menu.py
+++ b/plugin.video.alfa/platformcode/xbmc_config_menu.py
@@ -412,6 +412,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
self.addControl(control)
control.setVisible(False)
+ control.setLabel(c["label"])
# frodo fix
s = self.values[c["id"]]
if s is None:
From 878dbc8393a76d6099bf0407e5505f3955145b34 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Wed, 15 Nov 2017 17:39:41 -0500
Subject: [PATCH 02/49] seodiv: actualizado
---
plugin.video.alfa/channels/seodiv.py | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/plugin.video.alfa/channels/seodiv.py b/plugin.video.alfa/channels/seodiv.py
index 1ee0c90b..1e22872a 100755
--- a/plugin.video.alfa/channels/seodiv.py
+++ b/plugin.video.alfa/channels/seodiv.py
@@ -236,31 +236,17 @@ def episodiosxtemp(item):
def findvideos(item):
logger.info()
itemlist = []
- lang=[]
data = httptools.downloadpage(item.url).data
video_items = servertools.find_video_items(item)
data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data)
- language_items=scrapertools.find_single_match(data,
- '
Date: Fri, 17 Nov 2017 17:01:06 -0300
Subject: [PATCH 30/49] cambios para news
---
plugin.video.alfa/channels/alltorrent.json | 8 +++
plugin.video.alfa/channels/alltorrent.py | 24 ++++++++
plugin.video.alfa/channels/cinecalidad.json | 16 +++++
plugin.video.alfa/channels/cinecalidad.py | 10 ++--
plugin.video.alfa/channels/cinetux.json | 24 ++++++++
plugin.video.alfa/channels/cinetux.py | 28 +++++----
plugin.video.alfa/channels/cuelgame.json | 8 +++
plugin.video.alfa/channels/cuelgame.py | 22 +++++++
plugin.video.alfa/channels/descargasmix.json | 8 +++
plugin.video.alfa/channels/descargasmix.py | 35 +++++++++++
plugin.video.alfa/channels/divxatope.json | 8 +++
plugin.video.alfa/channels/divxatope.py | 2 +-
plugin.video.alfa/channels/divxtotal.json | 8 +++
plugin.video.alfa/channels/divxtotal.py | 23 +++++++
plugin.video.alfa/channels/doomtv.json | 8 +++
plugin.video.alfa/channels/doomtv.py | 2 +-
plugin.video.alfa/channels/elitetorrent.json | 10 ++++
plugin.video.alfa/channels/elitetorrent.py | 21 +++++++
plugin.video.alfa/channels/gmobi.json | 16 +++++
plugin.video.alfa/channels/gmobi.py | 25 +++++++-
plugin.video.alfa/channels/lacajita.json | 16 +++++
plugin.video.alfa/channels/lacajita.py | 17 +++++-
plugin.video.alfa/channels/mejortorrent.json | 8 +++
plugin.video.alfa/channels/mejortorrent.py | 25 ++++++++
plugin.video.alfa/channels/miltorrents.json | 8 +++
plugin.video.alfa/channels/miltorrents.py | 25 ++++++++
plugin.video.alfa/channels/newpct1.json | 8 +++
plugin.video.alfa/channels/newpct1.py | 26 ++++++++
plugin.video.alfa/channels/news.py | 33 +++++++++-
plugin.video.alfa/channels/peliculasdk.json | 8 +++
plugin.video.alfa/channels/peliculasdk.py | 22 +++++++
plugin.video.alfa/channels/peliculasnu.json | 16 +++++
plugin.video.alfa/channels/peliculasnu.py | 6 ++
plugin.video.alfa/channels/peliculasrey.json | 60 ++++++++++++++++++-
plugin.video.alfa/channels/peliculasrey.py | 38 ++++++++++++
plugin.video.alfa/channels/peliscity.json | 60 ++++++++++++++++++-
plugin.video.alfa/channels/peliscity.py | 38 ++++++++++++
plugin.video.alfa/channels/pelismagnet.json | 8 +++
plugin.video.alfa/channels/pelismagnet.py | 26 ++++++++
plugin.video.alfa/channels/pelismundo.json | 16 +++++
plugin.video.alfa/channels/pelismundo.py | 10 +++-
plugin.video.alfa/channels/pelisplanet.json | 16 +++++
plugin.video.alfa/channels/pelisplanet.py | 5 ++
plugin.video.alfa/channels/tiotorrent.json | 8 +++
plugin.video.alfa/channels/tiotorrent.py | 12 +++-
plugin.video.alfa/channels/torrentlocura.json | 24 +++++---
plugin.video.alfa/channels/torrentlocura.py | 27 +++++++++
.../channels/verpeliculasnuevas.json | 34 ++++++++++-
.../channels/verpeliculasnuevas.py | 13 ++++
plugin.video.alfa/channels/verpelis.json | 16 +++++
plugin.video.alfa/channels/verpelis.py | 5 ++
plugin.video.alfa/channels/zonatorrent.json | 8 +++
plugin.video.alfa/channels/zonatorrent.py | 2 +
53 files changed, 912 insertions(+), 38 deletions(-)
diff --git a/plugin.video.alfa/channels/alltorrent.json b/plugin.video.alfa/channels/alltorrent.json
index e279dbd3..c627ebbb 100755
--- a/plugin.video.alfa/channels/alltorrent.json
+++ b/plugin.video.alfa/channels/alltorrent.json
@@ -25,6 +25,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/alltorrent.py b/plugin.video.alfa/channels/alltorrent.py
index 85190bb6..34869367 100755
--- a/plugin.video.alfa/channels/alltorrent.py
+++ b/plugin.video.alfa/channels/alltorrent.py
@@ -54,6 +54,7 @@ def browser(url):
api_key = "2e2160006592024ba87ccdf78c28f49f"
api_fankey = "dffe90fba4d02c199ae7a9e71330c987"
+host = 'http://alltorrent.net/'
def mainlist(item):
logger.info()
@@ -392,3 +393,26 @@ def get_art(item):
item.extra = item.extra + "|" + item.thumbnail
else:
item.extra = item.extra + "|" + item.thumbnail
+
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = host
+
+ itemlist = scraper(item)
+
+ if itemlist[-1].action == "[COLOR olivedrab][B]Siguiente >>[/B][/COLOR]":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/cinecalidad.json b/plugin.video.alfa/channels/cinecalidad.json
index 3db32aac..9f31cf60 100755
--- a/plugin.video.alfa/channels/cinecalidad.json
+++ b/plugin.video.alfa/channels/cinecalidad.json
@@ -55,6 +55,22 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
diff --git a/plugin.video.alfa/channels/cinecalidad.py b/plugin.video.alfa/channels/cinecalidad.py
index 25902a51..34407b61 100644
--- a/plugin.video.alfa/channels/cinecalidad.py
+++ b/plugin.video.alfa/channels/cinecalidad.py
@@ -378,12 +378,14 @@ def newest(categoria):
itemlist = []
item = Item()
try:
- if categoria == 'peliculas':
- item.url = 'http://www.cinecalidad.to'
+ if categoria in ['peliculas','latino']:
+ item.url = 'http://www.cinecalidad.com'
elif categoria == 'infantiles':
- item.url = 'http://www.cinecalidad.to/genero-peliculas/infantil/'
+ item.url = 'http://www.cinecalidad.com/genero-peliculas/infantil/'
elif categoria == 'terror':
- item.url = 'http://www.cinecalidad.to/genero-peliculas/terror/'
+ item.url = 'http://www.cinecalidad.com/genero-peliculas/terror/'
+ elif categoria == 'castellano':
+ item.url = 'http://www.cinecalidad.com/espana/'
itemlist = peliculas(item)
if itemlist[-1].title == 'Página siguiente >>':
itemlist.pop()
diff --git a/plugin.video.alfa/channels/cinetux.json b/plugin.video.alfa/channels/cinetux.json
index bf4d08eb..b3e3a7bd 100755
--- a/plugin.video.alfa/channels/cinetux.json
+++ b/plugin.video.alfa/channels/cinetux.json
@@ -44,6 +44,30 @@
"enabled": true,
"visible": true
},
+ {
+ "id": "include_in_newest_terror",
+ "type": "bool",
+ "label": "Incluir en Novedades - terror",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
{
"id": "modo_grafico",
"type": "bool",
diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py
index 3bcc11e5..fdc61f6e 100644
--- a/plugin.video.alfa/channels/cinetux.py
+++ b/plugin.video.alfa/channels/cinetux.py
@@ -90,26 +90,30 @@ def newest(categoria):
if categoria == 'peliculas':
item.url = CHANNEL_HOST
item.action = "peliculas"
- itemlist = peliculas(item)
-
- if itemlist[-1].action == "peliculas":
- itemlist.pop()
elif categoria == 'documentales':
item.url = CHANNEL_HOST + "genero/documental/"
item.action = "peliculas"
- itemlist = peliculas(item)
-
- if itemlist[-1].action == "peliculas":
- itemlist.pop()
elif categoria == 'infantiles':
- item.url = CHANNEL_HOST + "genero/infantil/"
+ item.url = CHANNEL_HOST + "genero/animacion/"
item.action = "peliculas"
- itemlist = peliculas(item)
- if itemlist[-1].action == "peliculas":
- itemlist.pop()
+ elif categoria == 'terror':
+ item.url = CHANNEL_HOST + "genero/terror/"
+ item.action = "peliculas"
+
+ elif categoria == 'castellano':
+ item.url = CHANNEL_HOST + "idioma/espanol/"
+ item.action = "peliculas"
+
+ elif categoria == 'latino':
+ item.url = CHANNEL_HOST + "idioma/latino/"
+ item.action = "peliculas"
+
+ itemlist = peliculas(item)
+ if itemlist[-1].action == "peliculas":
+ itemlist.pop()
# Se captura la excepción, para no interrumpir al canal novedades si un canal falla
except:
diff --git a/plugin.video.alfa/channels/cuelgame.json b/plugin.video.alfa/channels/cuelgame.json
index 8e964bbf..0a40b064 100755
--- a/plugin.video.alfa/channels/cuelgame.json
+++ b/plugin.video.alfa/channels/cuelgame.json
@@ -21,6 +21,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/cuelgame.py b/plugin.video.alfa/channels/cuelgame.py
index 0760121a..7e323deb 100755
--- a/plugin.video.alfa/channels/cuelgame.py
+++ b/plugin.video.alfa/channels/cuelgame.py
@@ -1223,3 +1223,25 @@ def browser(url):
response = r.read()
return response
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = 'http://cuelgame.net/?category=4'
+
+ itemlist = scraper(item)
+
+ if itemlist[-1].action == "Página siguiente >>":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/descargasmix.json b/plugin.video.alfa/channels/descargasmix.json
index c20c42a9..95890119 100644
--- a/plugin.video.alfa/channels/descargasmix.json
+++ b/plugin.video.alfa/channels/descargasmix.json
@@ -43,6 +43,14 @@
"default": false,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/descargasmix.py b/plugin.video.alfa/channels/descargasmix.py
index cc49d16a..1fac7664 100644
--- a/plugin.video.alfa/channels/descargasmix.py
+++ b/plugin.video.alfa/channels/descargasmix.py
@@ -535,3 +535,38 @@ def get_data(url_orig, get_host=False):
break
return response.data
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = host+'/peliculas'
+
+ itemlist = entradas(item)
+ if itemlist[-1].title == ">> Siguiente":
+ itemlist.pop()
+
+ item.url = host + '/series'
+
+ itemlist.extend(entradas(item))
+ if itemlist[-1].title == ">> Siguiente":
+ itemlist.pop()
+
+ item.url = host + '/anime'
+
+ itemlist.extend(entradas(item))
+
+
+ if itemlist[-1].title == ">> Siguiente":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/divxatope.json b/plugin.video.alfa/channels/divxatope.json
index 9c2603b5..8f70eb4a 100755
--- a/plugin.video.alfa/channels/divxatope.json
+++ b/plugin.video.alfa/channels/divxatope.json
@@ -35,6 +35,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/divxatope.py b/plugin.video.alfa/channels/divxatope.py
index 71965fc9..276dd858 100644
--- a/plugin.video.alfa/channels/divxatope.py
+++ b/plugin.video.alfa/channels/divxatope.py
@@ -94,7 +94,7 @@ def newest(categoria):
itemlist = []
item = Item()
try:
- if categoria == 'peliculas':
+ if categoria in ['peliculas', 'torrent']:
item.url = "http://www.divxatope1.com/peliculas"
elif categoria == 'series':
diff --git a/plugin.video.alfa/channels/divxtotal.json b/plugin.video.alfa/channels/divxtotal.json
index 208a9a23..56a954e0 100755
--- a/plugin.video.alfa/channels/divxtotal.json
+++ b/plugin.video.alfa/channels/divxtotal.json
@@ -26,6 +26,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/divxtotal.py b/plugin.video.alfa/channels/divxtotal.py
index 889bd667..0163a61b 100644
--- a/plugin.video.alfa/channels/divxtotal.py
+++ b/plugin.video.alfa/channels/divxtotal.py
@@ -1020,3 +1020,26 @@ def ext_size(url):
ext_v = ext_v + " -- No reproducible"
size = ""
return ext_v, size
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = 'http://www.divxtotal.com/peliculas/'
+ item.contentType="movie"
+
+ itemlist = scraper(item)
+
+ if itemlist[-1].title == "[COLOR springgreen][B]Siguiente >>[/B][/COLOR]":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/doomtv.json b/plugin.video.alfa/channels/doomtv.json
index f972754b..9845847f 100644
--- a/plugin.video.alfa/channels/doomtv.json
+++ b/plugin.video.alfa/channels/doomtv.json
@@ -55,6 +55,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/doomtv.py b/plugin.video.alfa/channels/doomtv.py
index db8bf102..2bc1209f 100644
--- a/plugin.video.alfa/channels/doomtv.py
+++ b/plugin.video.alfa/channels/doomtv.py
@@ -202,7 +202,7 @@ def newest(categoria):
item = Item()
# categoria='peliculas'
try:
- if categoria == 'peliculas':
+ if categoria in ['peliculas', 'latino']:
item.url = host +'peliculas/page/1'
elif categoria == 'infantiles':
item.url = host + 'categoria/animacion/'
diff --git a/plugin.video.alfa/channels/elitetorrent.json b/plugin.video.alfa/channels/elitetorrent.json
index b81aff68..a0044960 100644
--- a/plugin.video.alfa/channels/elitetorrent.json
+++ b/plugin.video.alfa/channels/elitetorrent.json
@@ -12,5 +12,15 @@
"tvshow",
"documentary",
"vos"
+ ],
+ "settings":[
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ }
]
}
diff --git a/plugin.video.alfa/channels/elitetorrent.py b/plugin.video.alfa/channels/elitetorrent.py
index bd3c993e..66181660 100644
--- a/plugin.video.alfa/channels/elitetorrent.py
+++ b/plugin.video.alfa/channels/elitetorrent.py
@@ -105,3 +105,24 @@ def play(item):
thumbnail=item.thumbnail, plot=item.plot, folder=False))
return itemlist
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = 'http://www.elitetorrent.wesconference.net/categoria/2/peliculas/modo:mini'
+
+ itemlist = peliculas(item)
+ if itemlist[-1].title == "Página siguiente >>":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/gmobi.json b/plugin.video.alfa/channels/gmobi.json
index 3c144db9..7407eb83 100644
--- a/plugin.video.alfa/channels/gmobi.json
+++ b/plugin.video.alfa/channels/gmobi.json
@@ -18,6 +18,22 @@
"default": false,
"enabled": false,
"visible": false
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
diff --git a/plugin.video.alfa/channels/gmobi.py b/plugin.video.alfa/channels/gmobi.py
index ebe6145e..bbf3a0c9 100644
--- a/plugin.video.alfa/channels/gmobi.py
+++ b/plugin.video.alfa/channels/gmobi.py
@@ -12,10 +12,11 @@ from core import tmdb
from core.item import Item
from platformcode import logger
+host = 'http://gnula.mobi/'
def mainlist(item):
logger.info()
itemlist = list()
- itemlist.append(item.clone(title="Novedades", action="peliculas", url="http://gnula.mobi/"))
+ itemlist.append(item.clone(title="Novedades", action="peliculas", url=host))
itemlist.append(item.clone(title="Castellano", action="peliculas",
url="http://www.gnula.mobi/tag/espanol/"))
itemlist.append(item.clone(title="Latino", action="peliculas", url="http://gnula.mobi/tag/latino/"))
@@ -113,3 +114,25 @@ def findvideos(item):
def play(item):
item.thumbnail = item.contentThumbnail
return [item]
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'peliculas':
+ item.url = host
+ elif categoria == 'castellano':
+ item.url = host +'tag/espanol/'
+ elif categoria == 'latino':
+ item.url = host +'tag/latino/'
+ itemlist = peliculas(item)
+ if "Pagina" in itemlist[-1].title:
+ itemlist.pop()
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/lacajita.json b/plugin.video.alfa/channels/lacajita.json
index 380ab715..3a45314b 100755
--- a/plugin.video.alfa/channels/lacajita.json
+++ b/plugin.video.alfa/channels/lacajita.json
@@ -48,6 +48,22 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/lacajita.py b/plugin.video.alfa/channels/lacajita.py
index 94dd3024..5788e369 100644
--- a/plugin.video.alfa/channels/lacajita.py
+++ b/plugin.video.alfa/channels/lacajita.py
@@ -265,14 +265,25 @@ def newest(categoria):
logger.info()
itemlist = []
item = Item()
+ item.page = 0
try:
if categoria == "terror":
item.url = host +"/listado/terror/"
item.action = "updated"
- item.page = 0
- itemlist = updated(item)
+ itemlist = updated(item)
+ elif categoria == 'castellano':
+ item.url = host + "/estrenos/es/"
+ item.action = "entradas"
- if itemlist[-1].action == "updated":
+ elif categoria == 'latino':
+ item.url = host + "/estrenos/la/"
+ item.action = "entradas"
+
+ if categoria != 'terror':
+ itemlist = entradas(item)
+
+
+ if itemlist[-1].action == item.action:
itemlist.pop()
# Se captura la excepción, para no interrumpir al canal novedades si un canal falla
diff --git a/plugin.video.alfa/channels/mejortorrent.json b/plugin.video.alfa/channels/mejortorrent.json
index e492c42c..a64f06e1 100755
--- a/plugin.video.alfa/channels/mejortorrent.json
+++ b/plugin.video.alfa/channels/mejortorrent.json
@@ -20,6 +20,14 @@
"default": false,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/mejortorrent.py b/plugin.video.alfa/channels/mejortorrent.py
index 7f0c9c66..014562fd 100755
--- a/plugin.video.alfa/channels/mejortorrent.py
+++ b/plugin.video.alfa/channels/mejortorrent.py
@@ -423,3 +423,28 @@ def play(item):
thumbnail=item.thumbnail, plot=item.plot, folder=False))
return itemlist
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = 'http://www.mejortorrent.com/torrents-de-peliculas.html'
+
+ itemlist = getlist(item)
+ if itemlist[-1].title == "Pagina siguiente >>":
+ itemlist.pop()
+ item.url = 'http://www.mejortorrent.com/torrents-de-series.html'
+ itemlist.extend(getlist(item))
+ if itemlist[-1].title == "Pagina siguiente >>":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/miltorrents.json b/plugin.video.alfa/channels/miltorrents.json
index 08ac652c..b9bd1fed 100755
--- a/plugin.video.alfa/channels/miltorrents.json
+++ b/plugin.video.alfa/channels/miltorrents.json
@@ -19,6 +19,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/miltorrents.py b/plugin.video.alfa/channels/miltorrents.py
index 2469fd31..a9b4840f 100755
--- a/plugin.video.alfa/channels/miltorrents.py
+++ b/plugin.video.alfa/channels/miltorrents.py
@@ -1555,3 +1555,28 @@ def busqueda(item):
from channels import search
return search.do_search(new_item, cat)
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = 'http://www.miltorrents.com'
+
+ itemlist = peliculas(item)
+ if itemlist[-1].title == "[COLOR khaki]siguiente[/COLOR]":
+ itemlist.pop()
+ item.url = 'http://www.miltorrents.com/series'
+ itemlist.extend(peliculas(item))
+ if itemlist[-1].title == "[COLOR khaki]siguiente[/COLOR]":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json
index 2f20898b..26b6d67f 100755
--- a/plugin.video.alfa/channels/newpct1.json
+++ b/plugin.video.alfa/channels/newpct1.json
@@ -20,6 +20,14 @@
"default": false,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py
index ae393d51..22b39433 100644
--- a/plugin.video.alfa/channels/newpct1.py
+++ b/plugin.video.alfa/channels/newpct1.py
@@ -442,3 +442,29 @@ def search(item, texto):
for line in sys.exc_info():
logger.error("%s" % line)
return []
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ item.extra = 'pelilist'
+ if categoria == 'torrent':
+ item.url = host+'peliculas/'
+
+ itemlist = listado(item)
+ if itemlist[-1].title == ">> Página siguiente":
+ itemlist.pop()
+ item.url = host+'series/'
+ itemlist.extend(listado(item))
+ if itemlist[-1].title == ">> Página siguiente":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py
index 9fd12030..5a9b7ea3 100644
--- a/plugin.video.alfa/channels/news.py
+++ b/plugin.video.alfa/channels/news.py
@@ -74,6 +74,26 @@ def mainlist(item):
set_category_context(new_item)
itemlist.append(new_item)
+ # if list_canales['Castellano']:
+ thumbnail = get_thumb("channels_documentary.png")
+ new_item = Item(channel=item.channel, action="novedades", extra="castellano", title="Castellano",
+ thumbnail=thumbnail)
+ set_category_context(new_item)
+ itemlist.append(new_item)
+
+ # if list_canales['Latino']:
+ thumbnail = get_thumb("channels_documentary.png")
+ new_item = Item(channel=item.channel, action="novedades", extra="latino", title="Latino",
+ thumbnail=thumbnail)
+ set_category_context(new_item)
+ itemlist.append(new_item)
+
+ # if list_canales['Torrent']:
+ thumbnail = get_thumb("channels_documentary.png")
+ new_item = Item(channel=item.channel, action="novedades", extra="torrent", title="Torrent", thumbnail=thumbnail)
+ set_category_context(new_item)
+ itemlist.append(new_item)
+
#if list_canales['documentales']:
thumbnail = get_thumb("channels_documentary.png")
new_item = Item(channel=item.channel, action="novedades", extra="documentales", title="Documentales",
@@ -95,7 +115,8 @@ def set_category_context(item):
def get_channels_list():
logger.info()
- list_canales = {'peliculas': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [], 'documentales': []}
+ list_canales = {'peliculas': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [],
+ 'castellano': [], 'latino':[], 'torrent':[], 'documentales': []}
any_active = False
# Rellenar listas de canales disponibles
channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json')
@@ -419,6 +440,16 @@ def menu_opciones(item):
title=" - Episodios de anime",
thumbnail=get_thumb("channels_anime.png"),
folder=False))
+ itemlist.append(
+ Item(channel=item.channel, action="setting_channel", extra="castellano", title=" - Castellano",
+ thumbnail=get_thumb("channels_documentary.png"), folder=False))
+
+ itemlist.append(Item(channel=item.channel, action="setting_channel", extra="latino", title=" - Latino",
+ thumbnail=get_thumb("channels_documentary.png"), folder=False))
+
+ itemlist.append(Item(channel=item.channel, action="setting_channel", extra="Torrent", title=" - Torrent",
+ thumbnail=get_thumb("channels_documentary.png"), folder=False))
+
itemlist.append(Item(channel=item.channel, action="setting_channel", extra="documentales",
title=" - Documentales",
thumbnail=get_thumb("channels_documentary.png"),
diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/peliculasdk.json
index a5dbd252..2fed6d4d 100755
--- a/plugin.video.alfa/channels/peliculasdk.json
+++ b/plugin.video.alfa/channels/peliculasdk.json
@@ -18,6 +18,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/peliculasdk.py b/plugin.video.alfa/channels/peliculasdk.py
index de32d30a..e9ae3d45 100644
--- a/plugin.video.alfa/channels/peliculasdk.py
+++ b/plugin.video.alfa/channels/peliculasdk.py
@@ -746,6 +746,28 @@ def info(item):
infoplus.start(item_info, peliculas)
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'castellano':
+ item.url = host + "idioma/Espanol/"
+ item.action = "peliculas"
+
+ itemlist = peliculas(item)
+ if itemlist[-1].action == "peliculas":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
+
def browser(url):
import mechanize
diff --git a/plugin.video.alfa/channels/peliculasnu.json b/plugin.video.alfa/channels/peliculasnu.json
index 99cecf7c..ba170ee8 100755
--- a/plugin.video.alfa/channels/peliculasnu.json
+++ b/plugin.video.alfa/channels/peliculasnu.json
@@ -35,6 +35,22 @@
"enabled": true,
"visible": true
},
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
{
"id": "modo_grafico",
"type": "bool",
diff --git a/plugin.video.alfa/channels/peliculasnu.py b/plugin.video.alfa/channels/peliculasnu.py
index 592862c6..10f9f5a6 100644
--- a/plugin.video.alfa/channels/peliculasnu.py
+++ b/plugin.video.alfa/channels/peliculasnu.py
@@ -80,6 +80,12 @@ def newest(categoria):
item.url = host
elif categoria == "terror":
item.url = host+"terror/"
+ elif categoria == 'castellano':
+ item.url = host + "?s=Español"
+ elif categoria == 'latino':
+ item.url = host + "?s=Latino"
+
+
item.from_newest = True
item.action = "entradas"
itemlist = entradas(item)
diff --git a/plugin.video.alfa/channels/peliculasrey.json b/plugin.video.alfa/channels/peliculasrey.json
index 6ef49029..91c439fd 100755
--- a/plugin.video.alfa/channels/peliculasrey.json
+++ b/plugin.video.alfa/channels/peliculasrey.json
@@ -9,5 +9,63 @@
"categories": [
"direct",
"movie"
- ]
+ ],
+ "settings":[
+ {
+ "id": "include_in_global_search",
+ "type": "bool",
+ "label": "Incluir en busqueda global",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_peliculas",
+ "type": "bool",
+ "label": "Incluir en Novedades - Películas",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_documentales",
+ "type": "bool",
+ "label": "Incluir en Novedades - Documentales",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_infantiles",
+ "type": "bool",
+ "label": "Incluir en Novedades - Infantiles",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_terror",
+ "type": "bool",
+ "label": "Incluir en Novedades - terror",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ }
+]
}
diff --git a/plugin.video.alfa/channels/peliculasrey.py b/plugin.video.alfa/channels/peliculasrey.py
index ebd7c362..83116c4b 100755
--- a/plugin.video.alfa/channels/peliculasrey.py
+++ b/plugin.video.alfa/channels/peliculasrey.py
@@ -148,3 +148,41 @@ def findvideos(item):
def play(item):
item.thumbnail = item.contentThumbnail
return [item]
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'peliculas':
+ item.url = host
+
+ elif categoria == 'documentales':
+ item.url = host + "genero/documental/"
+
+ elif categoria == 'infantiles':
+ item.url = host + "genero/animacion-e-infantil/"
+
+ elif categoria == 'terror':
+ item.url = host + "genero/terror/"
+
+ elif categoria == 'castellano':
+ item.url = host + "idioma/castellano/"
+
+ elif categoria == 'latino':
+ item.url = host + "idioma/latino/"
+
+ itemlist = peliculas(item)
+
+ if itemlist[-1].action == "peliculas":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
+
diff --git a/plugin.video.alfa/channels/peliscity.json b/plugin.video.alfa/channels/peliscity.json
index f5cbe7f0..a9497196 100755
--- a/plugin.video.alfa/channels/peliscity.json
+++ b/plugin.video.alfa/channels/peliscity.json
@@ -10,5 +10,63 @@
"movie",
"direct",
"VOS"
- ]
+ ],
+ "settings":[
+ {
+ "id": "include_in_global_search",
+ "type": "bool",
+ "label": "Incluir en busqueda global",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_peliculas",
+ "type": "bool",
+ "label": "Incluir en Novedades - Películas",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_documentales",
+ "type": "bool",
+ "label": "Incluir en Novedades - Documentales",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_infantiles",
+ "type": "bool",
+ "label": "Incluir en Novedades - Infantiles",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_terror",
+ "type": "bool",
+ "label": "Incluir en Novedades - terror",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ }
+]
}
diff --git a/plugin.video.alfa/channels/peliscity.py b/plugin.video.alfa/channels/peliscity.py
index d871a39a..89ba4cb5 100755
--- a/plugin.video.alfa/channels/peliscity.py
+++ b/plugin.video.alfa/channels/peliscity.py
@@ -164,3 +164,41 @@ def play(item):
logger.info()
item.thumbnail = item.extra
return [item]
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'peliculas':
+ item.url = host
+
+ elif categoria == 'documentales':
+ item.url = host + "/genero/documental/"
+
+ elif categoria == 'infantiles':
+ item.url = host + "/genero/animacion/"
+
+ elif categoria == 'terror':
+ item.url = host + "/genero/terror/"
+
+ elif categoria == 'castellano':
+ item.url = host + "/idioma/espanol-castellano/"
+
+ elif categoria == 'latino':
+ item.url = host + "/idioma/espanol-latino/"
+
+ itemlist = agregadas(item)
+
+ if itemlist[-1].action == "agregadas":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
+
diff --git a/plugin.video.alfa/channels/pelismagnet.json b/plugin.video.alfa/channels/pelismagnet.json
index 49076e01..03a2f6a1 100755
--- a/plugin.video.alfa/channels/pelismagnet.json
+++ b/plugin.video.alfa/channels/pelismagnet.json
@@ -28,6 +28,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/pelismagnet.py b/plugin.video.alfa/channels/pelismagnet.py
index de3369f1..3a4348bf 100644
--- a/plugin.video.alfa/channels/pelismagnet.py
+++ b/plugin.video.alfa/channels/pelismagnet.py
@@ -334,3 +334,29 @@ def findvideos(item):
servertools.get_servers_itemlist(itemlist)
return itemlist
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ if categoria == 'torrent':
+ item.url = api + "?sort_by=''&page=0"
+
+ itemlist = pelis(item)
+ if itemlist[-1].title == ">> Página siguiente":
+ itemlist.pop()
+ item.url = api_serie + "?sort_by=''&page=0"
+ itemlist.extend(series(item))
+ if itemlist[-1].title == ">> Página siguiente":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
+
diff --git a/plugin.video.alfa/channels/pelismundo.json b/plugin.video.alfa/channels/pelismundo.json
index b3b5ae0a..ffe1237d 100644
--- a/plugin.video.alfa/channels/pelismundo.json
+++ b/plugin.video.alfa/channels/pelismundo.json
@@ -49,6 +49,22 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py
index a2af9cb7..a7a2ceb4 100644
--- a/plugin.video.alfa/channels/pelismundo.py
+++ b/plugin.video.alfa/channels/pelismundo.py
@@ -34,9 +34,14 @@ def newest(categoria):
if categoria == 'peliculas':
item.url = host
elif categoria == 'infantiles':
- item.url = host + 'genero/infantil/'
+ item.url = host + '/genero/infantil/'
elif categoria == 'terror':
- item.url = host + 'genero/terror/'
+ item.url = host + '/genero/terror/'
+ elif categoria == 'castellano':
+ item.url = host +'/lenguaje/castellano/'
+ elif categoria == 'latino':
+ item.url = host +'/lenguaje/latino/'
+ itemlist = peliculas(item)
itemlist = peliculas(item)
if "Pagina" in itemlist[-1].title:
itemlist.pop()
@@ -126,6 +131,7 @@ def filtro(item):
for url, title in matches:
if "eroticas" in title and config.get_setting("adult_mode") == 0:
continue
+ logger.debug('la url: %s' %url)
itemlist.append(item.clone(action = "peliculas",
title = title.title(),
url = url
diff --git a/plugin.video.alfa/channels/pelisplanet.json b/plugin.video.alfa/channels/pelisplanet.json
index cbc3db76..c9621d7a 100644
--- a/plugin.video.alfa/channels/pelisplanet.json
+++ b/plugin.video.alfa/channels/pelisplanet.json
@@ -61,6 +61,22 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
diff --git a/plugin.video.alfa/channels/pelisplanet.py b/plugin.video.alfa/channels/pelisplanet.py
index 935df8c8..0d76adc7 100644
--- a/plugin.video.alfa/channels/pelisplanet.py
+++ b/plugin.video.alfa/channels/pelisplanet.py
@@ -143,6 +143,11 @@ def newest(categoria):
item.url = host + "genero/animacion-e-infantil/"
elif categoria == 'terror':
item.url = host + "genero/terror/"
+ elif categoria == 'castellano':
+ item.url = host + "idioma/castellano/"
+
+ elif categoria == 'latino':
+ item.url = host + "idioma/latino/"
else:
return []
diff --git a/plugin.video.alfa/channels/tiotorrent.json b/plugin.video.alfa/channels/tiotorrent.json
index 608e634d..9f449f6b 100644
--- a/plugin.video.alfa/channels/tiotorrent.json
+++ b/plugin.video.alfa/channels/tiotorrent.json
@@ -20,6 +20,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/tiotorrent.py b/plugin.video.alfa/channels/tiotorrent.py
index 22048844..1e34cd37 100644
--- a/plugin.video.alfa/channels/tiotorrent.py
+++ b/plugin.video.alfa/channels/tiotorrent.py
@@ -270,10 +270,18 @@ def newest(category):
logger.info()
item = Item()
try:
- if category == 'peliculas':
+ if category in ['peliculas', 'torrent']:
item.url = host + 'estrenos-de-cine'
item.extra='movie'
- itemlist = lista(item)
+ itemlist = lista(item)
+ if itemlist[-1].title == 'Siguiente >>>':
+ itemlist.pop()
+ if category == 'torrent':
+
+ item.url = host+'series'
+ item.extra = 'serie'
+ itemlist.extend(lista(item))
+
if itemlist[-1].title == 'Siguiente >>>':
itemlist.pop()
except:
diff --git a/plugin.video.alfa/channels/torrentlocura.json b/plugin.video.alfa/channels/torrentlocura.json
index a14b4d6a..185a1fb7 100755
--- a/plugin.video.alfa/channels/torrentlocura.json
+++ b/plugin.video.alfa/channels/torrentlocura.json
@@ -13,13 +13,21 @@
"tvshow"
],
"settings": [
- {
- "id": "include_in_global_search",
- "type": "bool",
- "label": "Incluir en busqueda global",
- "default": true,
- "enabled": true,
- "visible": true
- }
+ {
+ "id": "include_in_global_search",
+ "type": "bool",
+ "label": "Incluir en busqueda global",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ }
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/torrentlocura.py b/plugin.video.alfa/channels/torrentlocura.py
index ba8ebbfd..e83bc956 100755
--- a/plugin.video.alfa/channels/torrentlocura.py
+++ b/plugin.video.alfa/channels/torrentlocura.py
@@ -464,3 +464,30 @@ def play(item):
itemlist = [item]
return itemlist
+
+def newest(categoria):
+ logger.info()
+ itemlist = []
+ item = Item()
+ try:
+ item.pattern = 'pelilist'
+ if categoria == 'torrent':
+ item.url = host+'peliculas/'
+
+ itemlist = listado(item)
+ if itemlist[-1].title == ">> Página siguiente":
+ itemlist.pop()
+ item.url = host+'series/'
+ itemlist.extend(listado(item))
+ if itemlist[-1].title == ">> Página siguiente":
+ itemlist.pop()
+
+ # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+ except:
+ import sys
+ for line in sys.exc_info():
+ logger.error("{0}".format(line))
+ return []
+
+ return itemlist
+
diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.json b/plugin.video.alfa/channels/verpeliculasnuevas.json
index 428bd60f..a2bae6c3 100755
--- a/plugin.video.alfa/channels/verpeliculasnuevas.json
+++ b/plugin.video.alfa/channels/verpeliculasnuevas.json
@@ -35,7 +35,15 @@
{
"id": "include_in_newest_peliculas",
"type": "bool",
- "label": "Incluir en Novedades - Peliculas",
+ "label": "Incluir en Novedades - Películas",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_documentales",
+ "type": "bool",
+ "label": "Incluir en Novedades - Documentales",
"default": true,
"enabled": true,
"visible": true
@@ -47,6 +55,30 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_terror",
+ "type": "bool",
+ "label": "Incluir en Novedades - terror",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.py b/plugin.video.alfa/channels/verpeliculasnuevas.py
index 691c39b0..0702bb83 100755
--- a/plugin.video.alfa/channels/verpeliculasnuevas.py
+++ b/plugin.video.alfa/channels/verpeliculasnuevas.py
@@ -378,6 +378,19 @@ def newest(categoria):
item.url = host
elif categoria == 'infantiles':
item.url = host + '/genero/infantil/'
+
+ elif categoria == 'documentales':
+ item.url = host + '/genero/documental/'
+
+ elif categoria == 'terror':
+ item.url = host + '/genero/terror/'
+
+ elif categoria == 'castellano':
+ item.url = host + "/audio/castellano/"
+
+ elif categoria == 'latino':
+ item.url = host + "/audio/latino/"
+
itemlist = lista(item)
if itemlist[-1].title == 'Siguiente >>>':
itemlist.pop()
diff --git a/plugin.video.alfa/channels/verpelis.json b/plugin.video.alfa/channels/verpelis.json
index 83033a2f..110e4f54 100644
--- a/plugin.video.alfa/channels/verpelis.json
+++ b/plugin.video.alfa/channels/verpelis.json
@@ -43,6 +43,22 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_castellano",
+ "type": "bool",
+ "label": "Incluir en Novedades - Castellano",
+ "default": true,
+ "enabled": true,
+ "visible": true
+ },
+ {
+ "id": "include_in_newest_latino",
+ "type": "bool",
+ "label": "Incluir en Novedades - Latino",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/verpelis.py b/plugin.video.alfa/channels/verpelis.py
index 5f9a2ac7..c2b5405b 100644
--- a/plugin.video.alfa/channels/verpelis.py
+++ b/plugin.video.alfa/channels/verpelis.py
@@ -208,6 +208,11 @@ def newest(categoria):
item.url = host + '/ver/'
elif categoria == 'terror':
item.url = host + "/categoria/de-terror.htm"
+ elif categoria == 'castellano':
+ item.url = host + "/ver/espanol/"
+
+ elif categoria == 'latino':
+ item.url = host + "/ver/latino/"
else:
return []
diff --git a/plugin.video.alfa/channels/zonatorrent.json b/plugin.video.alfa/channels/zonatorrent.json
index add8e331..31f31200 100644
--- a/plugin.video.alfa/channels/zonatorrent.json
+++ b/plugin.video.alfa/channels/zonatorrent.json
@@ -51,6 +51,14 @@
"default": true,
"enabled": true,
"visible": true
+ },
+ {
+ "id": "include_in_newest_torrent",
+ "type": "bool",
+ "label": "Incluir en Novedades - Torrent",
+ "default": true,
+ "enabled": true,
+ "visible": true
}
]
}
diff --git a/plugin.video.alfa/channels/zonatorrent.py b/plugin.video.alfa/channels/zonatorrent.py
index 9835fee9..d3a85b28 100644
--- a/plugin.video.alfa/channels/zonatorrent.py
+++ b/plugin.video.alfa/channels/zonatorrent.py
@@ -178,6 +178,8 @@ def newest(categoria):
item.url = HOST + "/animacion"
elif categoria == 'terror':
item.url = HOST + "/terror/"
+ elif categoria == 'torrent':
+ item.url = HOST + "/?s=torrent"
else:
return []
From a206b9ddaf7d495c5cfbcc5a4e000280678d6736 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 17 Nov 2017 15:03:21 -0500
Subject: [PATCH 31/49] trailertools: fix
---
plugin.video.alfa/channels/trailertools.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/plugin.video.alfa/channels/trailertools.py b/plugin.video.alfa/channels/trailertools.py
index 9f592c78..7168101e 100755
--- a/plugin.video.alfa/channels/trailertools.py
+++ b/plugin.video.alfa/channels/trailertools.py
@@ -158,14 +158,13 @@ def youtube_search(item):
titulo = urllib.quote(titulo)
titulo = titulo.replace("%20", "+")
data = scrapertools.downloadpage("https://www.youtube.com/results?sp=EgIQAQ%253D%253D&q=" + titulo)
-
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
- patron = '.*?(?:src="https://i.ytimg.com/|data-thumb="https://i.ytimg.com/)([^"]+)"' \
- '.*?.*?.*?(\d+:\d+)'
+ patron = """"thumbnails":\[\{"url":"(https://i.ytimg.com/vi[^"]+).*?"""
+ patron += """simpleText":"([^"]+).*?"""
+ patron += """simpleText":"[^"]+.*?simpleText":"([^"]+).*?"""
+ patron += """url":"([^"]+)"""
matches = scrapertools.find_multiple_matches(data, patron)
- for scrapedthumbnail, scrapedurl, scrapedtitle, scrapedduration in matches:
- scrapedthumbnail = urlparse.urljoin("https://i.ytimg.com/", scrapedthumbnail)
+ for scrapedthumbnail, scrapedtitle, scrapedduration, scrapedurl in matches:
scrapedtitle = scrapedtitle.decode("utf-8")
scrapedtitle = scrapedtitle + " (" + scrapedduration + ")"
if item.contextual:
From 46646e09d157b7701ad9b1683bda9c3d24091c7e Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 17 Nov 2017 15:42:38 -0500
Subject: [PATCH 32/49] conector datoporn: fix
---
plugin.video.alfa/servers/datoporn.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin.video.alfa/servers/datoporn.json b/plugin.video.alfa/servers/datoporn.json
index b72b3f96..30df1f6d 100755
--- a/plugin.video.alfa/servers/datoporn.json
+++ b/plugin.video.alfa/servers/datoporn.json
@@ -4,7 +4,7 @@
"ignore_urls": [],
"patterns": [
{
- "pattern": "(?:datoporn.com|dato.porn)/(?:embed-|)([A-z0-9]+)",
+ "pattern": "(?:datoporn.com|dato.porn|datoporn.co)/(?:embed-|)([A-z0-9]+)",
"url": "http://dato.porn/embed-\\1.html"
}
]
@@ -39,4 +39,4 @@
}
],
"thumbnail": "http://i.imgur.com/tBSWudd.png?1"
-}
\ No newline at end of file
+}
From 87541a329134ef5ccb19d13493679cf6463ed088 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 17 Nov 2017 16:21:17 -0500
Subject: [PATCH 33/49] Update news.py
---
plugin.video.alfa/channels/news.py | 33 +-----------------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py
index 5a9b7ea3..9fd12030 100644
--- a/plugin.video.alfa/channels/news.py
+++ b/plugin.video.alfa/channels/news.py
@@ -74,26 +74,6 @@ def mainlist(item):
set_category_context(new_item)
itemlist.append(new_item)
- # if list_canales['Castellano']:
- thumbnail = get_thumb("channels_documentary.png")
- new_item = Item(channel=item.channel, action="novedades", extra="castellano", title="Castellano",
- thumbnail=thumbnail)
- set_category_context(new_item)
- itemlist.append(new_item)
-
- # if list_canales['Latino']:
- thumbnail = get_thumb("channels_documentary.png")
- new_item = Item(channel=item.channel, action="novedades", extra="latino", title="Latino",
- thumbnail=thumbnail)
- set_category_context(new_item)
- itemlist.append(new_item)
-
- # if list_canales['Torrent']:
- thumbnail = get_thumb("channels_documentary.png")
- new_item = Item(channel=item.channel, action="novedades", extra="torrent", title="Torrent", thumbnail=thumbnail)
- set_category_context(new_item)
- itemlist.append(new_item)
-
#if list_canales['documentales']:
thumbnail = get_thumb("channels_documentary.png")
new_item = Item(channel=item.channel, action="novedades", extra="documentales", title="Documentales",
@@ -115,8 +95,7 @@ def set_category_context(item):
def get_channels_list():
logger.info()
- list_canales = {'peliculas': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [],
- 'castellano': [], 'latino':[], 'torrent':[], 'documentales': []}
+ list_canales = {'peliculas': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [], 'documentales': []}
any_active = False
# Rellenar listas de canales disponibles
channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json')
@@ -440,16 +419,6 @@ def menu_opciones(item):
title=" - Episodios de anime",
thumbnail=get_thumb("channels_anime.png"),
folder=False))
- itemlist.append(
- Item(channel=item.channel, action="setting_channel", extra="castellano", title=" - Castellano",
- thumbnail=get_thumb("channels_documentary.png"), folder=False))
-
- itemlist.append(Item(channel=item.channel, action="setting_channel", extra="latino", title=" - Latino",
- thumbnail=get_thumb("channels_documentary.png"), folder=False))
-
- itemlist.append(Item(channel=item.channel, action="setting_channel", extra="Torrent", title=" - Torrent",
- thumbnail=get_thumb("channels_documentary.png"), folder=False))
-
itemlist.append(Item(channel=item.channel, action="setting_channel", extra="documentales",
title=" - Documentales",
thumbnail=get_thumb("channels_documentary.png"),
From 93ab41c2dacec99c0b778d2a0d6dbc1603df6a94 Mon Sep 17 00:00:00 2001
From: Alfa-beto <30815244+Alfa-beto@users.noreply.github.com>
Date: Fri, 17 Nov 2017 18:22:32 -0300
Subject: [PATCH 34/49] asignado iconos en news
---
plugin.video.alfa/channels/news.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py
index 5a9b7ea3..b2d48c92 100644
--- a/plugin.video.alfa/channels/news.py
+++ b/plugin.video.alfa/channels/news.py
@@ -75,21 +75,21 @@ def mainlist(item):
itemlist.append(new_item)
# if list_canales['Castellano']:
- thumbnail = get_thumb("channels_documentary.png")
+ thumbnail = get_thumb("channels_spanish.png")
new_item = Item(channel=item.channel, action="novedades", extra="castellano", title="Castellano",
thumbnail=thumbnail)
set_category_context(new_item)
itemlist.append(new_item)
# if list_canales['Latino']:
- thumbnail = get_thumb("channels_documentary.png")
+ thumbnail = get_thumb("channels_latino.png")
new_item = Item(channel=item.channel, action="novedades", extra="latino", title="Latino",
thumbnail=thumbnail)
set_category_context(new_item)
itemlist.append(new_item)
# if list_canales['Torrent']:
- thumbnail = get_thumb("channels_documentary.png")
+ thumbnail = get_thumb("channels_torrent.png")
new_item = Item(channel=item.channel, action="novedades", extra="torrent", title="Torrent", thumbnail=thumbnail)
set_category_context(new_item)
itemlist.append(new_item)
From 3c2902d5eace70dc24da7eda3ba4392a371b0b95 Mon Sep 17 00:00:00 2001
From: Alfa-beto <30815244+Alfa-beto@users.noreply.github.com>
Date: Fri, 17 Nov 2017 18:30:38 -0300
Subject: [PATCH 35/49] agregado icono para idioma castellano
---
.../themes/default/thumb_channels_spanish.png | Bin 0 -> 15520 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_channels_spanish.png
diff --git a/plugin.video.alfa/resources/media/themes/default/thumb_channels_spanish.png b/plugin.video.alfa/resources/media/themes/default/thumb_channels_spanish.png
new file mode 100644
index 0000000000000000000000000000000000000000..99c60bad027437a3f033dea6115c3cb3009268da
GIT binary patch
literal 15520
zcmb_@by$>9)AzlUAfa?igVNn4NP{Ryx0Fi9(hG}}AT24NG}0ltq#z+6y>to)yOeap
zd-FW+_y7CH$0Zlu=bSk;Gru!)W=`ab=PHEvY3>66K&YnrOa}lU%Xh!HIA95EqAeNx
zgXN*1_6isL3Ba}a0Dj}Ssv3EK?WgX3AqtN(e856#PbEW7T^Bn~Z!33Oz}wrK_pP&o
zhqaZfEw78aea5ad4FE6#YR{g&^2yv;@J=#=w%+X9?~M;1nUDD^kT6cXz{F`GdxH0;
z+nt>J*^3SabY1Qb3_ol#a&p=aWG{bWp@JVi#0Xtf@XN3fY#m0epQ
x8(1}5xoQsQP7a^G_7;p4L
z(1S);{sO7lV1Tj}3*5=lLyiY~E!F0gF%?%e2ueCwRfH{c*17i&G
*_#(E^qkjXR{rB~Ec~
z{u6Y>*nVwYr=hLQJ2n^dsC8WRREYmoE!>IuEzQMws`A_4SjJR+Joxs>=r4KwN0X|R
ze_CF`nO3K|m6@Gmr@uck~?p1kYC&&pJWz;5;C}j+^aHXtzn~hbR$&tV-g~|GkaI
zA;5h03p41ivGkxyM$1UZQ^1c}<%|rR&=zvE_qyZ7nD85P(
z2oeYLe?p=rOowp%`GT!PLEP
z88nfsy6)F;m!@(saKul8(P7?#XRl73HfAzR>+w^k=}|oExKqE_4;5U@DsqD{V(s;d
z2@G*{fJFw^3h-K0%TEb@;`LMt2h1s-p7CdLY@{Z|iNCzUvwxhtrF(xlD%;)xOi5?3
zK{RL&=CTnmP9^uY%z=631r4TZBdwgtTfs6pQZ#V-r0)4rU9ecp^yT!v4oKp!h>O_=
zRl+;$1{2v)JNk5o+*<2?mKK_)%^FE9q5Saq)sGhxMeZ
|\s{2,}', "", data)
+ language_items=scrapertools.find_single_match(data,
+ '(.+?)<\/ul>')
+ matches=scrapertools.find_multiple_matches(language_items,
+ '
Temporada.*?') - # logger.debug("url es %s " % url_to_check) - - # if url doesn't exist we add it into the dict - if url_to_check not in dict_url_seasons: - dict_url_seasons[url_to_check] = False - - for key, value in dict_url_seasons.items(): - if not value: - item.url = key - dict_url_seasons[key] = True - dict_data, item = get_episodes(item, dict_data) - - # logger.debug("URL_LIST es %s " % dict_url_seasons) - - return dict_data, item - - -def findvideos(item): - logger.info() - itemlist = [] - - if item.contentType == "movie": - - data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data) - # logger.debug("data %s \n\n" % data) - - if item.contentTitle != "": - title = scrapertools.find_single_match(data, '
T@s
zAk;VXn{HAV`b53jxGiWiG}Mze$x5q>H7YKBl-(O%H_uaX1a&N^!c!BBLX
zA&$PbXSyNlSLCFmW{)o`P8pnIYv^;YzY#eypV#U)GQhtw9MMD6lJAIbHTWBhvp_3A
zep2k8XiEZSx_Dus;%HR@E?r{N6ANQU4($1MbR%lKW><}(#P~**d$+IxAU0;EsL`;o
z