zhangyong hai 7 meses
pai
achega
176985e8f8
Modificáronse 1 ficheiros con 19 adicións e 21 borrados
  1. 19 21
      data_channel/piaoquan.py

+ 19 - 21
data_channel/piaoquan.py

@@ -308,6 +308,7 @@ class PQ:
     """
     @classmethod
     def dd_sph_download_video(cls, video_url, video_path_url, video_id, video, channel_id):
+        new_video = video_path_url + str(video_id) + '.mp4'
         if channel_id == '单点视频':
             is_encrypted = video.get('is_encrypted', "0")
             if video['source'] == "视频号" and int(is_encrypted) == 1:
@@ -345,32 +346,29 @@ class PQ:
                                       "【 视频下载失败 】")
                     return None
                 video_url = cls.decrypt_video(data=data, decode_key=decode_key, enc_length=enc_length)
+                with open(f"{new_video}", 'wb') as f:
+                    f.write(video_url)
+                    return new_video
 
         url_video = video_url
-        new_video = video_path_url + str(video_id) + '.mp4'
         for i in range(3):
             try:
-                if video['source'] == "视频号" and int(video.get('is_encrypted', "0")) == 1:
-                    with open(f"{new_video}", 'wb') as f:
-                        f.write(url_video)
-                        return new_video
+                payload = {}
+                headers = {}
+                response = requests.request("GET", url_video, headers=headers, data=payload)
+                if response.status_code == 200:
+                    with open(f"{new_video}", "wb") as file:
+                        # 将响应内容写入文件
+                        file.write(response.content)
+                    time.sleep(5)
+                    return new_video
                 else:
-                    payload = {}
-                    headers = {}
-                    response = requests.request("GET", url_video, headers=headers, data=payload)
-                    if response.status_code == 200:
-                        with open(f"{new_video}", "wb") as file:
-                            # 将响应内容写入文件
-                            file.write(response.content)
-                        time.sleep(5)
-                        return new_video
-                    else:
-                        if channel_id == '单点视频':
-                            wx_msg = video['wx_msg']
-                            if wx_msg:
-                                url_videos = cls.get_dd_video_url(wx_msg)
-                                if url_videos:
-                                    url_video = url_videos
+                    if channel_id == '单点视频':
+                        wx_msg = video['wx_msg']
+                        if wx_msg:
+                            url_videos = cls.get_dd_video_url(wx_msg)
+                            if url_videos:
+                                url_video = url_videos
             except Exception:
                 if channel_id == '单点视频':
                     wx_msg = video['wx_msg']