调试

common/redis.py

@@ -52,8 +52,8 @@ def get_data(name, feishu_id, feishu_sheet):
             data = Material.get_task_data(feishu_id, feishu_sheet)
         client.rpush(task, *data)
     ret = client.lpop(task)
-    if name == 'dy-pl-gjc' or name == 'dd-sp' or name == 'ks-pl-gjc' or name == 'sph-pl-gjc':
-        client.rpush(task, ret)
+    # if name == 'dy-pl-gjc' or name == 'dd-sp' or name == 'ks-pl-gjc' or name == 'sph-pl-gjc':
+    #     client.rpush(task, ret)
     return ret
 
 """搜索计数插入"""

data_channel/douyin.py

@@ -110,13 +110,15 @@ class DY:
                             Common.logger("dy").info(
                                 f"不符合规则：{task_mark},用户主页id:{url_id},视频id{video_id} ,分享:{share_count},点赞{digg_count} ,时长:{duration} ")
                             continue
-                        AliyunLogger.logging(channel_id, name, url_id, video_id, "符合规则等待改造", "2004", log_data)
                         cover_url = data[i].get('video').get('cover').get('url_list')[0]  # 视频封面
-                        all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url, "rule": video_percent, "old_title": old_title}
+                        all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url,
+                                    "rule": video_percent, "old_title": old_title}
                         list.append(all_data)
+                        AliyunLogger.logging(channel_id, name, url_id, video_id, "符合规则等待改造", "2004", log_data)
                         if len(list) == int(number):
                             Common.logger(mark).info(f"获取抖音视频总数:{len(list)}\n")
                             return list
+
             return list
         except Exception as exc:
             # Feishu.bot("liuzhaoheng", '机器自动改造消息通知', f'抖音-{name}cookie过期，请及时更换', '刘兆恒')

data_channel/dy_keyword.py

@@ -93,11 +93,11 @@ class DyKeyword:
                     Common.logger("dy-key-word").info(
                         f"不符合规则：{task_mark},用户主页id:{keyword},视频id{video_id} ,分享:{share_count},点赞{digg_count} ,时长:{int(duration)} ")
                     continue
-                AliyunLogger.logging(channel_id, name, keyword, video_id, "符合规则等待改造", "2004", log_data)
                 cover_url = data[i].get('video').get('cover').get('url_list')[0]  # 视频封面
                 all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url, "rule": video_percent,
                             "old_title": old_title}
                 list.append(all_data)
+                AliyunLogger.logging(channel_id, name, keyword, video_id, "符合规则等待改造", "2004", log_data)
             return list
         except Exception as exc:
             Common.logger("dy-key-word").info(f"抖音搜索词{keyword}获取失败{exc}\n")

data_channel/dy_ls.py

@@ -80,11 +80,11 @@ class DYLS:
                         Common.logger("dy-ls").info(
                             f"不符合规则：{task_mark},用户主页id:{url_id},视频id{video_id} ,分享:{share_count},点赞{digg_count} ,时长:{int(duration)} ")
                         continue
-                    AliyunLogger.logging(channel_id, name, url_id, video_id, "符合规则等待改造", "2004", log_data)
                     cover_url = data[i].get('video').get('cover').get('url_list')[0]  # 视频封面
                     all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url, "rule": video_percent,
                                 "old_title": old_title}
                     list.append(all_data)
+                    AliyunLogger.logging(channel_id, name, url_id, video_id, "符合规则等待改造", "2004", log_data)
                     if len(list) == int(number):
                         Common.logger("dy-ls").info(f"获取抖音历史视频总数:{len(list)}\n")
                         return list

data_channel/ks_keyword.py

@@ -104,11 +104,11 @@ class KsKeyword:
                 video_url, image_url = cls.get_video(photo_id)
                 if video_url:
                     log_data = f"user:{keyword},,video_id:{photo_id},,video_url:{video_url},,original_title:{old_title},,share_count:{share_count},,view_count:{view_count},,duration:{duration}"
-                    AliyunLogger.logging(channel_id, name, keyword, photo_id, "符合规则等待改造", "2004", log_data)
                     all_data = {"video_id": photo_id, "cover": image_url, "video_url": video_url,
                                 "rule": video_percent,
                                 "old_title": old_title}
                     list.append(all_data)
+                    AliyunLogger.logging(channel_id, name, keyword, photo_id, "符合规则等待改造", "2004", log_data)
                 else:
                     AliyunLogger.logging(channel_id, name, photo_id, photo_id, "无法获取到视频链接", "2003")
                     continue

data_channel/ks_ls.py

@@ -78,11 +78,12 @@ class KSLS:
                     video_url, image_url = cls.get_video(photo_id)
                     if video_url:
                         log_data = f"user:{url_id},,video_id:{photo_id},,video_url:{video_url},,original_title:{old_title},,share_count:{share_count},,view_count:{view_count},,duration:{duration}"
-                        AliyunLogger.logging(channel_id, name, url_id, photo_id, "符合规则等待改造", "2004", log_data)
                         all_data = {"video_id": photo_id, "cover": image_url, "video_url": video_url,
                                     "rule": video_percent,
                                     "old_title": old_title}
                         list.append(all_data)
+                        AliyunLogger.logging(channel_id, name, url_id, photo_id, "符合规则等待改造", "2004", log_data)
+
                         if len(list) == int(number):
                             Common.logger("ks-ls").info(f"获取快手历史视频总数:{len(list)}\n")
                             return list

data_channel/kuaishou.py

@@ -149,9 +149,9 @@ class KS:
                         Common.logger("ks").info(
                             f"不符合规则：{task_mark},用户主页id:{url_id},视频id{video_id} ,播放数:{view_count} ,分享数:{share_count},时长:{duration} ")
                         continue
-                    AliyunLogger.logging(channel_id, name, url_id, video_id, "符合规则等待改造", "2004", log_data)
                     all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url, "rule": video_percent, "old_title": old_title}
                     list.append(all_data)
+                    AliyunLogger.logging(channel_id, name, url_id, video_id, "符合规则等待改造", "2004", log_data)
                     if len(list) == int(number):
                         Common.logger(mark).info(f"获取快手视频总数:{len(list)}\n")
                         return list

data_channel/shipinhao.py

@@ -114,9 +114,9 @@ class SPH:
                                                      "2003", log_data)
 
                                 continue
-                            AliyunLogger.logging(channel_id, name, url_id, objectId, "符合规则等待改造", "2004", log_data)
                             all_data = {"video_id": objectId, "cover": cover, "video_url": video_url, "rule": video_percent, "old_title": old_title, "decode_key": decode_key}
                             list.append(all_data)
+                            AliyunLogger.logging(channel_id, name, url_id, objectId, "符合规则等待改造", "2004", log_data)
                             if len(list) == int(number):
                                 Common.logger(mark).info(f"获取视频号视频总数:{len(list)}\n")
                                 return list

data_channel/sph_keyword.py

@@ -75,10 +75,10 @@ class SphKeyword:
                     Common.logger("sph-key-word").info(
                         f"不符合规则：{task_mark},用户主页id:{keyword},视频id{video_id} 点赞{digg_count} ,时长:{int(duration)} ")
                     continue
-                AliyunLogger.logging(channel_id, name, keyword, video_id, "符合规则等待改造", "2004", log_data)
                 all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url, "rule": '',
                             "old_title": old_title}
                 list.append(all_data)
+                AliyunLogger.logging(channel_id, name, keyword, video_id, "符合规则等待改造", "2004", log_data)
             return list
         except Exception as exc:
             Common.logger("sph-key-word").info(f"视频号搜索词{keyword}获取失败{exc}\n")

data_channel/sph_ls.py

@@ -45,10 +45,10 @@ class SPHLS:
                     Common.logger("sph-ls").info(
                         f"任务：{task_mark},用户主页id:{url},视频id{video_id} ,分享:{share_cnt},点赞:{like_cnt} ,时长:{duration} ")
                     continue
-                AliyunLogger.logging(channel_id, name, url, video_id, "符合规则等待改造", "2004", log_data)
                 all_data = {"video_id": video_id, "cover": oss_cover, "video_url": oss_url, "rule": '',
                             "old_title": old_title}
                 list.append(all_data)
+                AliyunLogger.logging(channel_id, name, url, video_id, "符合规则等待改造", "2004", log_data)
                 if len(list) == int(number):
                     Common.logger("sph-ls").info(f"获取视频号视频总数:{len(list)}\n")
                     return list

video_rewriting/video_processor.py

@@ -147,8 +147,6 @@ class VideoProcessor:
                 Feishu.insert_columns("Z5xLsdyyxh3abntTTvUc9zw8nYd", "099da8", "ROWS", 1, 2)
                 time.sleep(0.5)
                 Feishu.update_values("Z5xLsdyyxh3abntTTvUc9zw8nYd", "099da8", "A2:Z2", values)
-
-
             Common.logger(mark).info(f"{name}的{task_mark}下的ID{url} 获取视频完成，共{len(data_list)}条")
             try:
                 for video in data_list:
@@ -683,7 +681,7 @@ class VideoProcessor:
             VideoProcessor.process_task(task, mark, name, feishu_id, cookie_sheet)
             return mark
         except Exception as e:
-            AliyunLogger.logging((task["channel_id"]), name, task["channel_url"],'', f"用户抓取异常:{e}", "2005")
+            AliyunLogger.logging((task["channel_id"]), name, task["channel_url"],'', f"用户抓取异常:{e}", "3001")
             return mark