From 5833b38f3b121cd23b0838950d25b8c8e3c9d195 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 24 Apr 2021 18:03:56 +0000
Subject: [PATCH 1/7] {Aggiornamento domini}

---
 channels.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels.json b/channels.json
index 2c14e692..bcf96cc0 100644
--- a/channels.json
+++ b/channels.json
@@ -12,7 +12,7 @@
         "casacinema": "https://www.casacinema.page",
         "cb01anime": "https://www.cineblog01.red",
         "cineblog01": "https://cb01.uno",
-        "cinemalibero": "https://cinemalibero.work",
+        "cinemalibero": "https://cinemalibero.shop",
         "cinetecadibologna": "http://cinestore.cinetecadibologna.it",
         "discoveryplus": "https://www.discoveryplus.com",
         "dreamsub": "https://dreamsub.stream",
@@ -21,7 +21,7 @@
         "filmigratis": "https://filmigratis.org",
         "guardaseriecam": "https://guardaserie.cam",
         "guardaserieclick": "https://www.guardaserie.review",
-        "guardaserieicu": "https://guardaserie.download",
+        "guardaserieicu": "https://guardaserie.live",
         "hd4me": "https://hd4me.net",
         "ilcorsaronero": "https://ilcorsaronero.link",
         "ilgeniodellostreaming": "https://ilgeniodellostreaming.vet",

From a1ad38d2eaf3a68e7c5ad94138d20411c9e4fa79 Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 25 Apr 2021 10:35:47 +0200
Subject: [PATCH 2/7] Revert "ricerca globale: aggiornamento gui in try-except"

This reverts commit 4e752324
---
 specials/globalsearch.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 8e6530d3..2eef627f 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -348,12 +348,11 @@ class SearchWindow(xbmcgui.WindowXML):
             if self.item.mode != 'all' and not valid and self.item.infoLabels.get('originaltitle'):
                 logger.debug('retring with original title on channel ' + channel)
                 dummy, valid, dummy = search(self.item.infoLabels.get('originaltitle'))
-
-            self.count += 1
-            return self.update(channel, valid, other if other else results)
         except:
-            import traceback
-            logger.error(traceback.format_exc())
+            pass
+
+        self.count += 1
+        return self.update(channel, valid, other if other else results)
 
     def makeItem(self, url):
         item = Item().fromurl(url)

From ff5f40b9660d1c86f7d9a7ae62d008c53f8efd3a Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 25 Apr 2021 11:47:16 +0200
Subject: [PATCH 3/7] Fix proxytranslate, migliorie varie

---
 channels/cb01anime.py    |  4 ++--
 core/filetools.py        | 12 ++++++------
 lib/proxytranslate.py    | 10 +++++-----
 specials/globalsearch.py |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/channels/cb01anime.py b/channels/cb01anime.py
index 9258bb02..7595a15a 100644
--- a/channels/cb01anime.py
+++ b/channels/cb01anime.py
@@ -36,7 +36,7 @@ def menu(item):
 
 def search(item, texto):
     support.info(texto)
-    item.url = host + "/?s=" + texto
+    item.url = host + "/search/" + texto
     try:
         return peliculas(item)
     except:
@@ -72,7 +72,7 @@ def peliculas(item):
     if item.args == 'newest':
         patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img[^>]+src="(?P<thumb>[^"]+)"[^>]*>(?:[^>]+>){4}(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]'
     else:
-        patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>(?:[^>]+>){7}\s*<h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br />)?\s*(?P<plot>[^<]+)'
+        patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>(?:[^>]+>){7}\s*<h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br(?: /)?>)?\s*(?P<plot>[^<]+)'
         patronNext = r'<link rel="next" href="([^"]+)"'
     action = 'check'
     return locals()
diff --git a/core/filetools.py b/core/filetools.py
index d79ed7d4..130ccab9 100644
--- a/core/filetools.py
+++ b/core/filetools.py
@@ -86,15 +86,15 @@ def encode(path, _samba=False):
     @rtype: str
     @return path encoded in system character set or utf-8 if samba
     """
-    # from core.support import dbg;dbg()
     if not isinstance(path, unicode):
         path = unicode(path, "utf-8", "ignore")
 
-    if scrapertools.find_single_match(path, r'(^\w+:\/\/)') or _samba and not PY3:
-        path = path.encode("utf-8", "ignore")
-    else:
-        if fs_encoding and not PY3:
-            path = path.encode(fs_encoding, "ignore")
+    if not PY3:
+        if scrapertools.find_single_match(path, r'(^\w+:\/\/)') or _samba:
+            path = path.encode("utf-8", "ignore")
+        else:
+            if fs_encoding:
+                path = path.encode(fs_encoding, "ignore")
 
     # if PY3 and isinstance(path, bytes):
     #     if fs_encoding:
diff --git a/lib/proxytranslate.py b/lib/proxytranslate.py
index 492dda64..c0871d5f 100644
--- a/lib/proxytranslate.py
+++ b/lib/proxytranslate.py
@@ -88,20 +88,20 @@ def process_request_proxy(url):
             time.sleep(0.5)
             result = requests.get(
                 url_request_proxy,
-                timeout=20,
-                headers={'User-Agent': 'android'}
+                timeout=20
+                # headers={'User-Agent': 'android'}
             )
             data = result.content.decode('utf-8', 'ignore')
             if not PY3:
                 data = data.encode('utf-8')
             if logger:
-                logger.debug()
+                logger.debug(url_request_proxy)
 
         data = re.sub('\s(\w+)=(?!")([^<>\s]+)', r' \1="\2"', data)
         data = re.sub('https://translate\.googleusercontent\.com/.*?u=(.*?)&amp;usg=[A-Za-z0-9_-]+', '\\1', data)
-        data = re.sub('https?://[a-zA-Z0-9]+--' + domain.replace('.', '-') + '\.translate\.goog(/[a-zA-Z0-9#/-]+)', 'https://' + domain + '\\1', data)
+        data = re.sub('https?://[a-zA-Z0-9-]+' + domain.replace('.', '-') + '\.translate\.goog(/[a-zA-Z0-9#/-]+)', 'https://' + domain + '\\1', data)
         data = re.sub('\s+<', '<', data)
-        data = data.replace('&amp;', '&').replace('https://translate.google.com/website?sl=' + SL + '&tl=' + TL + '&u=', '')
+        data = data.replace('&amp;', '&').replace('https://translate.google.com/website?sl=' + SL + '&tl=' + TL + '&ajax=1&u=', '')
 
         return {'url': url.strip(), 'result': result, 'data': data}
     except Exception as e:
diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 2eef627f..45ce3842 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -349,7 +349,8 @@ class SearchWindow(xbmcgui.WindowXML):
                 logger.debug('retring with original title on channel ' + channel)
                 dummy, valid, dummy = search(self.item.infoLabels.get('originaltitle'))
         except:
-            pass
+            import traceback
+            logger.error(traceback.format_exc())
 
         self.count += 1
         return self.update(channel, valid, other if other else results)

From 2d3a1722a7174674aed9d060a69a9ec5c7b4b20a Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 25 Apr 2021 13:13:29 +0200
Subject: [PATCH 4/7] Bypass CF su ricerca mondoserietv e toonitalia

---
 channels/mondoserietv.py | 2 +-
 channels/toonitalia.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py
index d93e36d0..ab812c96 100644
--- a/channels/mondoserietv.py
+++ b/channels/mondoserietv.py
@@ -36,7 +36,7 @@ def search(item, text):
     else:
         action = 'episodios'
     item.args = 'search'
-    item.url = host + "/?s=" + text
+    item.url = host + "?a=b&s=" + text
     try:
         return peliculas(item)
     # Continua la ricerca in caso di errore .
diff --git a/channels/toonitalia.py b/channels/toonitalia.py
index dc765897..f7678261 100644
--- a/channels/toonitalia.py
+++ b/channels/toonitalia.py
@@ -27,7 +27,7 @@ def search(item, text):
     support.info(text)
     # item.args='search'
     item.text = text
-    item.url = item.url + '/?%73=' + text.replace(' ', '+')
+    item.url = item.url + '/?a=b&s=' + text.replace(' ', '+')
 
     try:
         return peliculas(item)
@@ -69,7 +69,7 @@ def peliculas(item):
         #patronBlock = '"lcp_catlist"[^>]+>(?P<block>.*)</ul>'
         patronBlock = '<main[^>]+>(?P<block>.*?)</ma'
         #patron = r'href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"'
-        patron = r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<[^>]+>[^>]+><div'
+        patron = r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<[^>]+>[^>]+>\s*<div'
     elif item.args == 'last':
         patronBlock = 'Aggiornamenti</h2>(?P<block>.*)</ul>'
         patron = r'<a href="(?P<url>[^"]+)">\s*<img[^>]+src[set]{0,3}="(?P<thumbnail>[^ ]+)[^>]+>\s*<span[^>]+>(?P<title>[^<]+)'

From b7915326915bd580ad8b71c8103b2ef53edaf267 Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:47:58 +0200
Subject: [PATCH 5/7] Test ricerca globale

---
 specials/globalsearch.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 45ce3842..39b83632 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -89,6 +89,7 @@ class SearchWindow(xbmcgui.WindowXML):
         self.selected = False
         self.pos = 0
         self.items = []
+        self.search_threads = []
 
         if not searchActions:
             self.thActions = Thread(target=self.getActions)
@@ -306,8 +307,13 @@ class SearchWindow(xbmcgui.WindowXML):
         with futures.ThreadPoolExecutor(max_workers=set_workers()) as executor:
             for searchAction in self.searchActions:
                 if self.exit: return
-                executor.submit(self.get_channel_results, searchAction)
-                logger.debug('end search for:', searchAction.channel)
+                self.search_threads.append(executor.submit(self.get_channel_results, searchAction))
+            for ch in futures.as_completed(self.search_threads):
+                if self.exit: return
+                if ch.result():
+                    self.count += 1
+                    channel, valid, other = ch.result()
+                    self.update(channel, valid, other)
 
     def get_channel_results(self, searchAction):
         def search(text):
@@ -352,8 +358,7 @@ class SearchWindow(xbmcgui.WindowXML):
             import traceback
             logger.error(traceback.format_exc())
 
-        self.count += 1
-        return self.update(channel, valid, other if other else results)
+        return channel, valid, other if other else results
 
     def makeItem(self, url):
         item = Item().fromurl(url)
@@ -738,6 +743,8 @@ class SearchWindow(xbmcgui.WindowXML):
         self.exit = True
         if self.thread:
             busy(True)
+            for th in self.search_threads:
+                th.cancel()
             self.thread.join()
             busy(False)
         self.close()

From 9f2ede3c64aadfd5c1fef02c304e0b58001f661e Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 25 Apr 2021 17:39:46 +0200
Subject: [PATCH 6/7] Test ricerca globale

---
 specials/globalsearch.py | 69 +++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 39b83632..b08aa6e9 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -72,7 +72,7 @@ EPISODESLIST = 200
 SERVERLIST = 300
 
 class SearchWindow(xbmcgui.WindowXML):
-    def start(self, item, moduleDict={}, searchActions=[]):
+    def start(self, item, moduleDict={}, searchActions=[], thActions=None):
         logger.debug()
         self.exit = False
         self.item = item
@@ -95,7 +95,7 @@ class SearchWindow(xbmcgui.WindowXML):
             self.thActions = Thread(target=self.getActions)
             self.thActions.start()
         else:
-            self.thActions = None
+            self.thActions = thActions
 
         self.lastSearch()
         if not self.item.text: return
@@ -293,7 +293,23 @@ class SearchWindow(xbmcgui.WindowXML):
 
     def timer(self):
         while self.searchActions:
-            self.COUNT.setText('%s/%s [%s"]' % (self.count, len(self.searchActions), int(time.time() - self.time) ))
+            percent = (float(self.count) / len(self.searchActions)) * 100
+            self.LOADING.setVisible(False)
+            self.PROGRESS.setPercent(percent)
+            self.COUNT.setText('%s/%s [%s"]' % (self.count, len(self.searchActions), int(time.time() - self.time)))
+            if percent == 100:
+                self.channels = []
+                self.moduleDict = {}
+                self.searchActions = []
+
+                # if no results
+                total = 0
+                for num in self.results.values():
+                    total += num
+                if not total:
+                    self.PROGRESS.setVisible(False)
+                    self.NORESULTS.setVisible(True)
+                    self.setFocusId(CLOSE)
             time.sleep(1)
 
     def search(self):
@@ -304,16 +320,21 @@ class SearchWindow(xbmcgui.WindowXML):
             self.thActions.join()
         Thread(target=self.timer).start()
 
-        with futures.ThreadPoolExecutor(max_workers=set_workers()) as executor:
-            for searchAction in self.searchActions:
-                if self.exit: return
-                self.search_threads.append(executor.submit(self.get_channel_results, searchAction))
-            for ch in futures.as_completed(self.search_threads):
-                if self.exit: return
-                if ch.result():
-                    self.count += 1
-                    channel, valid, other = ch.result()
-                    self.update(channel, valid, other)
+        try:
+            with futures.ThreadPoolExecutor(max_workers=set_workers()) as executor:
+                for searchAction in self.searchActions:
+                    if self.exit: return
+                    self.search_threads.append(executor.submit(self.get_channel_results, searchAction))
+                for ch in futures.as_completed(self.search_threads):
+                    if self.exit: return
+                    if ch.result():
+                        self.count += 1
+                        channel, valid, other = ch.result()
+                        self.update(channel, valid, other)
+        except:
+            import traceback
+            logger.error(traceback.format_exc())
+            self.count = len(self.searchActions)
 
     def get_channel_results(self, searchAction):
         def search(text):
@@ -446,24 +467,6 @@ class SearchWindow(xbmcgui.WindowXML):
                 self.RESULTS.reset()
                 self.RESULTS.addItems(items)
 
-        percent = (float(self.count) / len(self.searchActions)) * 100
-        self.LOADING.setVisible(False)
-        self.PROGRESS.setPercent(percent)
-        self.COUNT.setText('%s/%s [%s"]' % (self.count, len(self.searchActions), int(time.time() - self.time) ))
-        if percent == 100:
-            self.channels = []
-            self.moduleDict = {}
-            self.searchActions = []
-
-            # if no results
-            total = 0
-            for num in self.results.values():
-                total += num
-            if not total:
-                self.PROGRESS.setVisible(False)
-                self.NORESULTS.setVisible(True)
-                self.setFocusId(CLOSE)
-
     def onInit(self):
         self.time = time.time()
 
@@ -601,7 +604,7 @@ class SearchWindow(xbmcgui.WindowXML):
                 self.actors()
             elif search == 'persons':
                 item = self.item.clone(mode='person_', discovery=self.persons[pos])
-                Search(item, self.moduleDict, self.searchActions)
+                Search(item, self.moduleDict, self.searchActions, self.thActions)
                 if close_action:
                     self.close()
             else:
@@ -609,7 +612,7 @@ class SearchWindow(xbmcgui.WindowXML):
                 if self.item.mode == 'movie': item.contentTitle = self.RESULTS.getSelectedItem().getLabel()
                 else: item.contentSerieName = self.RESULTS.getSelectedItem().getLabel()
 
-                Search(item, self.moduleDict, self.searchActions)
+                Search(item, self.moduleDict, self.searchActions, self.thActions)
                 if close_action:
                     self.close()
 

From 12673d5d19b982c23a3cea538fdbf7cfdbe0fce2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 25 Apr 2021 18:04:39 +0000
Subject: [PATCH 7/7] {Aggiornamento domini}

---
 channels.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels.json b/channels.json
index bcf96cc0..2f3e2639 100644
--- a/channels.json
+++ b/channels.json
@@ -21,14 +21,14 @@
         "filmigratis": "https://filmigratis.org",
         "guardaseriecam": "https://guardaserie.cam",
         "guardaserieclick": "https://www.guardaserie.review",
-        "guardaserieicu": "https://guardaserie.live",
+        "guardaserieicu": "https://guardaserie.win",
         "hd4me": "https://hd4me.net",
         "ilcorsaronero": "https://ilcorsaronero.link",
         "ilgeniodellostreaming": "https://ilgeniodellostreaming.vet",
         "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.bond",
         "italiaserie": "https://italiaserie.pw",
         "mediasetplay": "https://www.mediasetplay.mediaset.it",
-        "mondoserietv": "https://mondoserietv.fun",
+        "mondoserietv": "https://mondoserietv.club",
         "paramount": "https://www.paramountnetwork.it",
         "piratestreaming": "https://www.piratestreaming.review",
         "polpotv": "https://roma.polpo.tv",