[polpotv] fix wrong merge
This commit is contained in:
Whiplash
@@ -4,28 +4,10 @@
|
||||
"language": ["ita"],
|
||||
"active": true,
|
||||
"adult": false,
|
||||
<<<<<<< HEAD
|
||||
"thumbnail": "https://polpo.tv/build/assets/apple-touch-icon-152x152.png",
|
||||
"banner": "https://polpo.tv/build/assets/apple-touch-icon-152x152.png",
|
||||
"categories": [
|
||||
"movie"
|
||||
],
|
||||
"settings": [
|
||||
{
|
||||
"id": "include_in_global_search",
|
||||
"type": "bool",
|
||||
"label": "Includi ricerca globale",
|
||||
"default": false,
|
||||
"enabled": false,
|
||||
"visible": true
|
||||
}
|
||||
]
|
||||
=======
|
||||
"thumbnail": "polpotv.png",
|
||||
"banner": "polpotv.png",
|
||||
"categories": ["movie"],
|
||||
"not_active":[],
|
||||
"default_off":["include_in_newest"],
|
||||
"settings": []
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# ------------------------------------------------------------
|
||||
<<<<<<< HEAD
|
||||
# kod - XBMC Plugin
|
||||
# Canale polpotv
|
||||
# ------------------------------------------------------------
|
||||
|
||||
from platformcode import logger
|
||||
from core import scrapertools, httptools, support
|
||||
from core.item import Item
|
||||
from platformcode import config
|
||||
from core import jsontools
|
||||
import json
|
||||
import datetime
|
||||
=======
|
||||
# KoD - XBMC Plugin
|
||||
# Canale polpotv
|
||||
# ------------------------------------------------------------
|
||||
@@ -21,7 +8,6 @@ from core import scrapertools, httptools, support, jsontools
|
||||
from core.item import Item
|
||||
from platformcode import config
|
||||
import json, datetime
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
|
||||
__channel__ = "polpotv"
|
||||
host = config.get_channel_url(__channel__)
|
||||
@@ -33,17 +19,6 @@ list_quality = ['1080p','720p','480p','360p']
|
||||
|
||||
@support.menu
|
||||
def mainlist(item):
|
||||
<<<<<<< HEAD
|
||||
film = [
|
||||
('Ultimi Film aggiunti', ['/api/movies?order[lastReleaseAt]=desc', 'peliculas', '']),
|
||||
('Generi', ['/api/genres', 'search_movie_by_genre', '']),
|
||||
('Anni', ['', 'search_movie_by_year', '']),
|
||||
]
|
||||
return locals()
|
||||
|
||||
def peliculas(item):
|
||||
logger.info("kod.polpotv peliculas")
|
||||
=======
|
||||
menu = [
|
||||
('Ultimi Film aggiunti', ['/api/movies?order[lastReleaseAt]=desc', 'peliculas', '']),
|
||||
('Generi', ['/api/genres', 'search_movie_by_genre', '']),
|
||||
@@ -62,7 +37,6 @@ def newest(categoria):
|
||||
|
||||
def peliculas(item):
|
||||
support.log()
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
itemlist = []
|
||||
data = httptools.downloadpage(item.url, headers=headers).data
|
||||
json_object = jsontools.load(data)
|
||||
@@ -71,23 +45,6 @@ def peliculas(item):
|
||||
itemlist.extend(get_itemlist_movie(movie,item))
|
||||
|
||||
try:
|
||||
<<<<<<< HEAD
|
||||
if json_object['hydra:view']['hydra:next'] is not None:
|
||||
itemlist.append(
|
||||
Item(channel=item.channel,
|
||||
action="peliculas",
|
||||
title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
|
||||
url="%s"%host +json_object['hydra:view']['hydra:next'],
|
||||
extra=item.extra,
|
||||
thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"))
|
||||
except:
|
||||
pass
|
||||
|
||||
return itemlist
|
||||
|
||||
def search(item, texto):
|
||||
logger.info("kod.polpotv " + item.url + " search " + texto)
|
||||
=======
|
||||
if support.inspect.stack()[1][3] not in ['newest']:
|
||||
support.nextPage(itemlist, item, next_page=json_object['hydra:view']['hydra:next'])
|
||||
except:
|
||||
@@ -97,7 +54,6 @@ def search(item, texto):
|
||||
|
||||
def search(item, texto):
|
||||
support.log(item.url, "search", texto)
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
itemlist=[]
|
||||
try:
|
||||
item.url = host + "/api/movies?originalTitle="+texto+"&translations.name=" +texto
|
||||
@@ -106,17 +62,6 @@ def search(item, texto):
|
||||
for movie in json_object['hydra:member']:
|
||||
itemlist.extend(get_itemlist_movie(movie,item))
|
||||
return itemlist
|
||||
<<<<<<< HEAD
|
||||
# Continua la ricerca in caso di errore
|
||||
except:
|
||||
import sys
|
||||
for line in sys.exc_info():
|
||||
logger.error("%s" % line)
|
||||
return []
|
||||
|
||||
def search_movie_by_genre(item):
|
||||
logger.info("kod.polpotv search_movie_by_genre")
|
||||
=======
|
||||
# Continua la ricerca in caso di errore
|
||||
except:
|
||||
import sys
|
||||
@@ -126,7 +71,6 @@ def search_movie_by_genre(item):
|
||||
|
||||
def search_movie_by_genre(item):
|
||||
support.log()
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
itemlist = []
|
||||
data = httptools.downloadpage(item.url, headers=headers).data
|
||||
json_object = jsontools.load(data)
|
||||
@@ -134,16 +78,6 @@ def search_movie_by_genre(item):
|
||||
itemlist.append(
|
||||
Item(channel=item.channel,
|
||||
action="peliculas",
|
||||
<<<<<<< HEAD
|
||||
title="[COLOR azure]" + genre['name'] + "[/COLOR]",
|
||||
contentType='movie',
|
||||
url="%s/api/movies?genres.id=%s" %(host,genre['id']),
|
||||
extra=item.extra))
|
||||
return itemlist
|
||||
|
||||
def search_movie_by_year(item):
|
||||
logger.info("kod.polpo.tv search_movie_by_year")
|
||||
=======
|
||||
title=support.typo(genre['name'],'bold'),
|
||||
contentType='movie',
|
||||
url="%s/api/movies?genres.id=%s" %(host,genre['id']),
|
||||
@@ -152,7 +86,6 @@ def search_movie_by_year(item):
|
||||
|
||||
def search_movie_by_year(item):
|
||||
support.log()
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
now = datetime.datetime.now()
|
||||
year = int(now.year)
|
||||
itemlist = []
|
||||
@@ -162,21 +95,12 @@ def search_movie_by_year(item):
|
||||
url="%s/api/movies?releaseDate=%s" %(host,year_to_search),
|
||||
plot="1",
|
||||
type="movie",
|
||||
<<<<<<< HEAD
|
||||
title="[COLOR azure]%s[/COLOR]" % year_to_search,
|
||||
action="peliculas"))
|
||||
return itemlist
|
||||
|
||||
def findvideos(item):
|
||||
logger.info("kod.polpotv peliculas")
|
||||
=======
|
||||
title=support.typo(year_to_search,'bold'),
|
||||
action="peliculas"))
|
||||
return itemlist
|
||||
|
||||
def findvideos(item):
|
||||
support.log()
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
itemlist = []
|
||||
try:
|
||||
data = httptools.downloadpage(item.url, headers=headers).data
|
||||
@@ -199,11 +123,7 @@ def findvideos(item):
|
||||
return support.server(item, itemlist=itemlist)
|
||||
|
||||
def get_itemlist_movie(movie,item):
|
||||
<<<<<<< HEAD
|
||||
logger.info("kod.polpotv get_itemlist_movie")
|
||||
=======
|
||||
support.log()
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
itemlist=[]
|
||||
try:
|
||||
if movie['originalLanguage']['id']=='it':
|
||||
@@ -231,11 +151,7 @@ def get_itemlist_movie(movie,item):
|
||||
itemlist.append(
|
||||
Item(channel=item.channel,
|
||||
action="findvideos",
|
||||
<<<<<<< HEAD
|
||||
title="[COLOR azure]"+ scrapedtitle + "[/COLOR]" + " [COLOR yellow]["+movie['lastQuality']+"][/COLOR] ",
|
||||
=======
|
||||
title=support.typo(scrapedtitle,'bold') + support.typo(movie['lastQuality'].upper(), '_ [] color kod bold'),
|
||||
>>>>>>> 6bc4b7199c1eed191a4b9c8f1e066c368126c872
|
||||
fulltitle=scrapedtitle,
|
||||
show=scrapedtitle,
|
||||
plot=scrapedplot,
|
||||
|
||||
Reference in New Issue
Block a user