From 1ec6339cf29b602196989018701fe5e5e5ec89c2 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Fri, 12 Jun 2020 20:49:18 +0200
Subject: [PATCH] fix vari, disattivato pufimovies per chiusura

---
 channels.json                       | 5 +++--
 channels/cb01anime.py               | 2 +-
 channels/filmsenzalimiticc.py       | 4 ----
 channels/ilgeniodellostreaming.json | 2 +-
 channels/metalvideo.py              | 2 --
 channels/netfreex.py                | 6 +++---
 channels/pufimovies.json            | 2 +-
 channels/pufimovies.py              | 2 +-
 channels/raiplay.py                 | 8 ++++----
 channels/serietvonline.py           | 1 +
 channels/tantifilm.py               | 2 +-
 channels/tunein.py                  | 2 --
 12 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/channels.json b/channels.json
index b8121f4b..2a390357 100644
--- a/channels.json
+++ b/channels.json
@@ -24,8 +24,9 @@
     "filmstreaming01": "https://filmstreaming01.com", 
     "guardaserie_stream": "https://guardaserie.store", 
     "guardaserieclick": "https://www.guardaserie.style", 
-    "hd4me": "https://hd4me.net", 
-    "ilgeniodellostreaming": "https://ilgeniodellostreaming.tw", 
+    "hd4me": "https://hd4me.net",
+    "netfreex": "https://www.netfreex.stream/",
+    "ilgeniodellostreaming": "https://ilgeniodellostreaming.tw",
     "italiaserie": "https://italiaserie.org", 
     "mondoserietv": "https://mondoserietv.com", 
     "piratestreaming": "https://www.piratestreaming.biz", 
diff --git a/channels/cb01anime.py b/channels/cb01anime.py
index e4d1f6d4..b7559a8c 100644
--- a/channels/cb01anime.py
+++ b/channels/cb01anime.py
@@ -62,7 +62,7 @@ def peliculas(item):
     blacklist = Blacklist
     item.contentType = 'tvshow'
     if item.args == 'newest':
-        patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]'
+        patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img[^>]+src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]'
     else:
         patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> <h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br />)?\s*(?P<plot>[^<]+)'
         patronNext = r'<link rel="next" href="([^"]+)"'
diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py
index 25ad2875..1ea267e2 100644
--- a/channels/filmsenzalimiticc.py
+++ b/channels/filmsenzalimiticc.py
@@ -34,8 +34,6 @@ headers = [['Referer', host]]
 
 def mainlist(item):
     logger.info('[filmsenzalimiticc.py] mainlist')
-    
-    autoplay.init(item.channel, list_servers, list_quality) # Necessario per Autoplay
 
     # Menu Principale
     itemlist = [Item(channel=item.channel,
@@ -67,8 +65,6 @@ def mainlist(item):
                      thumbnail='')
                 ]
     
-    autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione)
-    
     return itemlist
     
 def search(item, texto):
diff --git a/channels/ilgeniodellostreaming.json b/channels/ilgeniodellostreaming.json
index 61bc398b..f79c90f4 100644
--- a/channels/ilgeniodellostreaming.json
+++ b/channels/ilgeniodellostreaming.json
@@ -6,5 +6,5 @@
     "thumbnail": "ilgeniodellostreaming.png",
     "banner": "ilgeniodellostreaming.png",
     "categories": ["movie", "tvshow", "anime", "vos"],
-    "settings": []
+    "settings": ["include_in_newest_anime"]
 }
diff --git a/channels/metalvideo.py b/channels/metalvideo.py
index ec7d0a33..72d80e25 100644
--- a/channels/metalvideo.py
+++ b/channels/metalvideo.py
@@ -38,8 +38,6 @@ def mainlist(item):
                 action='search',
                 thumbnail=support.thumb(thumb='search.png')))
 
-        support.autoplay.init(item.channel, list_servers, list_quality)
-        support.autoplay.show_option(item.channel, itemlist)
         support.channel_config(item, itemlist)
         return itemlist
     return locals()
diff --git a/channels/netfreex.py b/channels/netfreex.py
index 20c22627..77f6d9a5 100644
--- a/channels/netfreex.py
+++ b/channels/netfreex.py
@@ -7,10 +7,10 @@ from core import support
 from core.item import Item
 from platformcode import logger, config
 
-def findhost():
-    return 'https://' + support.match('https://netfreex.uno/', patron='value="site:([^"]+)"').match
+# def findhost():
+#     return 'https://' + support.match('https://netfreex.uno/', patron='value="site:([^"]+)"').match
 
-host = config.get_channel_url(findhost)
+host = config.get_channel_url()
 headers = ""
 
 IDIOMAS = {'Italiano': 'IT'}
diff --git a/channels/pufimovies.json b/channels/pufimovies.json
index 91680914..64b72651 100644
--- a/channels/pufimovies.json
+++ b/channels/pufimovies.json
@@ -1,7 +1,7 @@
 {
   "id": "pufimovies",
   "name": "PufiMovies",
-  "active": true,
+  "active": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "pufimovies.png",
   "banner": "pufimovies.png",
diff --git a/channels/pufimovies.py b/channels/pufimovies.py
index 6c001c64..02a9932d 100644
--- a/channels/pufimovies.py
+++ b/channels/pufimovies.py
@@ -77,7 +77,7 @@ def newest(categoria):
     except:
         import sys
         for line in sys.exc_info():
-            support.log({0}.format(line))
+            support.logger.error("%s" % line)
         return []
 
     return itemlist
diff --git a/channels/raiplay.py b/channels/raiplay.py
index 6f64a539..7c836905 100644
--- a/channels/raiplay.py
+++ b/channels/raiplay.py
@@ -83,14 +83,14 @@ def submenu(item):
 
 def replay_menu(item):
     support.log()
-    import datetime, xbmc
+    import datetime
 
     # create day and month list
     days = []
     months = []
-    days.append(xbmc.getLocalizedString(17))
-    for day in range(11, 17): days.append(xbmc.getLocalizedString(day))
-    for month in range(21, 33): months.append(xbmc.getLocalizedString(month))
+    days.append(support.config.get_localized_string(17))
+    for day in range(11, 17): days.append(support.config.get_localized_string(day))
+    for month in range(21, 33): months.append(support.config.get_localized_string(month))
 
     # make menu
     itemlist = []
diff --git a/channels/serietvonline.py b/channels/serietvonline.py
index adae9c91..7e16fdcd 100644
--- a/channels/serietvonline.py
+++ b/channels/serietvonline.py
@@ -64,6 +64,7 @@ def peliculas(item):
     blacklist = ['DMCA', 'Contatti', 'Attenzione NON FARTI OSCURARE', 'Lista Cartoni Animati e Anime']
     patronBlock = r'<h1>.+?</h1>(?P<block>.*?)<div class="footer_c">'
     patronNext = r'<div class="siguiente"><a href="([^"]+)" >'
+    # debug = True
 
     if item.args == 'search':
         patronBlock = r'>Lista Serie Tv</a></li></ul></div><div id="box_movies">(?P<block>.*?)<div id="paginador">'
diff --git a/channels/tantifilm.py b/channels/tantifilm.py
index d529fecf..520ab21b 100644
--- a/channels/tantifilm.py
+++ b/channels/tantifilm.py
@@ -58,7 +58,7 @@ def peliculas(item):
         # support.regexDbg(item, patron, headers)
     else:
         patronNext = r'<a class="nextpostslink" rel="next" href="([^"]+)">'
-        patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?:[ ]<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>[\-\d+]+)\)).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>'
+        patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?:[ ]<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>\d+)[\-\d+]+)\).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>'
         patronBlock = r'<div id="main_col">(?P<block>.*?)<!\-\- main_col \-\->'
 
     # if item.args != 'all' and item.args != 'search':
diff --git a/channels/tunein.py b/channels/tunein.py
index 9e1a0d8b..5dd3168d 100644
--- a/channels/tunein.py
+++ b/channels/tunein.py
@@ -33,8 +33,6 @@ def mainlist(item):
                 url = item.url,
                 action='search',
                 thumbnail=support.thumb(thumb='search.png')))
-        support.autoplay.init(item.channel, list_servers, list_quality)
-        support.autoplay.show_option(item.channel, itemlist)
         support.channel_config(item, itemlist)
         return itemlist
     return locals()