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

channels.json

@@ -20,7 +20,7 @@
     "cinemastreaming": "https://cinemastreaming.icu",
     "documentaristreamingda": "https://documentari-streaming-da.com",
     "dreamsub": "https://www.dreamsub.stream",
-    "eurostreaming": "https://eurostreaming.gratis",
+    "eurostreaming": "https://eurostreaming.pink",
     "eurostreaming_video": "https://www.eurostreaming.best",
     "fastsubita": "http://fastsubita.com",
     "ffilms":"https://ffilms.org",

channels/eurostreaming.json

@@ -12,7 +12,7 @@
     "id": "channel_host",
     "type": "text",
     "label": "Host del canale",
-    "default": "https://eurostreaming.cafe/",
+    "default": "https://eurostreaming.cafe",
     "enabled": true,
     "visible": true
     },   

channels/eurostreaming.py

@@ -96,7 +96,7 @@ def episodios(item):
     #=========
     patron = r'(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?<\/div>'\
              '<div class="su-spoiler-content su-clearfix" style="display:none">|'\
-             '(?:\s|\Wn)?(?:<strong>)?(\d&#.*?)(?:|–)?<a\s(.*?)<\/a><br\s\/>)'
+             '(?:\s|\Wn)?(?:<strong>)?(\d+&#.*?)(?:|–)?<a\s(.*?)<\/a><br\s\/>)'
 ##    '(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?'\
 ##             '<\/div><div class="su-spoiler-content su-clearfix" style="display:none">|'\
 ##             '(?:\s|\Wn)?(?:<strong>)?(\d[&#].*?)(?:–|\W)?<a\s(.*?)<\/a><br\s\/>)'
@@ -141,7 +141,7 @@ def findvideos(item):
 # ===========  def ricerca  =============
 def search(item, texto):
     support.log()
-    item.url = "%s?s=%s" % (host, texto)
+    item.url = "%s/?s=%s" % (host, texto)
     try:
         return serietv(item)
     # Continua la ricerca in caso di errore
@@ -159,7 +159,7 @@ def newest(categoria):
     item.contentType= 'episode'
     item.args= 'True'
     try:        
-        item.url = "%saggiornamento-episodi/" % host
+        item.url = "%s/aggiornamento-episodi/" % host
         item.action = "serietv"
         itemlist = serietv(item)
 

specials/netlovers.json

@@ -1,12 +0,0 @@
-{
-    "id": "netlovers",
-    "name": "Net Lovers",
-    "language": ["ita"],
-    "active": false,
-    "adult": false,
-    "thumbnail": null,
-    "banner": null,
-    "categories": [],
-    "settings": [],
-    "channel": false
-}

specials/netlovers.py

@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# Canale netlovers
-# ------------------------------------------------------------
-
-import re
-import urllib
-from channelselector import get_thumb
-from core import httptools, scrapertools, support, tmdb
-from core.item import Item
-from platformcode import logger, config
-
-host = "https://www.netflixlovers.it"
-
-TIMEOUT_TOTAL = 60
-
-
-def mainlist(item):
-    logger.info(" mainlist")
-    itemlist = [Item(channel=item.channel,
-                     title="Novità",
-                     action="get_info",
-                     url="%s/novita-su-netflix" % host,
-                     thumbnail=item.thumbnail),
-               Item(channel=item.channel,
-                     title="Prossimamente",
-                     action="ratings",
-                     url="%s/prossimamente-su-netflix" % host,
-                     thumbnail=item.thumbnail),
-                Item(channel=item.channel,
-                     title="Meglio del Mese",
-                     action="ratings",
-                     url="%s/classifiche/questo-mese" % host,
-                     thumbnail=item.thumbnail),
-                Item(channel=item.channel,
-                     title="Migliori Film",
-                     action="ratings",
-                     url="%s/classifiche/film" % host,
-                     thumbnail=item.thumbnail),
-                Item(channel=item.channel,
-                     title="Migliori Serie",
-                     action="ratings",
-                     url="%s/classifiche/migliori-serie-tv-su-netflix" % host,
-                     thumbnail=item.thumbnail),
-                Item(channel=item.channel,
-                     title="Migliori Documentari",
-                     action="ratings",
-                     url="%s/classifiche/documentari" % host,
-                     thumbnail=item.thumbnail)]
-
-    return itemlist
-
-
-def get_info(item):
-    logger.info("filmontv tvoggi")
-    itemlist = []
-
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data
-    patron = r'<div class=moviecard>[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*img src="([a-zA-Z:\/\.0-9\-_]*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*alt="([A-Za-z ,:0-9\.À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&,#]*<p>([A-Za-z ,0-9\.À-ÖØ-öø-ÿ\-\']*)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedthumbnail, scrapedtitle, scrapedinfo in matches:
-    # for scrapedthumbnail, scrapedtitle, scrapedtv in matches:
-        scrapedurl = ""
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
-        infoLabels = {}
-        infoLabels["plot"] = scrapedinfo
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="do_search",
-                 extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie',
-                 title="[B]" + scrapedtitle + "[/B]",
-                 fulltitle="[B]" + scrapedtitle + "[/B]",
-                 url=scrapedurl,
-                 thumbnail=scrapedthumbnail,
-                 contentTitle=scrapedtitle,
-                 contentType='movie',
-                 infoLabels=infoLabels,
-                 folder=True))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    return itemlist
-
-
-def ratings(item):
-    logger.info("filmontv tvoggi")
-    itemlist = []
-
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data
-    patron = r'<div class=thumb>[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*img src="([a-zA-Z:\/\.0-9\-_]*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*alt="([A-Za-z ,0-9:\.À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&,#]*<p>([A-Za-z ,0-9\.À-ÖØ-öø-ÿ\-\']*)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedthumbnail, scrapedtitle, scrapedinfo in matches:
-    # for scrapedthumbnail, scrapedtitle, scrapedtv in matches:
-        scrapedurl = ""
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
-        infoLabels = {}
-        infoLabels["plot"] = scrapedinfo
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="do_search",
-                 extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie',
-                 title="[B]" + scrapedtitle + "[/B]",
-                 fulltitle="[B]" + scrapedtitle + "[/B]",
-                 url=scrapedurl,
-                 thumbnail=scrapedthumbnail,
-                 contentTitle=scrapedtitle,
-                 contentType='movie',
-                 infoLabels=infoLabels,
-                 folder=True))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    return itemlist
-
-
-
-def do_search(item):
-    from specials import search
-    return search.do_search(item)

specials/search.py

@@ -33,8 +33,6 @@ def mainlist(item):
                          thumbnail=get_thumb("search.png")))
     itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001),
                          thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails"))  
-    itemlist.append(Item(channel="netlovers", action="mainlist", title="Net Lovers",
-                         thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails"))  
     itemlist.append(Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), type='movie',
                          thumbnail=get_thumb("genres.png")))
     itemlist.append (Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70307),