update

gongzhonghao/gongzhonghao_follow/gongzhonghao_follow.py

@@ -332,30 +332,36 @@ class GongzhonghaoFollow:
             # 下载视频
             Common.download_method(log_type=log_type, crawler=crawler, text="video",
                                    title=video_dict["video_title"], url=video_dict["video_url"])
-            # 获取视频时长
-            ffmpeg_dict = Common.ffmpeg(log_type, crawler,
-                                        f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
-            if ffmpeg_dict is None:
-                # 删除视频文件夹
-                md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
-                shutil.rmtree(f"./{crawler}/videos/{md_title}")
-                Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
-                return
-            video_dict["video_width"] = ffmpeg_dict["width"]
-            video_dict["video_height"] = ffmpeg_dict["height"]
-            video_dict["duration"] = ffmpeg_dict["duration"]
-            video_size = ffmpeg_dict["size"]
-            Common.logger(log_type, crawler).info(f'video_width:{video_dict["video_width"]}')
-            Common.logger(log_type, crawler).info(f'video_height:{video_dict["video_height"]}')
-            Common.logger(log_type, crawler).info(f'duration:{video_dict["duration"]}')
-            Common.logger(log_type, crawler).info(f'video_size:{video_size}')
-            # 视频size=0，直接删除
-            if int(video_size) == 0 or cls.download_rule(video_dict) is False:
+            if os.path.getsize(f"./{crawler}/videos/{video_dict['video_title']}/video.mp4") == 0:
                 # 删除视频文件夹
                 md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
                 shutil.rmtree(f"./{crawler}/videos/{md_title}")
                 Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
                 return
+            # # 获取视频时长
+            # ffmpeg_dict = Common.ffmpeg(log_type, crawler,
+            #                             f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
+            # if ffmpeg_dict is None:
+            #     # 删除视频文件夹
+            #     md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+            #     shutil.rmtree(f"./{crawler}/videos/{md_title}")
+            #     Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
+            #     return
+            # video_dict["video_width"] = ffmpeg_dict["width"]
+            # video_dict["video_height"] = ffmpeg_dict["height"]
+            # video_dict["duration"] = ffmpeg_dict["duration"]
+            # video_size = ffmpeg_dict["size"]
+            # Common.logger(log_type, crawler).info(f'video_width:{video_dict["video_width"]}')
+            # Common.logger(log_type, crawler).info(f'video_height:{video_dict["video_height"]}')
+            # Common.logger(log_type, crawler).info(f'duration:{video_dict["duration"]}')
+            # Common.logger(log_type, crawler).info(f'video_size:{video_size}')
+            # # 视频size=0，直接删除
+            # if int(video_size) == 0 or cls.download_rule(video_dict) is False:
+            #     # 删除视频文件夹
+            #     md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+            #     shutil.rmtree(f"./{crawler}/videos/{md_title}")
+            #     Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
+            #     return
             # 下载封面
             Common.download_method(log_type=log_type, crawler=crawler, text="cover",
                                    title=video_dict["video_title"], url=video_dict["cover_url"])

kuaishou/kuaishou_follow/kuaishou_follow.py

@@ -6,6 +6,8 @@ import random
 import shutil
 import sys
 import time
+from hashlib import md5
+
 import requests
 import json
 
@@ -636,13 +638,19 @@ class Follow:
                 # 下载视频
                 Common.download_method(log_type=log_type, crawler=crawler, text='video',
                                        title=video_dict['video_title'], url=video_dict['video_url'])
-                ffmpeg_dict = Common.ffmpeg(log_type, crawler,
-                                            f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
-                if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
-                    Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                if os.path.getsize(f"./{crawler}/videos/{video_dict['video_title']}/video.mp4") == 0:
                     # 删除视频文件夹
-                    shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
-                    return download_finished
+                    md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+                    shutil.rmtree(f"./{crawler}/videos/{md_title}")
+                    Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
+                    return
+                # ffmpeg_dict = Common.ffmpeg(log_type, crawler,
+                #                             f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
+                # if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
+                #     Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                #     # 删除视频文件夹
+                #     shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+                #     return download_finished
                 # 下载封面
                 Common.download_method(log_type=log_type, crawler=crawler, text='cover',
                                        title=video_dict['video_title'], url=video_dict['cover_url'])

kuaishou/kuaishou_follow/kuaishou_follow_scheduling.py

@@ -6,6 +6,8 @@ import random
 import shutil
 import sys
 import time
+from hashlib import md5
+
 import requests
 import json
 
@@ -654,13 +656,19 @@ class Follow:
                 # 下载视频
                 Common.download_method(log_type=log_type, crawler=crawler, text='video',
                                        title=video_dict['video_title'], url=video_dict['video_url'])
-                ffmpeg_dict = Common.ffmpeg(log_type, crawler,
-                                            f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
-                if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
-                    Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                if os.path.getsize(f"./{crawler}/videos/{video_dict['video_title']}/video.mp4") == 0:
                     # 删除视频文件夹
-                    shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
-                    return download_finished
+                    md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+                    shutil.rmtree(f"./{crawler}/videos/{md_title}")
+                    Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
+                    return
+                # ffmpeg_dict = Common.ffmpeg(log_type, crawler,
+                #                             f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
+                # if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
+                #     Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                #     # 删除视频文件夹
+                #     shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+                #     return download_finished
                 # 下载封面
                 Common.download_method(log_type=log_type, crawler=crawler, text='cover',
                                        title=video_dict['video_title'], url=video_dict['cover_url'])

xigua/xigua_follow/xigua_follow.py

@@ -9,6 +9,8 @@ import shutil
 import string
 import sys
 import time
+from hashlib import md5
+
 import requests
 import urllib3
 from requests.adapters import HTTPAdapter
@@ -897,12 +899,18 @@ class Follow:
                 Common.download_method(log_type=log_type, crawler=crawler, text='xigua_audio', title=video_dict['video_title'], url=video_dict['audio_url'])
                 # 合成音视频
                 Common.video_compose(log_type=log_type, crawler=crawler, video_dir=f"./{crawler}/videos/{video_dict['video_title']}")
-                ffmpeg_dict = Common.ffmpeg(log_type, crawler, f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
-                if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
-                    Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                if os.path.getsize(f"./{crawler}/videos/{video_dict['video_title']}/video.mp4") == 0:
                     # 删除视频文件夹
-                    shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+                    md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+                    shutil.rmtree(f"./{crawler}/videos/{md_title}")
+                    Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
                     return
+                # ffmpeg_dict = Common.ffmpeg(log_type, crawler, f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
+                # if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
+                #     Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                #     # 删除视频文件夹
+                #     shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+                #     return
                 # 下载封面
                 Common.download_method(log_type=log_type, crawler=crawler, text='cover', title=video_dict['video_title'], url=video_dict['cover_url'])
                 # 保存视频信息至txt

xigua/xigua_follow/xigua_follow_scheduling.py

@@ -10,6 +10,8 @@ import string
 import sys
 import time
 from datetime import date, timedelta
+from hashlib import md5
+
 import requests
 import urllib3
 from requests.adapters import HTTPAdapter
@@ -772,12 +774,18 @@ class SchedulingFollow:
                 Common.download_method(log_type=log_type, crawler=crawler, text='xigua_audio', title=video_dict['video_title'], url=video_dict['audio_url'])
                 # 合成音视频
                 Common.video_compose(log_type=log_type, crawler=crawler, video_dir=f"./{crawler}/videos/{video_dict['video_title']}")
-                ffmpeg_dict = Common.ffmpeg(log_type, crawler, f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
-                if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
-                    Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                if os.path.getsize(f"./{crawler}/videos/{video_dict['video_title']}/video.mp4") == 0:
                     # 删除视频文件夹
-                    shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+                    md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+                    shutil.rmtree(f"./{crawler}/videos/{md_title}")
+                    Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
                     return
+                # ffmpeg_dict = Common.ffmpeg(log_type, crawler, f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
+                # if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
+                #     Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+                #     # 删除视频文件夹
+                #     shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+                #     return
                 # 下载封面
                 Common.download_method(log_type=log_type, crawler=crawler, text='cover', title=video_dict['video_title'], url=video_dict['cover_url'])
                 # 保存视频信息至txt

xigua/xigua_search/xigua_search.py

@@ -9,6 +9,8 @@ import shutil
 import string
 import sys
 import time
+from hashlib import md5
+
 import requests
 import urllib3
 from urllib.parse import quote
@@ -795,13 +797,19 @@ class XiguaSearch:
         # 合成音视频
         Common.video_compose(log_type=log_type, crawler=crawler,
                              video_dir=f"./{crawler}/videos/{video_dict['video_title']}")
-        ffmpeg_dict = Common.ffmpeg(log_type, crawler,
-                                    f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
-        if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
-            Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+        if os.path.getsize(f"./{crawler}/videos/{video_dict['video_title']}/video.mp4") == 0:
             # 删除视频文件夹
-            shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+            md_title = md5(video_dict['video_title'].encode('utf8')).hexdigest()
+            shutil.rmtree(f"./{crawler}/videos/{md_title}")
+            Common.logger(log_type, crawler).info("视频size=0，删除成功\n")
             return
+        # ffmpeg_dict = Common.ffmpeg(log_type, crawler,
+        #                             f"./{crawler}/videos/{video_dict['video_title']}/video.mp4")
+        # if ffmpeg_dict is None or ffmpeg_dict['size'] == 0:
+        #     Common.logger(log_type, crawler).warning(f"下载的视频无效，已删除\n")
+        #     # 删除视频文件夹
+        #     shutil.rmtree(f"./{crawler}/videos/{video_dict['video_title']}")
+        #     return
         # 下载封面
         Common.download_method(log_type=log_type, crawler=crawler, text='cover',
                                title=video_dict['video_title'], url=video_dict['cover_url'])