Merge pull request #2333 from pizzamx/matrix

[script.subtitles.zimukux] 0.1.8

Author: basrieter

script.subtitles.zimukux/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.subtitles.zimukux" name="ZiMuKuX" version="0.1.6" provider-name="pizzamx">
+<addon id="script.subtitles.zimukux" name="ZiMuKuX" version="0.1.8" provider-name="pizzamx">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.beautifulsoup4" version="4.6.2"/>
@@ -20,6 +20,12 @@
             <fanart>resources/fanart.png</fanart>
         </assets>
         <news>
+v0.1.8(2022/10/10)
+- zimuku.org captcha design changed again and this plugin works again
+
+v0.1.7(2022/6/18)
+- zimuku.org code changed again, made adaptions
+
 v0.1.6(2022/5/25)
 - Adaption made for Zimuku's latest "anti-spoofing" mechanism (contribute by @SaneBow)
 - Optimization to reduce the number of requests (contribute by @SaneBow)

script.subtitles.zimukux/resources/lib/zimuku_agent.py

@@ -31,7 +31,10 @@ class Zimuku_Agent:
     def __init__(self, base_url, dl_location, logger, unpacker, settings):
         self.ua = 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)'
         self.ZIMUKU_BASE = base_url
-        self.ZIMUKU_API = '%s/search?q=%%s&vertoken=%%s' % base_url
+        self.INIT_PAGE = base_url + '/?security_verify_data=313932302c31303830'
+        #self.ZIMUKU_API = '%s/search?q=%%s&vertoken=%%s' % base_url
+        self.TOKEN_PARAM = 'security_verify_data=313932302c31303830'
+        self.ZIMUKU_API = '%s/search?q=%%s' % base_url
         self.DOWNLOAD_LOCATION = dl_location
         self.FILE_MIN_SIZE = 1024
 
@@ -41,10 +44,22 @@ def __init__(self, base_url, dl_location, logger, unpacker, settings):
         self.session = requests.Session()
         self.vertoken = ''
 
+        # 一次性调用，获取那个vertoken。目测这东西会过期，不过不管那么多了，感觉过两天验证机制又要变
+        # self.init_site()
+
     def set_setting(self, settings):
         # for unittestting purpose
         self.plugin_settings = settings
 
+    def init_site(self):
+        self.session.cookies.set(
+            'srcurl', '68747470733a2f2f7a696d756b752e6f72672f')
+        self.get_page(self.ZIMUKU_BASE)
+
+        self.get_page(self.INIT_PAGE)
+        _, resp = self.get_page(self.ZIMUKU_BASE)
+        self.get_vertoken(resp)
+
     def get_page(self, url, **kwargs):
         """
         Get page with requests session.
@@ -68,20 +83,19 @@ def get_page(self, url, **kwargs):
 
             a = requests.adapters.HTTPAdapter(max_retries=3)
             s.mount('http://', a)
-            self.logger.log(sys._getframe().f_code.co_name, 'requests GET [%s]' % (url))
 
-            url += '&' if '?' in url else '?'
-            url += 'security_verify_data=313932302c31303830'
+            #url += '&' if '?' in url else '?'
+            #url += 'security_verify_data=313932302c31303830'
+
+            self.logger.log(sys._getframe().f_code.co_name,
+                            'requests GET [%s]' % (url), level=3)
 
-            # https://github.com/pizzamx/zimuku_for_kodi/pull/5/commits/5d4ed2fbd87dc08682884c874018ac0f9f35b25c
-            url1 = url + '&security_verify_data=313932302c31303830'
-            url2 = url + '?security_verify_data=313932302c31303830'
-            s.get(url, headers=request_headers)
-            s.get(url1, headers=request_headers)
             http_response = s.get(url, headers=request_headers)
+            """
             if http_response.status_code != 200:
                 s.get(url, headers=request_headers)
                 http_response = s.get(url, headers=request_headers)
+            """
 
             headers = http_response.headers
             http_body = http_response.content
@@ -181,22 +195,21 @@ def extract_sub_info(self, sub, lang_info_mode):
             "lang": langs
         }
 
-    def get_vertoken(self):
+    def get_vertoken(self, resp):
         # get vertoken from home page and cache it for the session
-        if self.vertoken:
-            return self.vertoken
-        else:
-            self.logger.log(sys._getframe().f_code.co_name, "Fetching new vertoken form home page")
-            try:
-                headers, data = self.get_page(self.ZIMUKU_BASE+'/')
-                hsoup = BeautifulSoup(data, 'html.parser')
-                vertoken = hsoup.find('input', attrs={'name': 'vertoken'}).attrs.get('value', '')
-                self.vertoken = vertoken
-                return vertoken
-            except Exception as e:
-                self.logger.log(sys._getframe().f_code.co_name, 'ERROR GETTING vertoken, E=(%s: %s)' %
-                                (Exception, e), level=3)
-                return ''
+        self.logger.log(sys._getframe().f_code.co_name,
+                        "Fetching new vertoken form home page")
+        try:
+            headers, data = self.get_page(self.ZIMUKU_BASE+'/')
+            hsoup = BeautifulSoup(resp, 'html.parser')
+            vertoken = hsoup.find(
+                'input', attrs={'name': 'vertoken'}).attrs.get('value', '')
+            self.vertoken = vertoken
+            return vertoken
+        except Exception as e:
+            self.logger.log(sys._getframe().f_code.co_name, 'ERROR GETTING vertoken, E=(%s: %s)' %
+                            (Exception, e), level=3)
+            return ''
 
     def search(self, title, item):
         """
@@ -218,13 +231,19 @@ def search(self, title, item):
         """
         subtitle_list = []
 
-        vertoken = self.get_vertoken()
+        #vertoken = self.get_vertoken()
 
-        url = self.ZIMUKU_API % (urllib.parse.quote(title), vertoken)
-        self.logger.log(sys._getframe().f_code.co_name,
-                        "Search API url: %s" % (url))
+        get_cookie_url = '%s&%s' % (self.ZIMUKU_API %
+                                    (urllib.parse.quote(title)), self.TOKEN_PARAM)
+        url = self.ZIMUKU_API % urllib.parse.quote(title)
         try:
-            # Search page.
+            # 10/10/22: 变成搜索要先拿 cookie
+            self.get_page(url)
+            self.get_page(get_cookie_url)
+
+            # 真正的搜索
+            self.logger.log(sys._getframe().f_code.co_name,
+                            "Search API url: %s" % (url))
             headers, data = self.get_page(url)
             soup = BeautifulSoup(data, 'html.parser')
         except Exception as e:
@@ -565,4 +584,4 @@ def download_links(self, links, referer):
             return '', ''
 
     def close(self):
-        self.session.close()
+        self.session.close()