From 0e42a8ecb62e683aaa88b4f2ad090666b81cf354 Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Wed, 30 Jun 2021 14:52:13 +0200
Subject: [PATCH] Fix cb01 puntate in cartella esterna e riconoscimento TMDB
 con anno

---
 channels/cineblog01.py | 8 ++++----
 core/tmdb.py           | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index 4d79f4d9..fb348a88 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -135,17 +135,17 @@ def episodios(item):
     @support.scrape
     def folder(item, data):
         """
-            Quando c'è un link ad una cartelle di vcrypt contenente più stagioni
+            Quando c'è un link ad una cartella contenente più stagioni
         """
         actLike = 'episodios'
         addVideolibrary = False
         downloadEnabled = False
 
-        folderUrl = scrapertools.find_single_match(data, r'TUTTA L[EA] \w+\s+(?:&#8211;|-)\s+<a href="?([^" ]+)').replace(
-            '.net/', '.pw/')  # vcrypt.pw non ha CF
+        folderUrl = scrapertools.find_single_match(data, r'TUTTA L[EA] \w+\s+(?:&#8211;|-)\s+<a href="?([^" ]+)')
         data = httptools.downloadpage(folderUrl, disable_directIP=True).data
-        patron = r'><a href="(?P<url>[^"]+)[^>]+>(?P<title>[^<]+)'
+        patron = r'<td>(?P<title>[^<]+)<td><a [^>]+href="(?P<url>[^"]+)[^>]+>'
         sceneTitle = True
+        # debug = True
 
         def itemHook(item):
             item.serieFolder = True
diff --git a/core/tmdb.py b/core/tmdb.py
index 452b4ccf..f709b555 100644
--- a/core/tmdb.py
+++ b/core/tmdb.py
@@ -128,7 +128,7 @@ def cache_response(fn):
                 result = fn(*args)
             else:
 
-                url = args[0].replace('&year=-', '')
+                url = args[0].replace('&year=-', '').replace('&primary_release_year=-', '').replace('&first_air_date_year=-', '')
                 # if PY3: url = str.encode(url)
 
                 row = db['tmdb_cache'].get(url)
@@ -1010,7 +1010,11 @@ class Tmdb(object):
             url = ('{}/search/{}?api_key={}&query={}&language={}&include_adult={}&page={}'.format(host, self.search_type, api, text_quote, self.search_language, True, page))
 
             if self.search_year:
-                url += '&year=%s' % self.search_year
+                if self.search_type == 'movie':
+                    url += '&primary_release_year=%s' % self.search_year
+                else:
+                    url += '&first_air_date_year=%s' % self.search_year
+
 
             searching = self.search_text.capitalize()
             logger.debug("[Tmdb.py] Searching %s on page %s:\n%s" % (searching, page, url))