Merge branch 'master' of github.com:kodiondemand/addon

* 'master' of github.com:kodiondemand/addon:
  Ricerca Globale Cambio colori
  Icone Eurostreaming
  Icone PolpoTV
  modifiche grafiche polpo.tv
  [PolpoTV] new channel for kod (#119)
  Community Channel - Supporto a Pagination - Visualizzazione in Stagioni - Filtri nel menu di 2° livello - Thumbnails e plot nei filtri
  nuovo pattern wstream

channels/polpotv.json

@@ -0,0 +1,12 @@
+{
+	"id": "polpotv",
+	"name": "PolpoTV",
+	"language": ["ita"],
+	"active": true,
+	"adult": false,
+	"thumbnail": "polpotv.png",
+	"banner": "polpotv.png",
+	"categories": ["movie"],
+	"not_active":["include_in_newest"],
+    "settings": []
+}

channels/polpotv.py

@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# 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
+
+__channel__ = "polpotv"
+host = config.get_channel_url(__channel__)
+
+headers = [['Accept', 'application/ld+json']]
+
+list_servers = ['directo']
+list_quality = ['1080p','720p','480p','360p']
+
+@support.menu
+def mainlist(item):
+    menu = [
+        ('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")
+    itemlist = []
+    data = httptools.downloadpage(item.url, headers=headers).data
+    json_object = jsontools.load(data)
+
+    for movie in json_object['hydra:member']:
+        itemlist.extend(get_itemlist_movie(movie,item))
+
+    try:
+        itemlist = support.nextPage(itemlist, item, next_page=json_object['hydra:view']['hydra:next'])
+    except:
+        pass
+    
+    return itemlist
+        
+def search(item, texto):
+    logger.info("kod.polpotv " + item.url + " search " + texto)
+    itemlist=[]
+    try:
+        item.url = host + "/api/movies?originalTitle="+texto+"&translations.name=" +texto
+        data = httptools.downloadpage(item.url, headers=headers).data
+        json_object = jsontools.load(data)
+        for movie in json_object['hydra:member']:
+            itemlist.extend(get_itemlist_movie(movie,item))
+        return itemlist
+    # 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")
+    itemlist = []
+    data = httptools.downloadpage(item.url, headers=headers).data
+    json_object = jsontools.load(data)
+    for genre in json_object['hydra:member']:
+        itemlist.append(
+            Item(channel=item.channel,
+             action="peliculas",
+             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")
+    now = datetime.datetime.now()
+    year = int(now.year)
+    itemlist = []
+    for i in range(100):
+        year_to_search = year - i
+        itemlist.append(Item(channel=item.channel,
+                           url="%s/api/movies?releaseDate=%s" %(host,year_to_search),
+                           plot="1",
+                           type="movie",
+                           title="[COLOR azure]%s[/COLOR]" % year_to_search,
+                           action="peliculas"))
+    return itemlist 
+    
+def findvideos(item):
+    logger.info("kod.polpotv peliculas")
+    itemlist = []
+    try:
+        data = httptools.downloadpage(item.url, headers=headers).data
+        json_object = jsontools.load(data)
+        for video in json_object['hydra:member'][0]['playlist']['videos']:
+            data = httptools.downloadpage(video['src'], headers={'Origin': host},follow_redirects=None).data
+            patron = 'href="([^"]+)"'
+            video_link = scrapertools.find_single_match(data, patron)
+            itemlist.append(
+                Item(
+                    channel=item.channel,
+                    action="play",
+                    thumbnail=item.thumbnail,
+                    url=video_link,
+                    server='directo',
+                    quality=str(video['size'])+ 'p',
+                    folder=False))
+    except:
+        pass
+    return support.server(item, itemlist=itemlist)
+
+def get_itemlist_movie(movie,item):
+    logger.info("kod.polpotv get_itemlist_movie")
+    itemlist=[]
+    try:
+        if movie['originalLanguage']['id']=='it':
+            scrapedtitle=movie['originalTitle']
+        else:
+            scrapedtitle=movie['translations'][1]['name']
+        if scrapedtitle=='':
+            scrapedtitle=movie['originalTitle']
+    except:
+        scrapedtitle=movie['originalTitle']
+    try:
+        scrapedplot=movie['translations'][1]['overview']
+    except:
+        scrapedplot = ""
+    try:
+        scrapedthumbnail="http://"+movie['posterPath']
+    except:
+        scrapedthumbnail=""
+    try:
+        scrapedfanart="http://"+movie['backdropPath']
+    except:
+        scrapedfanart=""
+    infoLabels = {}
+    infoLabels['tmdbid']=movie['tmdbId']
+    itemlist.append(
+        Item(channel=item.channel,
+             action="findvideos",
+             title=scrapedtitle + " " + support.typo(movie['lastQuality'].upper(), '[] color kod'),
+             fulltitle=scrapedtitle,
+             show=scrapedtitle,
+             plot=scrapedplot,
+             fanart=scrapedfanart,
+             thumbnail=scrapedthumbnail,
+             contentType='movie',
+             contentTitle=scrapedtitle,
+             url="%s%s/releases" %(host,movie['@id'] ),
+             infoLabels=infoLabels,
+             extra=item.extra))
+    return itemlist

channels/seriehd.py

@@ -76,9 +76,8 @@ def episodios(item):
         episodes = support.match(item, r'<a href="([^"]+)">(\d+)<', '<h3>EPISODIO</h3><ul>(.*?)</ul>', headers, season_url)[0]
         for episode_url, episode in episodes:
             episode_url = support.urlparse.urljoin(url, episode_url)
-            title = season + "x" + episode.zfill(2)
+            title = season + "x" + episode.zfill(2) + ' - ' + item.fulltitle
             data += title + '|' + episode_url + '\n'
-    support.log('DaTa= ',data)
     patron = r'(?P<title>[^\|]+)\|(?P<url>[^\n]+)\n'
     action = 'findvideos'
     return locals()