Merge pull request #172 from Intel11/news

Canales para News
This commit is contained in:
Alfa
2017-11-17 18:51:53 -03:00
committed by GitHub
24 changed files with 245 additions and 46 deletions

View File

@@ -19,6 +19,14 @@
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_global_search",
"type": "bool",

View File

@@ -33,7 +33,7 @@ def newest(categoria):
itemlist = []
item = Item()
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host
elif categoria == 'infantiles':
item.url = host + 'category/animacion/'

View File

@@ -20,6 +20,14 @@
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
@@ -50,4 +58,4 @@
]
}
]
}
}

View File

@@ -217,7 +217,7 @@ def newest(categoria):
itemlist = []
item = Item()
try:
if categoria == "peliculas":
if categoria in ['peliculas','latino']:
item.url = host + "movies/newmovies?page=1"
item.action = "lista"
itemlist = lista(item)

View File

@@ -18,6 +18,14 @@
"enabled": false,
"visible": false
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
@@ -35,4 +43,4 @@
"visible": true
}
]
}
}

View File

@@ -193,7 +193,7 @@ def newest(categoria):
item = Item()
# categoria='peliculas'
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + 'page/1.html'
elif categoria == 'infantiles':
item.url = host + 'peliculas-de-genero/infantil/1.html'

View File

@@ -31,6 +31,14 @@
"VOS"
]
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
@@ -56,4 +64,4 @@
"visible": true
}
]
}
}

View File

@@ -457,7 +457,7 @@ def newest(categoria):
item = Item()
# categoria='peliculas'
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host
elif categoria == 'infantiles':
item.url = host + 'search?q=animación'

View File

@@ -18,6 +18,14 @@
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
@@ -35,4 +43,4 @@
"visible": true
}
]
}
}

View File

@@ -382,7 +382,7 @@ def newest(categoria):
itemlist = []
item = Item()
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + 'page/1/?s'
elif categoria == 'infantiles':

View File

@@ -18,6 +18,14 @@
"enabled": false,
"visible": false
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
@@ -35,4 +43,4 @@
"visible": true
}
]
}
}

View File

@@ -183,7 +183,7 @@ def newest(categoria):
logger.info()
item = Item()
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + '/release/2017/'
elif categoria == 'infantiles':

View File

@@ -10,13 +10,45 @@
"movie"
],
"settings": [
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_global_search",
"type": "bool",
"label": "Incluir en busqueda global",
"default": false,
"default": true,
"enabled": true,
"visible": true
},
{
"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": "include_in_newest_terror",
"type": "bool",
"label": "Incluir en Novedades - terror",
"default": true,
"enabled": true,
"visible": true
}
]
}
}

View File

@@ -31,6 +31,29 @@ def mainlist(item):
return itemlist
def newest(categoria):
logger.info()
itemlist = []
item = Item()
try:
if categoria in ['peliculas','latino']:
item.url = HOST
elif categoria == 'infantiles':
item.url = HOST + '/genero/animacion.html'
elif categoria == 'terror':
item.url = HOST + '/genero/terror.html'
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
def peliculas(item):
logger.info()

View File

@@ -10,13 +10,45 @@
"movie"
],
"settings": [
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_global_search",
"type": "bool",
"label": "Incluir en busqueda global",
"default": false,
"default": true,
"enabled": true,
"visible": true
},
{
"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": "include_in_newest_terror",
"type": "bool",
"label": "Incluir en Novedades - terror",
"default": true,
"enabled": true,
"visible": true
}
]
}
}

View File

@@ -10,28 +10,47 @@ from core.item import Item
from platformcode import logger
host = "http://www.peliculasmx.net"
def mainlist(item):
logger.info()
itemlist = []
itemlist.append(
Item(channel=item.channel, title="Últimas añadidas", action="peliculas", url="http://www.peliculasmx.net/"))
Item(channel=item.channel, title="Últimas añadidas", action="peliculas", url=host))
itemlist.append(
Item(channel=item.channel, title="Últimas por género", action="generos", url="http://www.peliculasmx.net/"))
itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url="http://www.peliculasmx.net/"))
Item(channel=item.channel, title="Últimas por género", action="generos", url=host))
itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url=host))
return itemlist
def newest(categoria):
logger.info()
itemlist = []
item = Item()
try:
if categoria in ['peliculas','latino']:
item.url = host
elif categoria == 'infantiles':
item.url = host + '/category/animacion/'
elif categoria == 'terror':
item.url = host + '/category/terror/'
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
def generos(item):
logger.info()
itemlist = []
# Descarga la página
data = httptools.downloadpage(item.url).data
logger.debug(data)
# <li class="cat-item cat-item-3"><a href="http://peliculasmx.net/category/accion/" >Accion</a> <span>246</span>
patron = '<li class="cat-item cat-item-.*?'
patron += '<a href="([^"]+)".*?'
patron += '>([^<]+).*?'
@@ -92,7 +111,7 @@ def search(item, texto):
texto = texto.replace(" ", "+")
try:
# Series
item.url = "http://www.peliculasmx.net/?s=%s" % texto
item.url = host + "/?s=%s" % texto
itemlist.extend(peliculas(item))
itemlist = sorted(itemlist, key=lambda Item: Item.title)

View File

@@ -27,6 +27,14 @@
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_infantiles",
"type": "bool",

View File

@@ -291,7 +291,7 @@ def newest(categoria):
item = Item()
# categoria='peliculas'
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + '/estrenos/'
elif categoria == 'infantiles':
item.url = host + '/peliculas/animacion/'

View File

@@ -11,28 +11,47 @@
"tvshow",
"documentary",
"direct"
],
"settings": [
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_global_search",
"type": "bool",
"label": "Incluir en busqueda global",
"default": true,
"enabled": false,
"visible": false
"enabled": true,
"visible": true
},
{
"id": "filter_languages",
"type": "list",
"label": "Mostrar enlaces en idioma...",
"default": 0,
"id": "include_in_newest_peliculas",
"type": "bool",
"label": "Incluir en Novedades - Peliculas",
"default": true,
"enabled": true,
"visible": true,
"lvalues": [
"No filtrar",
"Latino"
]
"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
}
]
}
}

View File

@@ -513,12 +513,15 @@ def newest(categoria):
item = Item()
item.extra = 'estrenos/'
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + 'estrenos/pag-1'
elif categoria == 'infantiles':
item.url = host + 'peliculas/animacion/pag-1'
elif categoria == 'terror':
item.url = host + 'peliculas/terror/pag-1'
elif categoria == 'documentales':
item.url = host + 'documentales/pag-1'
item.extra = 'documentales/'
@@ -532,6 +535,5 @@ def newest(categoria):
logger.error("{0}".format(line))
return []
itemlist = filtertools.get_links(itemlist, item, list_language)
#itemlist = filtertools.get_links(itemlist, item, list_language)
return itemlist

View File

@@ -18,6 +18,14 @@
"enabled": false,
"visible": false
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
@@ -43,4 +51,4 @@
"visible": true
}
]
}
}

View File

@@ -147,7 +147,7 @@ def newest(categoria):
itemlist = []
item = Item()
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + '/cartelera/'
elif categoria == 'infantiles':
item.url = host + "/online/animacion"
@@ -167,4 +167,4 @@ def newest(categoria):
logger.error("{0}".format(line))
return []
return itemlist
return itemlist

View File

@@ -19,6 +19,14 @@
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_latino",
"type": "bool",
"label": "Incluir en Novedades - Latino",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",

View File

@@ -251,7 +251,7 @@ def newest(categoria):
item = Item()
item.extra = 'estrenos/'
try:
if categoria == 'peliculas':
if categoria in ['peliculas','latino']:
item.url = host + '/genre/estrenos/'
elif categoria == 'infantiles':