去重字符类型判断修复

main/demo.py

@@ -5,6 +5,8 @@ import os
 import shutil
 import ffmpeg
 
+from main.feishu_lib import Feishu
+
 
 class Demo:
     # 获取已下载视频宽高、时长等信息
@@ -77,9 +79,18 @@ class Demo:
         # 删除后，打印目标文件目录内容
         print(f"videos文件夹:{os.listdir(filepath)}\n")
 
+    # 去重
+    @classmethod
+    def distent(cls):
+        if "10477" in [n for m in Feishu.get_values_batch("log_type", "music_album", "f5a76e") for n in m]:
+            print("yes")
+        else:
+            print("no")
+
 
 if __name__ == "__main__":
     demo = Demo()
     # demo.check_duration()
     # demo.check_title_len()
-    demo.del_files()
+    # demo.del_files()
+    demo.distent()

main/recommend_list.py

@@ -252,10 +252,10 @@ class Recommend:
             elif cls.get_rule(play_cnt, share_cnt, "60") is False:
                 Common.logger(log_type).info("不满足抓取规则\n")
             # 已下载视频表去重
-            elif video_id in [n for m in Feishu.get_values_batch(log_type, "music_album", "f5a76e") for n in m]:
+            elif str(video_id) in [n for m in Feishu.get_values_batch(log_type, "music_album", "f5a76e") for n in m]:
                 Common.logger(log_type).info("该视频已下载\n")
             # recommend_feeds去重
-            elif video_id in [n for m in Feishu.get_values_batch(log_type, "music_album", "69UxPo") for n in m]:
+            elif str(video_id) in [n for m in Feishu.get_values_batch(log_type, "music_album", "69UxPo") for n in m]:
                 Common.logger(log_type).info("该视频已在recommend_feeds中\n")
             else:
                 time.sleep(1)
@@ -329,7 +329,7 @@ class Recommend:
                     Common.logger(log_type).info("不满足下载规则，删除成功\n")
                     return
                 # 已下载视频表去重
-                elif download_video_id in [n for m in Feishu.get_values_batch(log_type, "music_album", "f5a76e") for n
+                elif str(download_video_id) in [n for m in Feishu.get_values_batch(log_type, "music_album", "f5a76e") for n
                                            in m]:
                     Feishu.dimension_range(log_type, "music_album", "69UxPo", "ROWS", i + 1, i + 1)
                     Common.logger(log_type).info("该视频已下载，删除成功\n")
@@ -354,7 +354,7 @@ class Recommend:
                     elif int(video_info[0]) < int(video_info[1]):
                         # 删除在 recommend_feeds 的记录
                         Feishu.dimension_range(log_type, "music_album", "69UxPo", "ROWS", i + 1, i + 1)
-                        Common.logger(log_type).info("宽:{}<高:{}，删除成功\n", int(video_info[0]), int(video_info[1]))
+                        Common.logger(log_type).info("宽:{}<高:{}，删除成功", int(video_info[0]), int(video_info[1]))
 
                         # 添加到竖版视频表
                         time.sleep(1)
@@ -379,6 +379,7 @@ class Recommend:
                                    str(download_video_url)]]
                         time.sleep(1)
                         Feishu.update_values(log_type, "music_album", "hYSZsW", "A2:P2", values)
+                        Common.logger(log_type).info("写入竖版视频表成功\n")
                         return
                     else:
                         # 下载封面