wangkun преди 2 години
родител
ревизия
62ddc6c095
променени са 2 файла, в които са добавени 18 реда и са изтрити 6 реда
  1. 8 2
      kuaishou/kuaishou_follow/kuaishou_follow.py
  2. 10 4
      xigua/xigua_follow/xigua_follow.py

+ 8 - 2
kuaishou/kuaishou_follow/kuaishou_follow.py

@@ -556,10 +556,16 @@ class Follow:
             elif any(word if word in video_dict['video_title'] else False for word in cls.filter_words(log_type, crawler)) is True:
                 Common.logger(log_type, crawler).info('标题已中过滤词\n')
             else:
-                # 下载封面
-                Common.download_method(log_type=log_type, crawler=crawler, text='cover', title=video_dict['video_title'], url=video_dict['cover_url'])
                 # 下载视频
                 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")
+                    # 删除视频文件夹
+                    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'])
                 # 保存视频信息至txt
                 Common.save_video_info(log_type=log_type, crawler=crawler, video_dict=video_dict)
 

+ 10 - 4
xigua/xigua_follow/xigua_follow.py

@@ -886,16 +886,22 @@ class Follow:
             # elif str(video_dict['video_id']) in [x for y in Feishu.get_values_batch(log_type, 'xigua', 'wjhpDs') for x in y]:
             #     Common.logger(log_type, crawler).info('视频已存在\n')
             else:
-                # 下载封面
-                Common.download_method(log_type=log_type, crawler=crawler, text='cover', title=video_dict['video_title'], url=video_dict['cover_url'])
                 # 下载视频
                 Common.download_method(log_type=log_type, crawler=crawler, text='xigua_video', title=video_dict['video_title'], url=video_dict['video_url'])
                 # 下载音频
                 Common.download_method(log_type=log_type, crawler=crawler, text='xigua_audio', title=video_dict['video_title'], url=video_dict['audio_url'])
-                # 保存视频信息至txt
-                Common.save_video_info(log_type=log_type, crawler=crawler, video_dict=video_dict)
                 # 合成音视频
                 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")
+                    # 删除视频文件夹
+                    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
+                Common.save_video_info(log_type=log_type, crawler=crawler, video_dict=video_dict)
 
                 # 上传视频
                 Common.logger(log_type, crawler).info("开始上传视频...")