Fix cb01 puntate in cartella esterna e riconoscimento TMDB con anno

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

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))