17 Commits

Author SHA1 Message Date
alfa-addon
357be3f648 v2.3.1 2017-10-27 21:56:26 -04:00
alfa-addon
609f3f6ebc Fixed 2017-10-27 21:55:59 -04:00
Alfa
e0ce83f2f1 Merge pull request #144 from Alfa-beto/Fixes
Fixes - again
2017-10-28 03:21:09 +02:00
Unknown
a7d3294ba3 eliminado tag version 2017-10-27 21:39:57 -03:00
Unknown
338409ca3b Agregada la opcion buscar en otros canales 2017-10-27 21:37:34 -03:00
unknown
dfea08ffee Merge remote-tracking branch 'alfa-addon/master' into Fixes 2017-10-27 21:33:20 -03:00
Alfa
c32dfcc476 Merge pull request #145 from alfa-jor/feateure/mediaserver_remove_updaters
removed files unused, fix tmdb for mediaserver
2017-10-28 01:47:52 +02:00
alfa_addon_10
f3e818dd29 TODO create a method to call a function from settings window 2017-10-28 01:30:02 +02:00
alfa_addon_10
4dfcdb11d3 comments 2017-10-27 20:23:01 +02:00
alfa_addon_10
863b9a5c3e removed servers unused, remove tags unused 2017-10-27 20:13:14 +02:00
alfa_addon_10
26c2b26034 removed unused tags from channels 2017-10-27 19:43:01 +02:00
alfa_addon_10
a56513b5df removed unused modules and methods 2017-10-27 19:10:12 +02:00
alfa_addon_10
f5a7f6383c fix funcionality from kodi 2017-10-27 18:58:40 +02:00
alfa_addon_10
df62398c64 remove get version from old module, updated funcionality from kodi addon 2017-10-27 18:58:01 +02:00
Unknown
195e393e31 Reemplazado Oh-Pelis x Oh!Latino 2017-10-26 16:18:07 -03:00
Unknown
d1630a3c3d agregado Gvideo a pelisplus again 2017-10-26 13:40:58 -03:00
unknown
e348c26d9e Merge remote-tracking branch 'alfa-addon/master' into Fixes 2017-10-26 08:02:22 -03:00
291 changed files with 570 additions and 5944 deletions

View File

@@ -1,2 +1,2 @@
Debe ejecutar primero el archivo "script.py".
Debe ejecutar primero el archivo "script.py", si no lo hizo antes.
Una vez realizado el proceso podrá ejecutar como siempre "alfa.py" para iniciar el addon.

View File

@@ -12,11 +12,17 @@ import channelselector
from controller import Controller
from controller import Platformtools
from platformcode import config
from core import versiontools
from core.item import Item
from core.tmdb import Tmdb
from platformcode import launcher, logger
from core import filetools
# <addon id="plugin.video.alfa" name="Alfa" version="2.3.0" provider-name="Alfa Addon">
data = filetools.read(filetools.join(config.get_runtime_path(), "addon.xml"))
aux = re.findall('<addon id="plugin.video.alfa" name="Alfa" version="([^"]+)"', data, re.MULTILINE | re.DOTALL)
version = "???"
if len(aux) > 0:
version = aux[0]
class html(Controller):
pattern = re.compile("##")
@@ -29,8 +35,8 @@ class html(Controller):
if self.handler:
self.client_ip = handler.client.getpeername()[0]
self.send_message({"action": "connect",
"data": {"version": "Alfa %s" % versiontools.get_current_plugin_version_tag(),
"date": versiontools.get_current_plugin_date()}})
"data": {"version": "Alfa %s" % version,
"date": "--/--/----"}})
t = threading.Thread(target=launcher.start, name=ID)
t.setDaemon(True)
t.start()

View File

@@ -87,33 +87,16 @@ def run(item):
if item.action == "mainlist":
itemlist = channelselector.getmainlist("banner_")
# if config.get_setting("check_for_plugin_updates"):
# logger.info("channelselector.mainlist Verificar actualizaciones activado")
#
# from core import updater
# try:
# version = updater.checkforupdates()
#
# if version:
# platformtools.dialog_ok("Versión " + version + " disponible",
# "Ya puedes descargar la nueva versión del plugin\ndesde el listado principal")
# itemlist.insert(0, Item(title="Actualizar Alfa a la versión " + version, version=version,
# channel="updater", action="update",
# thumbnail=os.path.join(config.get_runtime_path(), "resources", "images",
# "banner", "thumb_update.png")))
# except:
# platformtools.dialog_ok("No se puede conectar", "No ha sido posible comprobar",
# "si hay actualizaciones")
# logger.info("Fallo al verificar la actualización")
#
# else:
# logger.info("Verificar actualizaciones desactivado")
if item.action == "getchanneltypes":
itemlist = channelselector.getchanneltypes("banner_")
if item.action == "filterchannels":
itemlist = channelselector.filterchannels(item.channel_type, "banner_")
elif item.action == "script":
from core import tmdb
if tmdb.drop_bd():
platformtools.dialog_notification("Alfa", "caché eliminada", time=2000, sound=False)
# Todas las demas las intenta ejecturaren el siguiente orden:
# 1. En el canal
# 2. En el launcher

View File

@@ -22,14 +22,9 @@
<setting id="adult_aux_new_password1" type="text" label="Nueva contraseña:" option="hidden" enable="!eq(-3,)" default=""/>
<setting id="adult_aux_new_password2" type="text" label="Confirmar nueva contraseña:" option="hidden" enable="!eq(-1,)" default=""/>
<!--<setting type="sep"/>-->
<!--<setting label="Actualizaciones" type="lsep"/>-->
<!--<setting id="plugin_updates_available" type="number" label="Number of updates available" default="0" visible="false"/>-->
<!--<setting id="check_for_plugin_updates" type="bool" label="30001" default="true"/>-->
<!--<setting id="check_for_channel_updates" type="bool" label="30004" default="true"/>-->
</category>
<!-- Path downloads and subtitles -->
<!-- Path downloads -->
<category label="30501">
<setting type="sep"/>
<setting id="downloadpath" type="text" label="30017" default=""/>
@@ -41,4 +36,19 @@
<setting id="folder_tvshows" type="text" label="Nombre de carpeta para 'Series'" default="SERIES"/>
<setting id="folder_movies" type="text" label="Nombre de carpeta para 'Peliculas'" default="CINE"/>
</category>
<category label="Otros">
<setting label="Info de películas/series en menú contextual" type="lsep"/>
<setting id="infoplus" type="bool" label="Mostrar opción Infoplus:" default="true"/>
<setting type="sep"/>
<setting label="TheMovieDB (obtiene datos de las películas o series)" type="lsep"/>
<setting id="tmdb_threads" type="labelenum" values="5|10|15|20|25|30" label="Búsquedas simultáneas (puede causar inestabilidad)" default="20"/>
<setting id="tmdb_plus_info" type="bool" label="Buscar información extendida (datos de actores) Aumenta el tiempo de búsqueda" default="false"/>
<setting id="tmdb_cache" type="bool" label="Usar caché (mejora las búsquedas recurrentes)" default="true"/>
<setting id="tmdb_cache_expire" type="enum" lvalues="cada 1 día|cada 7 días|cada 15 días|cada 30 días|No" label="¿Renovar caché?" enable="eq(-1,true)" default="4"/>
<!--<setting id="tmdb_clean_db_cache" type="action" label="Pulse para 'Borrar caché' guardada" action="RunPlugin(plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAic2NyaXB0Ig0KfQ==)" />-->
</category>
</settings>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.alfa" name="Alfa" version="2.3.0" provider-name="Alfa Addon">
<addon id="plugin.video.alfa" name="Alfa" version="2.3.1" provider-name="Alfa Addon">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.libtorrent" optional="true"/>
@@ -19,15 +19,10 @@
</assets>
<news>[B]Estos son los cambios para esta versión:[/B]
[COLOR green][B]Canales agregados y arreglos[/B][/COLOR]
» cartoonlatino » serieslan
» pelisplus » pedropolis
» flashx » cinetux
» animeflv_ru » streamixcloud
» estrenosgo » animemovil
» allpeliculas » pelismundo
» ohlatino » animemovil
» pelisplus » flashx
¤ arreglos internos
[COLOR green]Gracias a [COLOR yellow]Danielr460[/COLOR] por su colaboración en esta versión[/COLOR]
</news>
</news>
<description lang="es">Navega con Kodi por páginas web para ver sus videos de manera fácil.</description>
<summary lang="en">Browse web pages using Kodi</summary>
<description lang="en">Browse web pages using Kodi, you can easily watch their video content.</description>

View File

@@ -6,13 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s22.postimg.org/irnlwuizh/allcalidad1.png",
"banner": "https://s22.postimg.org/9y1athlep/allcalidad2.png",
"version": 1,
"changes": [
{
"date": "14/07/2017",
"description": "Primera version"
}
],
"categories": [
"movie",
"direct"

View File

@@ -4,29 +4,6 @@
"language": ["lat"],
"active": true,
"adult": false,
"version": 1,
"changes": [
{
"date": "24/06/2017",
"description": "Url mal escritas"
},
{
"date": "10/06/2017",
"description": "Reparado búsqueda de videos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "16/02/2017",
"description": "Añadidas nuevas opciones y servidores"
},
{
"date": "19/03/2016",
"description": "Añadido soporte para la videoteca y reparada busqueda global."
}
],
"thumbnail": "http://i.imgur.com/aWCDWtn.png",
"banner": "allpeliculas.png",
"categories": [

View File

@@ -5,13 +5,6 @@
"adult": false,
"language": ["cast"],
"thumbnail": "http://imgur.com/sLaXHvp.png",
"version": 1,
"changes": [
{
"date": "26/04/2017",
"description": "Release"
}
],
"categories": [
"torrent",
"movie"

View File

@@ -6,25 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "animeflv.png",
"banner": "animeflv.png",
"version": 1,
"changes": [
{
"date": "18/05/2017",
"description": "fix ultimos animes, episodios"
},
{
"date": "06/04/2017",
"description": "fix ultimos episodios"
},
{
"date": "01/03/2017",
"description": "fix nueva web"
},
{
"date": "09/07/2016",
"description": "Arreglo viewmode"
}
],
"categories": [
"anime"
],

View File

@@ -6,21 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "http://i.imgur.com/x9AdvBx.png",
"banner": "http://i.imgur.com/dTZwCPq.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "05/01/2017",
"description": "Actualizada url de la opción Novedades. Arreglado un error que impedia que se mostrara un solo resultado al realizar busquedas. Limpieza de código"
},
{
"date": "01/07/2016",
"description": "nuevo canal"
}
],
"categories": [
"anime"
],

View File

@@ -6,22 +6,9 @@
"language": ["cast", "lat"],
"thumbnail": "http://i.imgur.com/5nRR9qq.png",
"banner": "animeflv_ru.png",
"version": 1,
"compatible": {
"python": "2.7.9"
},
"changes": {
"change": [
{
"date": "06/04/2017",
"description": "fix"
},
{
"date": "01/03/2017",
"description": "fix nueva web"
}
]
},
"categories": [
"anime"
],

View File

@@ -6,21 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "animeid.png",
"banner": "animeid.png",
"version": 1,
"changes": [
{
"date": "17/05/2017",
"description": "Fix novedades y replace en findvideos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "04/01/16",
"description": "Arreglado problema en findvideos"
}
],
"categories": [
"anime"
],

View File

@@ -3,16 +3,9 @@
"name": "Animemovil",
"active": true,
"adult": false,
"language": ["*"],
"language": ["cat", "lat"],
"thumbnail": "https://s1.postimg.org/92ji7stii7/animemovil1.png",
"banner": "",
"version": 1,
"changes": [
{
"date": "24/10/2017",
"description": "Primera version"
}
],
"categories": [
"anime"
],

View File

@@ -138,7 +138,7 @@ def listado(item):
itemlist.append(item.clone(action=action, title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
contentTitle=title, contentSerieName=show, infoLabels=infoLabels,
context=renumbertools.context, contentType=tipo))
context=renumbertools.context(item), contentType=tipo))
try:
@@ -205,7 +205,7 @@ def completo(item):
infoLabels = {'filtro': {"original_language": "ja"}.items()}
itemlist.append(Item(channel=item.channel, action=action, title=scrapedtitle, url=url, thumbnail=thumb,
text_color=color3, contentTitle=title, contentSerieName=show, extra="completo",
context=renumbertools.context, contentType=tipo, infoLabels=infoLabels))
context=renumbertools.context(item), contentType=tipo, infoLabels=infoLabels))
return itemlist
@@ -227,7 +227,7 @@ def episodios(item):
for url, title in matches:
url = host + url
epi = scrapertools.find_single_match(title, '(?i)%s.*? (\d+) (?:Sub|Audio|Español)' % item.contentSerieName)
new_item = item.clone(action="findvideos", url=url, title=title, extra="", context=renumbertools.context)
new_item = item.clone(action="findvideos", url=url, title=title, extra="")
if epi:
season, episode = renumbertools.numbered_for_tratk(
item.channel, show, 1, int(epi))
@@ -301,7 +301,7 @@ def emision(item):
infoLabels = {'filtro': {"original_language": "ja"}.items()}
itemlist.append(item.clone(action="episodios", title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
contentTitle=title, contentSerieName=title, extra="recientes",
context=renumbertools.context, infoLabels=infoLabels))
context=renumbertools.context(item), infoLabels=infoLabels))
return itemlist

View File

@@ -6,21 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "https://s21.postimg.org/b43i3ljav/animeshd.png",
"banner": "https://s4.postimg.org/lulxulmql/animeshd-banner.png",
"version": 1,
"changes": [
{
"date": "03/06/2017",
"description": "limpieza de codigo"
},
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "19/05/2017",
"description": "First release"
}
],
"categories": [
"anime"
]

View File

@@ -5,13 +5,6 @@
"adult": false,
"language": "es",
"thumbnail": "http://i.imgur.com/dHpupFk.png",
"version": 1,
"changes": [
{
"date": "17/05/2017",
"description": "Fix novedades y replace en findvideos"
}
],
"categories": [
"anime"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "http://i.imgur.com/9Zu5NBc.png",
"banner": "http://i.imgur.com/JQSXCaB.png",
"version": 1,
"changes": [
{
"date": "13/06/2017",
"description": "Arreglado problema en nombre de servidores"
},
{
"date": "02/06/2017",
"description": "Primera Versión"
}
],
"categories": [
"tvshow",
"anime"

View File

@@ -4,21 +4,6 @@
"language": ["cast", "lat"],
"adult": false,
"active": true,
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "16/02/2017",
"description": "Canal reparado ya que no funcionaban los enlaces"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"banner": "areadocumental.png",
"thumbnail": "areadocumental.png",
"categories": [

View File

@@ -1,20 +1,13 @@
{
"id": "asialiveaction",
"name": "Asialiveaction.",
"name": "Asialiveaction",
"active": true,
"adult": false,
"language": ["cast", "lat"],
"thumbnail": "asialiveaction.png",
"banner": "https://imgur.com/B1IOAu4.png",
"version": 1,
"changes": [
{
"date": "08/10/2017",
"description": "Primera versión del canal"
}
],
"categories": [
"movie",
"serie"
"tvshow"
]
}

View File

@@ -7,21 +7,6 @@
"thumbnail": "bajui.png",
"banner": "bajui.png",
"fanart": "bajui.png",
"version": 2,
"changes": [
{
"date": "07/08/2017",
"description": "Fix URL HOST changed to Bajui2"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -6,21 +6,6 @@
"language": ["*"],
"thumbnail": "beeg.png",
"banner": "beeg.png",
"version": 1,
"changes": [
{
"date": "03/06/2017",
"description": "reliminado encoding y soporte multiples calidades"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"adult"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast"],
"thumbnail": "http://s6.postimg.org/6ash180up/bityoulogo.png",
"banner": "bityouth.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"torrent",
"movie",

View File

@@ -5,17 +5,6 @@
"adult": false,
"language": ["cast"],
"thumbnail": "http://imgur.com/BePrYmy.png",
"version": 1,
"changes": [
{
"date": "26/04/2017",
"description": "Release"
},
{
"date": "28/06/2017",
"description": "Correciones código y mejoras"
}
],
"categories": [
"torrent",
"movie",

View File

@@ -6,17 +6,6 @@
"language": ["cast"],
"thumbnail": "http://s6.postimg.org/9u8m1ep8x/bricocine.jpg",
"banner": "bricocine.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"torrent",
"movie",

View File

@@ -7,13 +7,6 @@
"fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/canalpelisbg.jpg",
"thumbnail": "http://www.canalpelis.com/wp-content/uploads/2016/11/logo_web.gif",
"banner": "",
"version": 1,
"changes": [
{
"date": "15/08/17",
"description": "Nuevo Canal"
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "http://i.imgur.com/gAbPcvT.png?1",
"banner": "canalporno.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "09/01/2017",
"description": "Primera version."
}
],
"categories": [
"adult"
]

View File

@@ -6,13 +6,6 @@
"language": ["lat"],
"thumbnail": "http://i.imgur.com/wk6fRDZ.png",
"banner": "http://i.imgur.com/115c59F.png",
"version": 1,
"changes": [
{
"date": "07/06/2017",
"description": "Primera version del canal"
}
],
"categories": [
"tvshow"
]

View File

@@ -6,13 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "https://s9.postimg.org/secdb5s8v/ciberdocumentales.png",
"banner": "https://s1.postimg.org/sa486z0of/ciberdocumentales_banner.png",
"version": 1,
"changes": [
{
"date": "18/06/2016",
"descripcion": "First release"
}
],
"categories": [
"documentary"
],

View File

@@ -6,21 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "http://i.imgur.com/5KOU8uy.png?3",
"banner": "cineasiaenlinea.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "07/02/17",
"description": "Fix bug in newest"
},
{
"date": "09/01/2017",
"description": "Primera version"
}
],
"categories": [
"movie",
"vos"

View File

@@ -6,29 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "https://s31.postimg.org/puxmvsi7v/cinecalidad.png",
"banner": "https://s32.postimg.org/kihkdpx1x/banner_cinecalidad.png",
"version": 1,
"changes": [
{
"date": "01/08/2017",
"description": "Cambio de estructura"
},
{
"date": "24/06/2017",
"description": "Cambios para autoplay"
},
{
"date": "06/06/2017",
"description": "Compatibilidad con AutoPlay"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "18/06/2016",
"description": "First release."
}
],
"categories": [
"movie"
],

View File

@@ -4,27 +4,8 @@
"active": true,
"adult": false,
"language": ["cast", "lat"],
"version": 1,
"thumbnail": "cinefox.png",
"banner": "cinefox.png",
"changes": [
{
"date": "01/08/2017",
"description": "Agregado servidor gvideo"
},
{
"date": "05/04/2017",
"description": "Cambio en los servidores"
},
{
"date": "21/03/2017",
"description": "Adaptado a httptools y corregido episodios para videoteca"
},
{
"date": "18/07/2016",
"description": "Primera version"
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -6,21 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s28.postimg.org/lytn2q1tp/cinefoxtv.png",
"banner": "cinefoxtv.png",
"version": 1,
"changes": [
{
"date": "22/05/2017",
"description": "fix por cambio en la estructura"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "09/02/2017",
"description": "First release."
}
],
"categories": [
"movie"
],

View File

@@ -6,13 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "cinehindi.png",
"banner": "http://i.imgur.com/cau9TVe.png",
"version": 1,
"changes": [
{
"date": "25/05/2017",
"description": "Primera versión completa del canal"
}
],
"categories": [
"movie"
]

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "cinetemagay.png",
"banner": "cinetemagay.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "05/08/2016",
"description": "Eliminado de sección películas"
}
],
"categories": [
"adult"
]

View File

@@ -7,25 +7,6 @@
"thumbnail": "cinetux.png",
"banner": "cinetux.png",
"fanart": "cinetux.jpg",
"version": 1,
"changes": [
{
"date": "31/07/2017",
"description": "Actualizado por cambio de estructura de la página"
},
{
"date": "12/05/2017",
"description": "Arreglada paginación y enlaces directos"
},
{
"date": "16/02/2017",
"description": "Adaptado a httptools y añadidos enlaces directos"
},
{
"date": "08/07/2016",
"description": "Correciones y adaptaciones a la nueva version"
}
],
"categories": [
"direct",
"movie"

View File

@@ -6,25 +6,6 @@
"language": ["cast"],
"thumbnail": "http://i.imgur.com/F7sevVu.jpg?1",
"banner": "clasicofilm.png",
"version": 1,
"changes": [
{
"date": "28/05/2017",
"description": "Corregido findvideos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "07/02/17",
"description": "Fix bug in newest"
},
{
"date": "09/01/2017",
"description": "Primera version"
}
],
"categories": [
"movie"
],

View File

@@ -4,13 +4,6 @@
"language": ["cast", "lat"],
"active": true,
"adult": false,
"version": 1,
"changes": [
{
"date": "16/05/2017",
"description": "Primera versión"
}
],
"thumbnail": "http://i.imgur.com/O49fDS1.png",
"categories": [
"anime",

View File

@@ -4,21 +4,6 @@
"active": true,
"adult": false,
"language": ["cast"],
"version": 1,
"changes": [
{
"date": "10/12/2016",
"description": "Reparado fanart y thumbs y correción código.Adaptado a Infoplus"
},
{
"date": "04/04/2017",
"description": "Migración a Httptools"
},
{
"date": "28/06/2017",
"description": "Correciones código.Algunas mejoras"
}
],
"thumbnail": "cuelgame.png",
"banner": "cuelgame.png",
"categories": [

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "cumlouder.png",
"banner": "cumlouder.png",
"version": 1,
"changes": [
{
"date": "04/05/17",
"description": "Corregido, usa proxy en caso de error con https"
},
{
"date": "13/01/17",
"description": "First version"
}
],
"categories": [
"adult"
]

View File

@@ -4,17 +4,6 @@
"language": ["*"],
"active": true,
"adult": true,
"changes": [
{
"date": "28/05/2017",
"description": "Reparado por cambios en la página"
},
{
"date": "21/02/2017",
"description": "Primera versión"
}
],
"version": 1,
"thumbnail": "http://i.imgur.com/tBSWudd.png?1",
"banner": "datoporn.png",
"categories": [

View File

@@ -4,17 +4,6 @@
"language": ["cast"],
"active": true,
"adult": false,
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"banner": "descargacineclasico2.png",
"thumbnail": "descargacineclasico2.png",
"categories": [

View File

@@ -3,30 +3,7 @@
"name": "DescargasMIX",
"language": ["cast", "lat"],
"active": true,
"version": 1,
"adult": false,
"changes": [
{
"date": "06/05/17",
"description": "Cambio de dominio"
},
{
"date": "17/04/17",
"description": "Mejorado en la deteccion del dominio para futuros cambios"
},
{
"date": "09/04/17",
"description": "Arreglado por cambios en la página"
},
{
"date": "27/01/17",
"description": "Sección online en películas modificada"
},
{
"date": "08/07/16",
"description": "Adaptado el canal a las nuevas funciones"
}
],
"thumbnail": "descargasmix.png",
"banner": "descargasmix.png",
"categories": [

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "discoverymx.png",
"banner": "discoverymx.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"documentary"
]

View File

@@ -6,29 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "divxatope.png",
"banner": "divxatope.png",
"version": 1,
"changes": [
{
"date": "17/04/17",
"description": "Reparados torrents, añadidas nuevas secciones"
},
{
"date": "13/01/17",
"description": "Reparados torrents y paginacion. Añadida seccion Peliculas 4K ultraHD"
},
{
"date": "31/12/16",
"description": "Adaptado, por cambios en la web"
},
{
"date": "01/07/16",
"description": "Eliminado código innecesario."
},
{
"date": "29/04/16",
"description": "Adaptar a Buscador global y Novedades Peliculas y Series"
}
],
"categories": [
"torrent",
"movie",

View File

@@ -5,17 +5,6 @@
"adult": false,
"language": ["cast"],
"thumbnail": "http://imgur.com/Madj03A.jpg",
"version": 1,
"changes": [
{
"date": "26/04/2017",
"description": "Release"
},
{
"date": "28/06/2017",
"description": "Correciones código por cambios web"
}
],
"categories": [
"torrent",
"movie",

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "http://i.imgur.com/qMR9sg9.png",
"banner": "documaniatv.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "11/07/2016",
"description": "Reparadas cuentas de usuario."
}
],
"categories": [
"documentary"
],

View File

@@ -5,17 +5,6 @@
"adult": false,
"language": ["cast", "lat"],
"thumbnail": "http://i.imgur.com/fsrnC4m.jpg",
"version": 1,
"changes": [
{
"date": "15/04/2017",
"description": "fix novedades"
},
{
"date": "09/03/2017",
"description": "nueva web"
}
],
"categories": [
"documentary"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "doramastv.png",
"banner": "doramastv.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"tvshow"
],

View File

@@ -4,21 +4,6 @@
"active": false,
"adult": false,
"language": ["*"],
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "12/03/17",
"description": "Añadidas mas opciones de configuracion y corregidos fallos"
},
{
"date": "12/01/17",
"description": "release"
}
],
"categories": [
"movie"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "ecarteleratrailers.png",
"banner": "ecarteleratrailers.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie"
]

View File

@@ -6,21 +6,6 @@
"language": ["cast"],
"thumbnail": "elitetorrent.png",
"banner": "elitetorrent.png",
"version": 2,
"changes": [
{
"date": "2/08/2017",
"description": "arreglada url canal"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"torrent",
"movie",

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "elsenordelanillo.png",
"banner": "elsenordelanillo.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie"
]

View File

@@ -6,21 +6,6 @@
"language": ["*"],
"thumbnail": "eporner.png",
"banner": "eporner.png",
"version": 1,
"changes": [
{
"date": "03/06/2017",
"description": "reparada seccion categorias"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "28/12/16",
"description": "First version"
}
],
"categories": [
"adult"
]

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "http://www.youfreeporntube.com/uploads/custom-logo.png",
"banner": "http://www.youfreeporntube.com/uploads/custom-logo.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "26/12/2016",
"description": "Release."
}
],
"categories": [
"adult"
],

View File

@@ -6,29 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s24.postimg.org/nsgit7fhh/estadepelis.png",
"banner": "https://s28.postimg.org/ud0l032ul/estadepelis_banner.png",
"version": 1,
"changes": [
{
"date": "24/06/2017",
"description": "Cambios para autoplay"
},
{
"date": "22/06/2017",
"description": "ajustes para AutoPlay"
},
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "07/02/2017",
"description": "Release"
}
],
"categories": [
"movie"
],

View File

@@ -7,21 +7,6 @@
"fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/estrenosgo.png",
"thumbnail": "https://github.com/master-1970/resources/raw/master/images/squares/estrenosgo.png",
"banner": "estrenosgo.png",
"version": 1,
"changes": [
{
"date": "15/05/16",
"description": "Compatibilidad con python anteriores a la 2.7"
},
{
"date": "03/05/16",
"description": "Modificado por cambios en la web"
},
{
"date": "29/04/16",
"description": "Version inicial"
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "filesmonster_catalogue.png",
"banner": "filesmonster_catalogue.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "05/08/2016",
"description": "Eliminado de sección películas"
}
],
"categories": [
"adult"
],

View File

@@ -4,13 +4,6 @@
"language": ["*"],
"active": true,
"adult": true,
"version": 1,
"changes": [
{
"date": "29/04/2017",
"description": "Primera versión"
}
],
"thumbnail": "http://i.imgur.com/wuzhOCt.png?1",
"categories": [
"adult"

View File

@@ -4,15 +4,8 @@
"active": true,
"adult": false,
"language": ["cast", "lat"],
"version": 1,
"thumbnail": "http://gnula.mobi/wp-content/uploads/2016/08/Untitled-6.png",
"banner": "",
"changes": [
{
"date": "25/08/2017",
"description": "Nuevo canal"
}
],
"categories": [
"movie",
"adult"

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "gnula.png",
"banner": "gnula.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie"
]

View File

@@ -6,17 +6,6 @@
"language": ["cast"],
"thumbnail": "guaridavalencianista.png",
"banner": "guaridavalencianista.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"documentary"
]

View File

@@ -6,29 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "hdfull.png",
"banner": "hdfull.png",
"version": 1,
"changes": [
{
"date": "30/05/2017",
"description": "Arreglada la extracción de enlaces por cambios en la web"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "21/03/2017",
"description": "Pequeño fix para corregir algunas urls de los vídeos que se extraían mal"
},
{
"date": "02/02/2017",
"description": "Arreglada la extracción de enlaces por cambios en la web"
},
{
"date": "05/01/2017",
"description": "Corregido debido a cloudflare"
}
],
"categories": [
"movie",
"tvshow"

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "https://s11.postimg.org/cmuwcvvpf/hentaienespanol.png",
"banner": "https://s3.postimg.org/j3qkfut8z/hentaienespanol_banner.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/12/2016",
"description": "Release."
}
],
"categories": [
"adult"
],

View File

@@ -6,9 +6,6 @@
"language": ["*"],
"thumbnail": "https://dl.dropboxusercontent.com/u/30248079/hentai_id.png",
"banner": "https://dl.dropboxusercontent.com/u/30248079/hentai_id2.png",
"version": 1,
"date": "09/03/2017",
"changes": "Fix web",
"categories": [
"adult"
]

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "https://s27.postimg.org/pjq3y552b/idocumentales.png",
"banner": "https://s16.postimg.org/6d8bh1z1x/idocumentales_banner.png",
"version": 1,
"changes": [
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "18/06/2016",
"description": "First release"
}
],
"categories": [
"documentary"
],

View File

@@ -4,21 +4,6 @@
"active": true,
"adult": false,
"language": ["cast", "lat"],
"changes": [
{
"date": "12/03/2017",
"description": "Reparados enlaces directos"
},
{
"date": "27/02/2017",
"description": "Añadidos enlaces directos y adaptado al uso de httptools"
},
{
"date": "16/01/2016",
"description": "Corregido por cambios en el enmascaramiento de enlaces"
}
],
"version": 1,
"thumbnail": "http://i.imgur.com/I7MxHZI.png",
"banner": "inkapelis.png",
"categories": [

View File

@@ -4,13 +4,6 @@
"language": ["*"],
"active": true,
"adult": true,
"version": 1,
"changes": [
{
"date": "29/04/2017",
"description": "Primera versión"
}
],
"thumbnail": "http://i.imgur.com/OTYwbAa.png?1",
"categories": [
"adult"

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "https://s15.postimg.org/pzd3h4vy3/javus.png",
"banner": "https://s21.postimg.org/5pqzedp2f/javus_banner.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/12/2016",
"description": "Release."
}
],
"categories": [
"adult"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "jkanime.png",
"banner": "jkanime.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"anime"
],

View File

@@ -4,13 +4,6 @@
"language": ["cast", "lat"],
"active": true,
"adult": false,
"version": 1,
"changes": [
{
"date": "16/05/2017",
"description": "Primera version"
}
],
"thumbnail": "http://i.imgur.com/LVdupxc.png",
"categories": [
"movie",

View File

@@ -6,29 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "https://s31.postimg.org/5worjw2nv/locopelis.png",
"banner": "https://s31.postimg.org/ng87bb9jv/locopelis_banner.png",
"version": 1,
"changes": [
{
"date": "24/06/2017",
"description": "Cambios para autoplay"
},
{
"date": "06/06/2017",
"description": "Compatibilidad con autoplay"
},
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "06/12/2016",
"description": "Release."
}
],
"categories": [
"movie"
],

View File

@@ -4,15 +4,8 @@
"active": true,
"adult": false,
"language": ["cast", "lat"],
"version": 1,
"thumbnail": "http://www.maxipelis.net/wp-content/uploads/2016/12/applogo.png",
"banner": "",
"changes": [
{
"date": "25/08/2017",
"description": "Nuevo canal"
}
],
"categories": [
"movie"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast"],
"thumbnail": "mejortorrent.png",
"banner": "mejortorrent.png",
"version": 1,
"changes": [
{
"date": "17/04/2017",
"description": "Arreglado error que impedía el uso del canal"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"torrent",
"movie",

View File

@@ -6,29 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s32.postimg.org/7g50yo39h/metaserie.png",
"banner": "https://s31.postimg.org/u6yddil8r/metaserie_banner.png",
"version": 1,
"changes": [
{
"date": "24/06/2017",
"description": "Cambios para autoplay"
},
{
"date": "06/06/2017",
"description": "Compatibilidad con AutoPlay"
},
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "04/01/2017",
"description": "Release."
}
],
"categories": [
"tvshow"
],

View File

@@ -4,21 +4,6 @@
"active": true,
"adult": false,
"language": ["cast"],
"version": 1,
"changes": [
{
"date": "06/12/2016",
"description": "Release"
},
{
"date": "04/04/2017",
"description": "Migración a Httptools y algunos arreglos"
},
{
"date": "28/06/2017",
"description": "Correciones código y algunas mejoras"
}
],
"thumbnail": "http://imgur.com/KZoska0.png",
"banner": "miltorrents.png",
"categories": [

View File

@@ -6,17 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s17.postimg.org/e8kp12mcv/miradetodo.png",
"banner": "https://s7.postimg.org/it21t0dej/miradetodo-banner.png",
"version": 1,
"changes": [
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "05/05/2017",
"description": "First release"
}
],
"categories": [
"movie"
],

View File

@@ -6,33 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s32.postimg.org/h1ewz9hhx/mundoflv.png",
"banner": "mundoflv.png",
"version": 1,
"changes": [
{
"date": "24/06/2017",
"description": "Cambios para autoplay"
},
{
"date": "06/06/2017",
"description": "Compatibilidad con AutoPlay"
},
{
"date": "03/06/2017",
"description": "Reparado por mala subida"
},
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "28/01/2017",
"description": "Release."
}
],
"categories": [
"tvshow"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast"],
"thumbnail": "newpct.png",
"banner": "newpct.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -6,25 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "newpct1.png",
"banner": "newpct1.png",
"version": 1,
"changes": [
{
"date": "12/05/17",
"description": "Modificado listado para evitar errores con infoplus"
},
{
"date": "17/04/17",
"description": "Arreglada seccion series"
},
{
"date": "29/12/16",
"description": "Adaptado, por cambios en la web, seccion Series"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -4,25 +4,6 @@
"active": false,
"adult": false,
"language": ["*"],
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "07/02/17",
"description": "Añadir cuadro de progreso"
},
{
"date": "01/07/16",
"description": "Eliminado código innecesario."
},
{
"date": "29/04/16",
"description": "Posibilidad de incluir otros canales, mediante configuracion"
}
],
"categories": [
"movie"
],

View File

@@ -4,17 +4,6 @@
"language": ["*"],
"active": true,
"adult": true,
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "16/02/2017",
"description": "Primera versión"
}
],
"thumbnail": "http://i.imgur.com/rSbuStX.png",
"banner": "nuvid.png",
"categories": [

View File

@@ -1,12 +1,11 @@
{
"id": "ohpelis",
"name": "OH-PELIS",
"id": "ohlatino",
"name": "OH!Latino",
"active": true,
"adult": false,
"language": ["lat"],
"thumbnail": "https://s28.postimg.org/6v7ig831p/oh-pelis.png",
"thumbnail": "http://cinemiltonero.com/wp-content/uploads/2017/08/logo-Latino0.png",
"banner": "https://s27.postimg.org/bz0fh8jpf/oh-pelis-banner.png",
"version": 1,
"categories": [
"movie"
],

View File

@@ -0,0 +1,206 @@
# -*- coding: utf-8 -*-
# -*- Channel OH!Latino -*-
# -*- Created for Alfa-addon -*-
# -*- By the Alfa Develop Group -*-
import re
from channelselector import get_thumb
from core import httptools
from core import scrapertools
from core import servertools
from core import tmdb
from core.item import Item
from platformcode import config, logger
host = 'http://www.ohpeliculas.com'
def mainlist(item):
logger.info()
itemlist = []
data = httptools.downloadpage(host).data
patron = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)<\/a> <i>(\d+)<\/i>'
matches = scrapertools.find_multiple_matches(data, patron)
mcantidad = 0
for scrapedurl, scrapedtitle, cantidad in matches:
mcantidad += int(cantidad)
itemlist.append(
item.clone(title="Peliculas",
action='movies_menu'
))
itemlist.append(
item.clone(title="Buscar",
action="search",
url=host+'?s=',
))
return itemlist
def movies_menu(item):
logger.info()
itemlist = []
itemlist.append(
item.clone(title="Todas",
action="list_all",
url=host
))
itemlist.append(
item.clone(title="Generos",
action="section",
url=host, extra='genres'))
itemlist.append(
item.clone(title="Por año",
action="section",
url=host, extra='byyear'
))
return itemlist
def get_source(url):
logger.info()
data = httptools.downloadpage(url).data
data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
return data
def list_all(item):
logger.info()
itemlist = []
data = get_source(item.url)
patron = '<div id=mt-.*? class=item>.*?<a href=(.*?)><div class=image>.*?'
patron +='<img src=(.*?) alt=.*?span class=tt>(.*?)<.*?ttx>(.*?)'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot in matches:
url = scrapedurl
action = 'findvideos'
thumbnail = scrapedthumbnail
contentTitle = scrapedtitle
plot = scrapedplot
title = contentTitle
filtro_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w185", "")
filtro_list = {"poster_path": filtro_thumb}
filtro_list = filtro_list.items()
itemlist.append(Item(channel=item.channel,
action=action,
title=title,
url=url,
plot=plot,
thumbnail=thumbnail,
contentTitle=contentTitle,
infoLabels={'filtro': filtro_list}
))
#tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
# Paginacion
if itemlist != []:
actual_page_url = item.url
next_page = scrapertools.find_single_match(data,
'alignleft><a href=(.*?) ><\/a><\/div><div class=nav-next alignright>')
if next_page != '':
itemlist.append(Item(channel=item.channel,
action="list_all",
title='Siguiente >>>',
url=next_page,
thumbnail='https://s16.postimg.org/9okdu7hhx/siguiente.png'
))
return itemlist
def section(item):
logger.info()
itemlist = []
duplicated =[]
data = httptools.downloadpage(item.url).data
if item.extra == 'genres':
patron = '<li class="cat-item cat-item-.*?><a href="(.*?)" >(.*?)<\/a>'
elif item.extra == 'byyear':
patron = '<a href="([^"]+)">(\d{4})<\/a><\/li>'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedtitle in matches:
title = scrapedtitle
url = scrapedurl
if url not in duplicated:
itemlist.append(Item(channel=item.channel,
action='list_all',
title=title,
url=url
))
duplicated.append(url)
return itemlist
def search(item, texto):
logger.info()
texto = texto.replace(" ", "+")
item.url = item.url + texto
if texto != '':
return list_all(item)
def findvideos(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
itemlist.extend(servertools.find_video_items(data=data))
for videoitem in itemlist:
videoitem.channel = item.channel
videoitem.contentTitle = item.fulltitle
videoitem.infoLabels = item.infoLabels
if videoitem.server != 'youtube':
videoitem.title = item.title + ' (%s)' % videoitem.server
else:
videoitem.title = 'Trailer en %s' % videoitem.server
videoitem.action = 'play'
videoitem.server = ""
if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
itemlist.append(
Item(channel=item.channel,
title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
url=item.url,
action="add_pelicula_to_library",
extra="findvideos",
))
tmdb.set_infoLabels(itemlist, True)
itemlist = servertools.get_servers_itemlist(itemlist)
return itemlist
def newest(categoria):
logger.info()
item = Item()
try:
if categoria == 'peliculas':
item.url = host + '/release/2017/'
elif categoria == 'infantiles':
item.url = host + '/genero/infantil/'
itemlist = list_all(item)
if itemlist[-1].title == '>> Página siguiente':
itemlist.pop()
except:
import sys
for line in sys.exc_info():
logger.error("%s" % line)
return []
return itemlist
def play(item):
logger.info()
item.thumbnail = item.contentThumbnail
return [item]

View File

@@ -1,323 +0,0 @@
# -*- coding: utf-8 -*-
# -*- Channel OH-PELIS -*-
# -*- Created for Alfa-addon -*-
# -*- By the Alfa Develop Group -*-
import re
from channelselector import get_thumb
from core import httptools
from core import scrapertools
from core import servertools
from core import tmdb
from core.item import Item
from platformcode import config, logger
host = 'http://www.ohpelis.com'
def mainlist(item):
logger.info()
itemlist = []
data = httptools.downloadpage(host).data
patron = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)<\/a> <i>(\d+)<\/i>'
matches = scrapertools.find_multiple_matches(data, patron)
mcantidad = 0
for scrapedurl, scrapedtitle, cantidad in matches:
mcantidad += int(cantidad)
itemlist.append(
item.clone(title="Peliculas (%s)" %mcantidad,
action='movies_menu'
))
itemlist.append(
item.clone(title="Series",
action='series_menu'
))
itemlist.append(
item.clone(title="Buscar",
action="search",
url='http://www.ohpelis.com/?s=',
))
return itemlist
def series_menu(item):
logger.info()
itemlist = []
itemlist.append(
item.clone(title="Series",
action="list_all",
url=host + '/series/',
extra='serie'
))
return itemlist
def movies_menu(item):
logger.info()
itemlist = []
itemlist.append(
item.clone(title="Todas",
action="list_all",
url=host + '/peliculas/'
))
itemlist.append(
item.clone(title="Generos",
action="section",
url=host, extra='genres'))
itemlist.append(
item.clone(title="Por año",
action="section",
url=host, extra='byyear'
))
return itemlist
def list_all(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
patron = '<div class="poster"><a href="(.*?)"><img src="(.*?)" alt="(.*?)"><\/a>.*?<span>(\d{4})<\/span>.*?'
patron += '<div class="texto">(.*?)<div'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedplot in matches:
title = scrapedtitle
thumbnail = scrapedthumbnail
url = scrapedurl
year = scrapedyear
new_item = (item.clone(title=title,
url=url,
thumbnail=thumbnail,
fulltitle=title,
contentTitle=title,
infoLabels={'year': year}
))
if item.extra == 'serie':
new_item.action = 'seasons'
new_item.contentSerieName = title
else:
new_item.action = 'findvideos'
new_item.contentTitle = title
itemlist.append(new_item)
tmdb.set_infoLabels(itemlist, True)
# Paginacion
next_page = scrapertools.find_single_match(data, '<link rel="next" href="(.*?) />')
if next_page:
itemlist.append(Item(channel=item.channel,
action="list_all",
title=">> Página siguiente",
url=next_page,
thumbnail=get_thumb("next.png")))
return itemlist
def section(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
if item.extra == 'genres':
patron = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)<\/a> <i>\d+<\/i>'
elif item.extra == 'byyear':
patron = '<li><a href="(http:\/\/www\.ohpelis\.com\/release.*?)">(.*?)<\/a><\/li>'
elif item.extra == 'alpha':
patron = '<li><a href="(http:\/\/www\.ohpelis\.com\/.*?)" >(.*?)<\/a><\/li>'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedtitle in matches:
title = scrapedtitle
url = scrapedurl
itemlist.append(Item(channel=item.channel,
action='list_all',
title=title,
url=url
))
return itemlist
def search_list(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
patron = '><div class="result-item">.*?<a href="(.*?)"><img src="(.*?)" alt="(.*?)" \/><span class="(.*?)".*?'
patron += '<span class="year">(.*?)<\/span>.*?<p>(.*?)<\/p>'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedtype, scrapedyear, scrapedplot in matches:
title = scrapedtitle
thumbnail = scrapedthumbnail
url = scrapedurl
year = scrapedyear
new_item = item.clone(action='',
title=title,
url=url,
thumbnail=thumbnail,
infoLabels={'year': year})
if scrapedtype == 'movies':
new_item.action = 'findvideos'
new_item.contentTitle = title
else:
new_item.action = 'seasons'
new_item.contentSerieName = title
itemlist.append(new_item)
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
return itemlist
def search(item, texto):
logger.info()
texto = texto.replace(" ", "+")
item.url = item.url + texto
if texto != '':
return search_list(item)
def seasons(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
patron = '<span class="se-t(?: "| se-o")>(.*?)<\/span><span class="title">(.*?) <i>'
matches = re.compile(patron, re.DOTALL).findall(data)
infoLabels = item.infoLabels
for scrapedseason, scrapedtitle in matches:
title = scrapedtitle
contentSeasonNumber = scrapedseason
infoLabels['season'] = scrapedseason
itemlist.append(item.clone(title=title,
contentSeasonNumber=contentSeasonNumber,
action='episodesxseason',
infoLabels=infoLabels))
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
if config.get_videolibrary_support() and len(itemlist) > 0:
itemlist.append(item.clone(title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
url=item.url,
action="add_serie_to_library",
extra='episodes',
contentSerieName=item.contentSerieName,
))
return itemlist
def episodes(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
patron = '<div class="numerando">(\d+) - (\d+)<\/div><div class="episodiotitle"><a href="(.*?)">(.*?)<\/a>'
matches = re.compile(patron, re.DOTALL).findall(data)
infoLabels = item.infoLabels
num_ep = 1
for scrapedseason, scrapedepisode, scrapedurl, scrapedtitle in matches:
season = scrapedseason
contentEpisodeNumber = num_ep
url = scrapedurl
title = '%sx%s - %s' % (season, num_ep, scrapedtitle)
itemlist.append(item.clone(title=title,
url=url,
contentEpisodeNumber=contentEpisodeNumber,
action='findvideos',
infoLabels=infoLabels
))
num_ep += 1
return itemlist
def episodesxseason(item):
logger.info()
itemlist = []
season = item.contentSeasonNumber
data = httptools.downloadpage(item.url).data
patron = '<div class="numerando">%s - (\d+)<\/div><div class="episodiotitle"><a href="(.*?)">(.*?)<\/a>' % season
matches = re.compile(patron, re.DOTALL).findall(data)
infoLabels = item.infoLabels
num_ep = 1
for scrapedepisode, scrapedurl, scrapedtitle in matches:
title = '%sx%s - %s' % (season, num_ep, scrapedtitle)
url = scrapedurl
infoLabels['episode'] = num_ep
itemlist.append(item.clone(title=title,
url=url,
contentEpisodeNumber=num_ep,
action='findvideos',
infoLabels=infoLabels))
num_ep += 1
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
return itemlist
def findvideos(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url).data
itemlist.extend(servertools.find_video_items(data=data))
for videoitem in itemlist:
videoitem.channel = item.channel
videoitem.contentTitle = item.fulltitle
videoitem.infoLabels = item.infoLabels
if videoitem.server != 'youtube':
videoitem.title = item.title + ' (%s)' % videoitem.server
else:
videoitem.title = 'Trailer en %s' % videoitem.server
videoitem.action = 'play'
videoitem.server = ""
if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
itemlist.append(
Item(channel=item.channel,
title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
url=item.url,
action="add_pelicula_to_library",
extra="findvideos",
))
tmdb.set_infoLabels(itemlist, True)
itemlist = servertools.get_servers_itemlist(itemlist)
return itemlist
def newest(categoria):
logger.info()
item = Item()
try:
if categoria == 'peliculas':
item.url = host + '/release/2017/'
elif categoria == 'infantiles':
item.url = host + '/genero/infantil/'
itemlist = list_all(item)
if itemlist[-1].title == '>> Página siguiente':
itemlist.pop()
except:
import sys
for line in sys.exc_info():
logger.error("%s" % line)
return []
return itemlist
def play(item):
logger.info()
item.thumbnail = item.contentThumbnail
return [item]

View File

@@ -7,13 +7,6 @@
"thumbnail": "http://imgur.com/iLeISt0.png",
"banner": "pasateatorrent.png",
"fanart": "http://imgur.com/uexmGEg.png",
"version": 1,
"changes": [
{
"date": "25/08/2017",
"description": "Revamp"
}
],
"categories": [
"torrent",
"movie",

View File

@@ -7,13 +7,6 @@
"fanart": "https://scontent-lht6-1.xx.fbcdn.net/v/t31.0-8/21056316_670362456502498_8317422545691005578_o.png?oh=1f13a23a931d82e944a7ec743a19f583&oe=5A599F4D",
"thumbnail": "https://scontent-lht6-1.xx.fbcdn.net/v/t1.0-9/20292600_467501756957771_6794721577753226614_n.jpg?oh=bba1479eccf0adceeb8c0d3450cc2531&oe=5A4EE0F5",
"banner": "",
"version": 1,
"changes": [
{
"date": "15/08/17",
"description": "Nuevo Canal"
}
],
"categories": [
"movie",
"tvshow",

View File

@@ -6,21 +6,6 @@
"language": ["lat"],
"thumbnail": "peliculasaudiolatino.png",
"banner": "peliculasaudiolatino.png",
"version": 1,
"changes": [
{
"date": "01/06/2017",
"description": "Reparado patron en play() para algunos servers"
},
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie"
],

View File

@@ -6,21 +6,6 @@
"language": ["cast"],
"thumbnail": "http://s29.postimg.org/wzw749oon/pldklog.jpg",
"banner": "peliculasdk.png",
"version": 1,
"changes": [
{
"date": "06/12/2016",
"description": "Corrección código. Adaptación Infoplus"
},
{
"date": "26/04/2017",
"description": "Adaptación videoteca"
},
{
"date": "28/06/2017",
"description": "Corrección código y algunas mejoras"
}
],
"categories": [
"torrent",
"movie"

View File

@@ -6,17 +6,6 @@
"language": ["*"],
"thumbnail": "peliculaseroticas.png",
"banner": "peliculaseroticas.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "05/08/2016",
"description": "Eliminado de sección peliculas."
}
],
"categories": [
"adult"
]

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "http://imgur.com/ThH8Zmk.png",
"banner": "peliculasgratis.png",
"version": 1,
"changes": [
{
"date": "13/01/2017",
"description": "Release"
},
{
"date": "04/04/2017",
"description": "Reparación cambios web"
}
],
"categories": [
"torrent",
"movie",

View File

@@ -6,13 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "peliculashindu.png",
"banner": "peliculashindu.png",
"version": 1,
"changes": [
{
"date": "25/05/2017",
"description": "Primera version"
}
],
"categories": [
"movie"
]

View File

@@ -6,17 +6,6 @@
"language": ["lat"],
"thumbnail": "peliculasmx.png",
"banner": "peliculasmx.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/11/2016",
"description": "Adaptado por cambios en la web."
}
],
"categories": [
"movie"
],

View File

@@ -4,25 +4,6 @@
"language": ["cast", "lat"],
"active": true,
"adult": false,
"version": 1,
"changes": [
{
"date": "12/05/2017",
"description": "Corregidos enlaces directos"
},
{
"date": "07/04/2017",
"description": "Subtitulos en videos directos"
},
{
"date": "12/03/2017",
"description": "Añadida info de idiomas"
},
{
"date": "16/02/2017",
"description": "Versión inicial"
}
],
"thumbnail": "http://i.imgur.com/2iupwXE.png",
"banner": "peliculasnu.png",
"categories": [

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "peliculasrey.png",
"banner": "peliculasrey.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"direct",
"movie"

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "pelisadicto.png",
"banner": "pelisadicto.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie"
],

View File

@@ -6,17 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "peliscity.png",
"banner": "peliscity.png",
"version": 1,
"changes": [
{
"date": "15/03/2017",
"description": "limpieza código"
},
{
"date": "01/07/2016",
"description": "Eliminado código innecesario."
}
],
"categories": [
"movie",
"direct",

View File

@@ -5,13 +5,6 @@
"adult": false,
"language": ["cast"],
"thumbnail": "http://imgur.com/yTQRPUJ.png",
"version": 1,
"changes": [
{
"date": "28/06/2017",
"description": "Release"
}
],
"categories": [
"movie",
"tvshow"

View File

@@ -1,33 +1,30 @@
{
"id": "pelisencasa",
"name": "PelisEnCasa",
"active": true,
"adult": false,
"language": ["lat"],
"thumbnail": "https://s14.postimg.org/iqiq0bxn5/pelisencasa.png",
"banner": "https://s18.postimg.org/j775ehbg9/pelisencasa_banner.png",
"version": 1,
"date": "17/03/2017",
"changes": "First release",
"categories": [
"movie"
],
"settings": [
{
"id": "include_in_newest_peliculas",
"type": "bool",
"label": "Incluir en Novedades - Peliculas",
"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": "pelisencasa",
"name": "PelisEnCasa",
"active": true,
"adult": false,
"language": ["lat"],
"thumbnail": "https://s14.postimg.org/iqiq0bxn5/pelisencasa.png",
"banner": "https://s18.postimg.org/j775ehbg9/pelisencasa_banner.png",
"categories": [
"movie"
],
"settings": [
{
"id": "include_in_newest_peliculas",
"type": "bool",
"label": "Incluir en Novedades - Peliculas",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_infantiles",
"type": "bool",
"label": "Incluir en Novedades - Infantiles",
"default": true,
"enabled": true,
"visible": true
}
]
}

View File

@@ -6,21 +6,6 @@
"language": ["lat"],
"thumbnail": "https://s14.postimg.org/c43etc1lt/pelisfox.png",
"banner": "https://s30.postimg.org/p6twg905d/pelisfox-banner.png",
"version": 1,
"changes": [
{
"date": "16/06/2017",
"description": "Fix pagina siguiente"
},
{
"date": "25/05/2017",
"description": "cambios esteticos"
},
{
"date": "05/05/2017",
"description": "First release"
}
],
"categories": [
"direct",
"movie"

View File

@@ -6,13 +6,6 @@
"language": ["cast", "lat"],
"thumbnail": "https://s30.postimg.org/kilh4lr4x/pelisgratis.png",
"banner": "https://s15.postimg.org/nztottswb/pelisgratis-banner.png",
"version": 1,
"changes": [
{
"date": "26/05/2017",
"description": "First release"
}
],
"categories": [
"movie"
],

Some files were not shown because too many files have changed in this diff Show More