修改douyin单条下载问题、v2ray问题

Author: xhunmon

001-Downloader/config.ini

@@ -1,10 +1,10 @@
 # 常用配置模块
 [common]
 #软件使用截止日期
-expired_time=2021/12/15 23:59:59
+expired_time=2022/12/15 23:59:59
 
 #app的版本名称
-version_name=1.0.1
+version_name=1.0.2
 
 #app的版本号
-version_code=100
+version_code=102

001-Downloader/douyin/dy_download.py

@@ -64,13 +64,13 @@ def start(self, url, path):
 
     # 单条数据页面
     def parse_single(self):
-        session = requests_html.HTMLSession()
-        html = session.get(self.single)
-
-        result = re.findall(r'id="RENDER_DATA".+?json">(.+?)</script>', html.text)[0]
-        urls = parse.unquote_plus(result)
-        jsonObj = json.loads(urls)
-
+        url = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', self.single)[
+            0]
+        r = requests.get(url=url)
+        key = re.findall('video/(\d+)?', str(r.url))[0]
+        jx_url = f'https://www.iesdouyin.com/web/api/v2/aweme/iteminfo/?item_ids={key}'  # 官方接口
+        js = json.loads(requests.get(url=jx_url, headers=self.headers).text)
+        detail = js['item_list'][0]
         # 作者信息
         author_list = []
         # 无水印视频链接
@@ -80,26 +80,10 @@ def parse_single(self):
         # 作者id
         nickname = []
         max_cursor = 0
-        k: str = ''
-        for key in jsonObj:
-            if key.startswith('C_'):
-                awemeObj = jsonObj[key]
-                if 'aweme' in awemeObj:
-                    try:
-                        detail = awemeObj['detail']
-                        break
-                    except:
-                        pass
-        # if ('C_12' in jsonObj):
-        #     detail = jsonObj['C_12']['aweme']['detail']
-        # elif ('C_14' in jsonObj):
-        #     detail = jsonObj['C_14']['aweme']['detail']
-        # else:
-        #     detail = jsonObj['C_0']['aweme']['detail']
         author_list.append(str(detail['desc']))
-        video_list.append(str("https:" + detail['video']['playAddr'][0]['src']))
-        aweme_id.append(str(detail['awemeId']))
-        nickname.append(str(detail['authorInfo']['nickname']))
+        video_list.append(str(detail['video']['play_addr']['url_list'][0]).replace('playwm', 'play'))
+        aweme_id.append(str(detail['aweme_id']))
+        nickname.append(str(detail['author']['nickname']))
         Downloader.print_ui('开始下载单个视频' + video_list[0])
         self.videos_download(1, author_list, video_list, aweme_id, nickname, max_cursor)
 
@@ -112,10 +96,11 @@ def Find(self, string):
 
     # 判断个人主页api链接
     def judge_link(self):
-        user_url = self.user
+        user_url: str = self.user
 
         Downloader.print_ui('----为您下载多个视频----\r')
-        key = re.findall('/user/(.*?)\?', str(user_url))[0]
+
+        key = re.findall('/user/(.*?)$', str(user_url))[0]
         if not key:
             key = user_url[28:83]
         Downloader.print_ui('----' + '用户的sec_id=' + key + '----\r')
@@ -273,7 +258,7 @@ def videos_download(self, count, author_list, video_list, aweme_id, nickname, ma
                 break
 
             try:
-                video = requests.get(video_list[i])  # 保存视频
+                video = requests.get(video_list[i], headers=self.headers)  # 保存视频
                 start = time.time()  # 下载开始时间
                 size = 0  # 初始化已下载大小
                 chunk_size = 100  # 每次下载的数据大小

002-V2rayPool/core/conf.py

@@ -12,7 +12,7 @@ class Config:
     def __init__(self):
         self.config = configparser.ConfigParser()
         parent_dir = os.path.dirname(os.path.abspath(__file__))
-        self.config_path = os.path.join(parent_dir, 'config.json')
+        self.config_path = os.path.join(Config.__v2ray_core_path, 'config.json')
         self.json_path = os.path.join(parent_dir, 'json_template')
         # self.config.read(self.config_path)
 

002-V2rayPool/core/config.json

@@ -33,7 +33,7 @@ def start_random_v2ray_by_local(self, isSysOn=False):
         """从本地随机启动一个可用的proxy"""
         urls = self.load_enable_urls_by_local()
         for url in urls:
-            if client.Creator().v2ray_start_with_log(random.choice(urls),isSysOn) is False:
+            if client.Creator().v2ray_start_with_log(random.choice(urls), isSysOn) is False:
                 time.sleep(1)
                 continue
             time.sleep(2)
@@ -72,6 +72,8 @@ def load_urls_and_save_auto(self):
     def load_urls_by_not_proxy(self, save_local=True):
         all_urls = []
         # 1. 先把不需要代理的先请求下来
+        self.__add_urls_de_dup(all_urls, PNTWGithubV2ray().get_urls())
+        print("获取https://hub.xn--gzu630h.xn--kpry57d/freefq/free后数目：%d" % len(all_urls))
         self.__add_urls_de_dup(all_urls, PNSsfree().get_urls())
         print("获取https://view.ssfree.ru/后数目：%d" % len(all_urls))
         self.__add_urls_de_dup(all_urls, PNFreevpnX().get_urls())
@@ -118,6 +120,8 @@ def load_urls_by_net(self, proxy_url=None, save_local=True, need_proxy=True):
         """
         all_urls = []
         # 1. 先把不需要代理的先请求下来
+        self.__add_urls_de_dup(all_urls, PNTWGithubV2ray().get_urls())
+        print("获取https://hub.xn--gzu630h.xn--kpry57d/freefq/free后数目：%d" % len(all_urls))
         self.__add_urls_de_dup(all_urls, PNSsfree().get_urls())
         print("获取https://view.ssfree.ru/后数目：%d" % len(all_urls))
         self.__add_urls_de_dup(all_urls, PNFreevpnX().get_urls())

002-V2rayPool/db/db_main.py

@@ -6,11 +6,13 @@
 @Author     :xhunmon
 @Mail       :[email protected]
 """
+import json
 
 from base.net_proxy import Net
 
 import re
 import time
+import chardet
 
 
 def re_vmess_ss_trojan(pattern, html) -> []:
@@ -39,17 +41,23 @@ def re_vmess_ss_trojan(pattern, html) -> []:
 
 
 class PYCheck(Net):
-    def get_curren_ip(self):
+    def get_curren_ip(self, url='https://ip.cn/api/index?ip=&type=0'):
         """获取内容"""
         try:
-            r = self.request_zh('https://2021.ip138.com')
-            if r.status_code != 200:
-                return None
-            r.encoding = r.apparent_encoding
-            results = re.findall(r'\[<a.+?>(.+?)</a>.+?：(.+?)\n</p>', r.text, re.DOTALL)
-            if not results:
-                return None
-            return results[0]
+            r = self.request_zh(url)
+            if r.status_code == 200:
+                charset = chardet.detect(r.content)
+                content = r.content.decode(charset['encoding'])
+                r.encoding = r.apparent_encoding
+                # {"rs":1,"code":0,"address":"德国  Hessen  ","ip":"51.38.122.98","isDomain":0}
+                results = json.loads(content)
+                if not results:
+                    return None
+                return [results['ip'], results['address']]
+            elif r.status_code == 301 or r.status_code == 302 or r.status_code == 303:
+                location = r.headers['Location']
+                time.sleep(1)
+                return self.get_curren_ip(location)
         except Exception as e:
             print(e)
             return None
@@ -72,6 +80,23 @@ def get_urls(self) -> []:
             return None
 
 
+class PNTWGithubV2ray(Net):
+    """
+    # https://hub.xn--gzu630h.xn--kpry57d/freefq/free
+    """
+
+    def get_urls(self) -> []:
+        try:
+            r = self.request(r'https://hub.xn--gzu630h.xn--kpry57d/freefq/free')
+            if r.status_code != 200:
+                return None
+            r.encoding = r.apparent_encoding
+            return re_vmess_ss_trojan(r'"%s"', r.text)
+        except Exception as e:
+            print(e)
+            return None
+
+
 class PNSsfree(Net):
     """
     https://view.ssfree.ru/