更新bd影视

base/custom.conf

@@ -27,7 +27,7 @@
             "searchable":1,
             "quickSearch":0,
             "filterable":1,
-            "ext":"base_spider"
+            "ext":"{{host}}/txt/hipy/base_spider.json"
         },
         {
             "key": "hipy_t3_base_spider",
@@ -43,11 +43,11 @@
             "key":"hipy_t4_cntv央视",
             "name":"cntv央视(hipy_t4)",
             "type":4,
-            "api":"http://192.168.31.49:5707/api/v1/vod/cntv央视?api_ext={{host}}/txt/hipy/cntv央视.json",
+            "api":"http://192.168.31.49:5707/api/v1/vod/cntv央视",
             "searchable":1,
             "quickSearch":0,
             "filterable":1,
-            "ext":"cntv央视"
+            "ext":"{{host}}/txt/hipy/cntv央视.json"
         },
         {
             "key": "hipy_t3_cntv央视",
@@ -63,11 +63,11 @@
             "key":"hipy_t4_两个BT",
             "name":"两个BT(hipy_t4)",
             "type":4,
-            "api":"http://192.168.31.49:5707/api/v1/vod/两个BT?api_ext={{host}}/txt/hipy/两个BT.json",
+            "api":"http://192.168.31.49:5707/api/v1/vod/两个BT",
             "searchable":1,
             "quickSearch":0,
             "filterable":1,
-            "ext":"两个BT"
+            "ext":"{{host}}/txt/hipy/两个BT.json"
         },
         {
             "key": "hipy_t3_两个BT",
@@ -103,11 +103,11 @@
             "key":"hipy_t4_哔滴影视",
             "name":"哔滴影视(hipy_t4)",
             "type":4,
-            "api":"http://192.168.31.49:5707/api/v1/vod/哔滴影视?api_ext={{host}}/txt/hipy/bdys.jar",
+            "api":"http://192.168.31.49:5707/api/v1/vod/哔滴影视",
             "searchable":1,
             "quickSearch":0,
             "filterable":1,
-            "ext":"{{host}}/txt/hipy/bdys.jar"
+            "ext":"{{host}}/txt/hipy/bidi.jar"
         },
         {
             "key": "hipy_t3_哔滴影视",
@@ -117,7 +117,7 @@
             "searchable": 1,
             "quickSearch": 0,
             "filterable": 1,
-            "ext": "{{host}}/txt/hipy/bdys.jar"
+            "ext": "{{host}}/txt/hipy/bidi.jar"
         },
  {"key":"Test_jsapi","name":"Test_jsapi(drpy)","type":3,"api":"{{host}}/libs/drpy2.min.js","searchable":2,"quickSearch":0,"filterable":0,"ext":"{{host}}/js/jsapi.js","jar":"{{host}}/libs/jar/custom_jsapi.jar"},
 

txt/hipy/base_java_loader.py

@@ -12,6 +12,9 @@ sys.path.append('..')
 try:
     # from base.spider import Spider as BaseSpider
     from base.spider import BaseSpider
+    from com.github.tvbox.osc.util import PyUtil
+    from java import jbyte, jarray
+    # https://chaquo.com/chaquopy/doc/current/python.html#java.jbyte
 except ImportError:
     from t4.base.spider import BaseSpider
 
@@ -46,8 +49,23 @@ class Spider(BaseSpider):  # 元类 默认的元类 type
             self._prepare_env(jpype)
             self.jClass = jpype.JClass
         elif self.ENV.lower() == 't3':
+            PyUtil.load(jar_path)
             self.jClass = None
 
+    def call_java(self, class_name, method_name, *args):
+        if self.ENV.lower() == 't4':
+            class1 = self.jClass(class_name)
+            method = getattr(class1, method_name)
+            # method = eval(f'class1.{method_name}', {'class1': class1})
+            # print(method)
+            return method(*args)
+        elif self.ENV.lower() == 't3':
+            return PyUtil.call(class_name, method_name, *args)
+
+    @staticmethod
+    def jarBytes(some_bytes: bytes):
+        return jarray(jbyte)(some_bytes)
+
     def init(self, extend=""):
         pass
 

txt/hipy/base_spider.py

@@ -92,7 +92,7 @@ class Spider(BaseSpider):  # 元类 默认的元类 type
                         print(f'更新扩展筛选条件发生错误:{e}')
 
         ext = self.extend
-        print(f"============{extend}============")
+        print(f"============ext:{ext},extend:{extend}============")
         if isinstance(ext, str) and ext:
             if ext.startswith('./'):
                 ext_file = os.path.join(os.path.dirname(__file__), ext)
@@ -406,4 +406,8 @@ if __name__ == '__main__':
     # spider.init_api_ext_file()  # 生成筛选对应的json文件
     spider.log({'key': 'value'})
     spider.log('====文本内容====')
+    with open('test_1.txt', encoding='utf-8') as f:
+        code = f.read()
+        a = spider.superStr2dict(code)
+        print(type(a), a)
     # spider.searchContent('斗罗大陆')

txt/hipy/test_1.txt

@@ -0,0 +1,22 @@
+[{'key':'你好',
+'value':'这是一串代码',
+'tip':'可能会有注释','a':true,"b":None,"c":null,'d':True}]
+// 单行注释
+# 单行注释
+
+/*
+
+
+多行注释
+*/
+
+"""
+
+多行注释
+"""
+
+
+'''
+多行注释
+
+'''

txt/hipy/两个BT.py

@@ -506,6 +506,8 @@ if __name__ == '__main__':
     # print(spider.categoryContent('movie_bt', 1, True, {}))
     # print(spider.searchContent('斗罗大陆'))
     # print(spider.detailContent(['https://www.bttwo.net/movie/20107.html']))
+    # print(spider.playerContent('在线播放', spider.decodeStr('https%3A%2F%2Fwww.bttwo.net%2Fv_play%2FbXZfMzY4Nzgtbm1fMQ%3D%3D.html','utf-8'), None))
+    # print(spider.playerContent('在线播放', spider.decodeStr('https://www.bttwo.net/v_play/bXZfMTMyNjkwLW5tXzE=.html','utf-8'), None))
     # print(spider.playerContent('在线播放', 'https://www.bttwo.net/v_play/bXZfMTMyNjA2LW5tXzE=.html', None))
 
     # ciphertext = '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'

txt/hipy/哔滴影视.py

@@ -27,11 +27,11 @@ api里会自动含有ext参数是base64编码后的选中的筛选条件
     "key":"hipy_t4_哔滴影视",
     "name":"哔滴影视(hipy_t4)",
     "type":4,
-    "api":"http://192.168.31.49:5707/api/v1/vod/哔滴影视",
+    "api":"http://192.168.31.49:5707/api/v1/vod/哔滴影视?api_ext={{host}}/txt/hipy/bidi.jar",
     "searchable":1,
     "quickSearch":0,
     "filterable":1,
-    "ext":""
+    "ext":"{{host}}/txt/hipy/bidi.jar"
 },
 {
     "key": "hipy_t3_哔滴影视",
@@ -41,7 +41,7 @@ api里会自动含有ext参数是base64编码后的选中的筛选条件
     "searchable": 1,
     "quickSearch": 0,
     "filterable": 1,
-    "ext": ""
+    "ext": "{{host}}/txt/hipy/bidi.jar"
 },
 """
 
@@ -103,7 +103,8 @@ class Spider(BaseSpider):  # 元类 默认的元类 type
             if ext.endswith('.jar'):
                 jar_path = os.path.join(os.path.dirname(__file__), './jars')
                 os.makedirs(jar_path, exist_ok=True)
-                jar_file = os.path.join(os.path.dirname(__file__), './jars/bdys.jar')
+                # jar_file = os.path.join(os.path.dirname(__file__), './jars/bdys.jar')
+                jar_file = os.path.join(os.path.dirname(__file__), './jars/bidi.jar')
                 jar_file = Path(jar_file).as_posix()
                 need_down = False
                 msg = ''
@@ -119,6 +120,9 @@ class Spider(BaseSpider):  # 元类 默认的元类 type
 
                 if need_down:
                     self.log(msg)
+                    if self.ENV.lower() == 't3':
+                        # ext = ext.replace('.jar', '.dex')
+                        pass
                     content = self.get_init_api(ext)
                     with open(jar_file, mode='wb+') as f:
                         f.write(content)
@@ -131,11 +135,18 @@ class Spider(BaseSpider):  # 元类 默认的元类 type
                     break
 
         if self.javar:
-            jar_file = os.path.join(os.path.dirname(__file__), './jars/bdys.jar')
+            # jar_file = os.path.join(os.path.dirname(__file__), './jars/bdys.jar')
+            jar_file = os.path.join(os.path.dirname(__file__), './jars/bidi.jar')
             jar_file = Path(jar_file).as_posix()
             self.javar.init_jar(jar_file)
-            self.class1 = self.javar.jClass('com.C4355b')
+            # self.class1 = self.javar.jClass('com.C4355b')
-            self.token = str(self.class1.getToken())
+            self.token = str(self.javar.call_java('com.EncryptionUtils', 'getToken'))
+            # self.class1 = self.javar.jClass('com.EncryptionUtils')
+            # # class1 = self.class1() # 类实例化
+            # class1 = self.class1
+            # self.token = str(class1.getToken())
+            # print(self.token)
+            # # self.token = str(self.class1.getToken())
             self.headers.update({'token': self.token})
 
         gParam['inited'] = True
@@ -391,14 +402,28 @@ class Spider(BaseSpider):  # 元类 默认的元类 type
         content = pdata.strip()
 
         media_type = 'text/plain' if 'txt' in name else 'video/MP2T'
-
+        action = {
-        return [200, media_type, content]
+            'url': url,
+            'header': headers,
+            'param': '',
+            'type': media_type,
+            'after': ''
+        }
+        if '3' in self.ENV:
+            return [200, media_type, action, content]
+        else:
+            return [200, media_type, content]
 
     # -----------------------------------------------自定义函数-----------------------------------------------
     def decode(self, text):
         bt = base64.b64decode(text)
-        res = self.class1.dec(bt)
+        # self.log(self.headers)
-        return self.str2json(str(res))
+        if self.ENV.lower() == 't3':
+            bt = self.javar.jarBytes(bt)
+        res = self.javar.call_java('com.EncryptionUtils', 'dec', bt)
+        # res = self.class1.dec(bt)
+        # print(str(res))
+        return self.str2json(str(res)) if res else None
 
     def process_data(self, req_bytes):
         """
@@ -422,10 +447,10 @@ if __name__ == '__main__':
     # spider.log('====文本内容====')
     # print(spider.homeContent(True))
     # print(spider.homeVideoContent())
-    # print(spider.categoryContent('0', 1, False, None))
+    print(spider.categoryContent('0', 1, False, None))
     # print(spider.detailContent([24420]))
     # spider.searchContent('斗罗大陆')
     # print(spider.playerContent('至尊线路', 'vip://https://www.bdys03.com/api/v1/playurl/174296?type=1', None))
-    print(spider.playerContent('需要解析',
+    # print(spider.playerContent('需要解析',
-                               'https://www.bde4.cc/10E79044B82A84F70BE1308FFA5232E4DC3D0CA9EC2BF6B1D4EF56B2CE5B67CF238965CCAE17F859665B7E166720986D.m3u8',
+    #                            'https://www.bde4.cc/10E79044B82A84F70BE1308FFA5232E4DC3D0CA9EC2BF6B1D4EF56B2CE5B67CF238965CCAE17F859665B7E166720986D.m3u8',
-                               None))
+    #                            None))