update

main/follow_list.py → main/kuaishou_follow_list.py

@@ -481,10 +481,13 @@ class Follow:
                         Common.logger(log_type).info("不满足下载规则\n".format(kuaishou_title))
                     elif any(word if word in kuaishou_title else False for word in cls.sensitive_words()) is True:
                         Common.logger(log_type).info("视频已中敏感词:{}\n".format(kuaishou_title))
-                    # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnp4SaJt37q6OOOrYzPMjQkg?sheet=3cd128
+                    # 从云文档去重: 推荐榜_已下载表
                     elif str(video_id) in [j for m in Feishu.get_values_batch(log_type, "kuaishou", "3cd128") for j in m]:
                         Common.logger(log_type).info("该视频已下载:{}\n", video_title)
-                    # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnp4SaJt37q6OOOrYzPMjQkg?sheet=wW5cyb
+                    # 从云文档去重: 用户主页_已下载表
+                    elif str(video_id) in [j for m in Feishu.get_values_batch(log_type, "kuaishou", "fYdA8F") for j in m]:
+                        Common.logger(log_type).info("该视频已下载:{}\n", video_title)
+                    # 从云文档去重:用户主页_feeds
                     elif str(video_id) in [j for n in Feishu.get_values_batch(log_type, "kuaishou", "wW5cyb") for j in n]:
                         Common.logger(log_type).info("该视频已在feeds中:{}\n", video_title)
                     else:
@@ -591,13 +594,23 @@ class Follow:
                     Feishu.dimension_range(log_type, "kuaishou", "wW5cyb", "ROWS", i + 1, i + 1)
                     Common.logger(log_type).warning("标题为空或空行，删除成功\n")
                     return
-                # 从已下载视频表中去重
+
+                # 从已下载视频表中去重：推荐榜_已下载表
                 elif str(download_video_id) in [j for m in Feishu.get_values_batch(
                         log_type, "kuaishou", "3cd128") for j in m]:
                     # 删除行或列，可选 ROWS、COLUMNS
                     Feishu.dimension_range(log_type, "kuaishou", "wW5cyb", "ROWS", i + 1, i + 1)
                     Common.logger(log_type).info("视频已下载:{}，删除成功\n", download_video_title)
                     return
+
+                # 从已下载视频表中去重：用户主页_已下载表
+                elif str(download_video_id) in [j for m in Feishu.get_values_batch(
+                        log_type, "kuaishou", "fYdA8F") for j in m]:
+                    # 删除行或列，可选 ROWS、COLUMNS
+                    Feishu.dimension_range(log_type, "kuaishou", "wW5cyb", "ROWS", i + 1, i + 1)
+                    Common.logger(log_type).info("视频已下载:{}，删除成功\n", download_video_title)
+                    return
+
                 else:
                     # 下载封面
                     Common.download_method(log_type=log_type, text="cover",
@@ -633,7 +646,7 @@ class Follow:
 
                     # 视频ID工作表，插入首行
                     time.sleep(1)
-                    Feishu.insert_columns(log_type, "kuaishou", "3cd128", "ROWS", 1, 2)
+                    Feishu.insert_columns(log_type, "kuaishou", "fYdA8F", "ROWS", 1, 2)
                     # 视频ID工作表，首行写入数据
                     upload_time = int(time.time())
                     values = [[our_video_id,
@@ -655,7 +668,7 @@ class Follow:
                                str(download_cover_url),
                                str(download_video_url)]]
                     time.sleep(1)
-                    Feishu.update_values(log_type, "kuaishou", "3cd128", "E2:Z2", values)
+                    Feishu.update_values(log_type, "kuaishou", "fYdA8F", "E2:Z2", values)
                     cls.get_all_video_count.append(download_video_id)
                     Common.logger(log_type).info("保存视频ID至已下载云文档成功:{}", download_video_title)
 
@@ -683,12 +696,6 @@ class Follow:
 
 
 if __name__ == "__main__":
-    # Follow.follow_unfollow("follow", "follow", "687090964")
-    # Follow.get_videos_from_person("follow", "2413743952")
-    # Follow.get_follow_users_to_feishu('follow')
-    # Follow.get_follow_users('follow')
-    # Follow.get_videos_from_follow('follow', 'dev')
-    # Follow.del_follow_user_from_feishu('follow')
     Follow.get_user_videos('follow', '240529022')
 
     pass

main/recommend_list.py → main/kuaishou_recommend_list.py

@@ -237,14 +237,9 @@ class KuaiShou:
                 Common.logger(log_type).info("video_play_cnt:{}".format(video_play_cnt))
                 Common.logger(log_type).info("video_like_cnt:{}".format(video_like_cnt))
                 Common.logger(log_type).info("video_share_cnt:{}".format(video_share_cnt))
-                # Common.logger(log_type).info("video_comment_cnt:{}".format(video_comment_cnt))
                 Common.logger(log_type).info("video_duration:{}秒".format(video_duration))
-                # Common.logger(log_type).info("video_resolution:{}".format(video_resolution))
                 Common.logger(log_type).info("video_send_time:{}".format(
                     time.strftime("%Y/%m/%d %H:%M:%S", time.localtime(int(video_send_time) / 1000))))
-                # Common.logger(log_type).info("user_id:{}".format(user_id))
-                # Common.logger(log_type).info("head_url:{}".format(head_url))
-                # Common.logger(log_type).info("cover_url:{}".format(cover_url))
                 Common.logger(log_type).info("video_url:{}".format(video_url))
 
                 # 过滤无效视频
@@ -260,10 +255,13 @@ class KuaiShou:
                 # 判断敏感词
                 elif any(word if word in kuaishou_title else False for word in cls.sensitive_words()) is True:
                     Common.logger(log_type).info("视频已中敏感词：{}\n".format(kuaishou_title))
-                # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnp4SaJt37q6OOOrYzPMjQkg?sheet=3cd128
+                # 从云文档去重: 推荐榜_已下载表
                 elif str(video_id) in [j for m in Feishu.get_values_batch(log_type, "kuaishou", "3cd128") for j in m]:
                     Common.logger(log_type).info("该视频已下载：{}\n", video_title)
-                # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnp4SaJt37q6OOOrYzPMjQkg?sheet=JK6npf
+                # 从云文档去重: 用户主页_已下载表
+                elif str(video_id) in [j for m in Feishu.get_values_batch(log_type, "kuaishou", "fYdA8F") for j in m]:
+                    Common.logger(log_type).info("该视频已下载：{}\n", video_title)
+                # 从云文档去重: 推荐榜_feeds
                 elif str(video_id) in [j for n in Feishu.get_values_batch(log_type, "kuaishou", "JK6npf") for j in n]:
                     Common.logger(log_type).info("该视频已在feeds中：{}\n", video_title)
                 else:
@@ -326,35 +324,28 @@ class KuaiShou:
 
                 Common.logger(log_type).info("正在判断第{}行，视频:{}", i + 1, download_video_title)
 
-                # Common.logger(log_type).info("download_video_id:{}", download_video_id)
-                # Common.logger(log_type).info("download_video_title:{}", download_video_title)
-                # Common.logger(log_type).info("download_video_play_cnt:{}", download_video_play_cnt)
-                # Common.logger(log_type).info("download_video_comment_cnt:{}", download_video_comment_cnt)
-                # Common.logger(log_type).info("download_video_like_cnt:{}", download_video_like_cnt)
-                # Common.logger(log_type).info("download_video_share_cnt:{}", download_video_share_cnt)
-                # Common.logger(log_type).info("download_video_duration:{}", download_video_duration)
-                # Common.logger(log_type).info("download_video_resolution:{}", download_video_resolution)
-                # Common.logger(log_type).info("download_video_send_time:{}", download_video_send_time)
-                # Common.logger(log_type).info("download_user_name:{}", download_user_name)
-                # Common.logger(log_type).info("download_user_id:{}", download_user_id)
-                # Common.logger(log_type).info("download_head_url:{}", download_head_url)
-                # Common.logger(log_type).info("download_cover_url:{}", download_cover_url)
-                # Common.logger(log_type).info("download_video_url:{}", download_video_url)
-
                 # 过滤空行
                 if download_video_id is None or download_video_title is None or download_video_play_cnt is None:
                     # 删除行或列，可选 ROWS、COLUMNS
                     Feishu.dimension_range(log_type, "kuaishou", "JK6npf", "ROWS", i + 1, i + 1)
                     Common.logger(log_type).info("空行，删除成功\n")
                     return
-                # 去重
+                # 去重：推荐榜_已下载表
                 elif str(download_video_id) in [j for m in Feishu.get_values_batch(log_type, "kuaishou", "3cd128") for j
                                                 in m]:
                     # 删除行或列，可选 ROWS、COLUMNS
                     Feishu.dimension_range(log_type, "kuaishou", "JK6npf", "ROWS", i + 1, i + 1)
                     Common.logger(log_type).info("该视频已下载:{}，删除成功\n", download_video_title)
                     return
-                    # 下载规则
+                # 去重：用户主页_已下载表
+                elif str(download_video_id) in [j for m in Feishu.get_values_batch(log_type, "kuaishou", "fYdA8F") for j
+                                                in m]:
+                    # 删除行或列，可选 ROWS、COLUMNS
+                    Feishu.dimension_range(log_type, "kuaishou", "JK6npf", "ROWS", i + 1, i + 1)
+                    Common.logger(log_type).info("该视频已下载:{}，删除成功\n", download_video_title)
+                    return
+
+                # 下载规则
                 elif cls.kuaishou_download_rule(
                         download_video_duration, download_video_resolution.split("*")[0],
                         download_video_resolution.split("*")[-1],

main/publish.py

@@ -8,6 +8,7 @@
 import json
 import os
 import random
+import shutil
 import time
 import oss2
 import requests
@@ -255,4 +256,6 @@ class Publish:
                 else:
                     Common.logger(log_type).warning('file not a dir = {}'.format(fi_d))
             except Exception as e:
+                # 删除视频文件夹
+                shutil.rmtree("./videos/" + f + "/")
                 Common.logger(log_type).error('upload_and_publish error', e)

main/run_follow.py → main/run_kuaishou_follow.py

@@ -8,7 +8,7 @@ import sys
 import time
 sys.path.append(os.getcwd())
 from main.common import Common
-from main.follow_list import Follow
+from main.kuaishou_follow_list import Follow
 
 
 class Main:

main/run_recommend.py → main/run_kuaishou_recommend.py

@@ -9,7 +9,7 @@ import sys
 import time
 sys.path.append(os.getcwd())
 from main.common import Common
-from main.recommend_list import KuaiShou
+from main.kuaishou_recommend_list import KuaiShou
 
 
 def main():