update

README.md

@@ -27,6 +27,8 @@
 
 
 #### 需求 
+2022/9/9
+1. 增加已下载去重表:sheet=2zD8cv
 
 2022/9/7
 1. 新增播放量下载规则

main/xiaoniangao_hour_list.py

@@ -378,6 +378,11 @@ class HourList:
                         Common.logger(log_type).info("该视频已下载:{}", video_title)
                         time.sleep(1)
 
+                    # 从云文档中去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=2zD8cv
+                    elif video_id in [j for i in Feishu.get_values_batch(log_type, "xiaoniangao", "2zD8cv") for j in i]:
+                        Common.logger(log_type).info("该视频已下载:{}", video_title)
+                        time.sleep(1)
+
                     # 从云文档去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=ba0da4
                     elif video_id in [j for i in Feishu.get_values_batch("hour", "xiaoniangao", "ba0da4") for j in i]:
                         Common.logger(log_type).info("该视频已保存过:{}", video_title)
@@ -801,6 +806,9 @@ class HourList:
                         # 从云文档中去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=yatRv2
                         elif v_id in [j for i in Feishu.get_values_batch(log_type, "xiaoniangao", "yatRv2") for j in i]:
                             Common.logger(log_type).info("该视频已下载:{}", v_title)
+                        # 从云文档中去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=yatRv2
+                        elif v_id in [j for i in Feishu.get_values_batch(log_type, "xiaoniangao", "2zD8cv") for j in i]:
+                            Common.logger(log_type).info("该视频已下载:{}", v_title)
 
                         # 播放量大于 50000，直接下载
                         elif int(v_play_cnt) >= 50000:

main/xiaoniangao_person_list.py

@@ -497,14 +497,22 @@ class Person:
                 elif any(word if word in video_title else False for word in
                          cls.sensitive_words(log_type)) is True:
                     Common.logger(log_type).info("视频已中敏感词:{}\n".format(video_title))
+
                 # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=yatRv2
                 elif video_id in [m for n in Feishu.get_values_batch(log_type, "xiaoniangao", "yatRv2") for m in
                                   n]:
                     Common.logger(log_type).info("该视频已下载:{}\n", video_title)
+
+                # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=yatRv2
+                elif video_id in [m for n in Feishu.get_values_batch(log_type, "xiaoniangao", "2zD8cv") for m in
+                                  n]:
+                    Common.logger(log_type).info("该视频已下载:{}\n", video_title)
+
                 # 从 云文档 去重:https://w42nne6hzg.feishu.cn/sheets/shtcnYxiyQ1wLklo1W5Kdqc9cGh?sheet=k6ldje
                 elif video_id in [m for n in Feishu.get_values_batch(log_type, "xiaoniangao", "k6ldje") for m in
                                   n]:
                     Common.logger(log_type).info("该视频已在个人主页feeds:{}\n", video_title)
+
                 else:
                     Feishu.insert_columns(log_type, "xiaoniangao", "k6ldje", "ROWS", 1, 2)
                     # 获取当前时间
@@ -610,6 +618,7 @@ class Person:
                     Feishu.dimension_range("person", "xiaoniangao", "k6ldje", "ROWS", i + 1, i + 1)
                     Common.logger("person").info("播放量:{}<2000，删除成功\n", download_video_play_cnt)
                     return
+
                 # 从已下载视频表中去重
                 elif download_video_id in [j for m in Feishu.get_values_batch(
                         "person", "xiaoniangao", "yatRv2") for j in m]:
@@ -617,6 +626,14 @@ class Person:
                     Feishu.dimension_range("person", "xiaoniangao", "k6ldje", "ROWS", i + 1, i + 1)
                     Common.logger("person").info("视频已下载:{}，删除成功\n", download_video_title)
                     return
+
+                # 从已下载视频表中去重
+                elif download_video_id in [j for m in Feishu.get_values_batch(
+                        "person", "xiaoniangao", "2zD8cv") for j in m]:
+                    # 删除行或列，可选 ROWS、COLUMNS
+                    Feishu.dimension_range("person", "xiaoniangao", "k6ldje", "ROWS", i + 1, i + 1)
+                    Common.logger("person").info("视频已下载:{}，删除成功\n", download_video_title)
+                    return
                 else:
                     # 下载封面
                     Common.download_method(log_type="person", text="cover",

main/xiaoniangao_play_list.py

@@ -347,6 +347,12 @@ class PlayList:
                         Common.logger(log_type).info("该视频已下载:{}\n", video_title)
                         time.sleep(1)
 
+                    # 从已下载云文档中去重
+                    elif str(video_id) in [j for i in Feishu.get_values_batch(log_type, "xiaoniangao", "2zD8cv") for j
+                                           in i]:
+                        Common.logger(log_type).info("该视频已下载:{}\n", video_title)
+                        time.sleep(1)
+
                     # 从feeds云文档去重
                     elif str(video_id) in [j for i in Feishu.get_values_batch(log_type, "xiaoniangao", "me9Qs4") for j
                                            in i]:
@@ -427,6 +433,14 @@ class PlayList:
                     Feishu.dimension_range(log_type, "xiaoniangao", "me9Qs4", "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, "xiaoniangao", "2zD8cv") for j in m]:
+                    # 删除行或列，可选 ROWS、COLUMNS
+                    Feishu.dimension_range(log_type, "xiaoniangao", "me9Qs4", "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",