兼容单视频 抖音/快手

common/sql_help.py

@@ -98,7 +98,7 @@ class sqlCollect():
         """
         获取视频号单点内容
         """
-        sql = f"""select video_id,title,author_id,author_name,cover_url,video_url,video_duration,from_user_id,from_user_name,from_group_id,from_group_name from dandian_shipinhao where from_user_name = %s and has_used = 0 """
+        sql = f"""select video_id,title,author_id,author_name,cover_url,video_url,video_duration,from_user_id,from_user_name,from_group_id,from_group_name,source from dandian_content where from_user_name = %s and has_used = 0 """
         data = AigcMysqlHelper.get_values(sql, (url))
         return data
 

data_channel/shipinhaodandian.py

@@ -21,8 +21,9 @@ class SPHDD:
                     from_user_name = data[8]
                     from_group_id = data[9]
                     from_group_name = data[10]
+                    source = data[11]
                     all_data = {"video_id": video_id, "cover": cover_url, "video_url": video_url, "rule": author_name,
-                                "old_title": old_title, "from_user_name": from_user_name, "from_group_name": from_group_name}
+                                "old_title": old_title, "from_user_name": from_user_name, "from_group_name": from_group_name, "source": source}
                     list.append(all_data)
             return list
         return list

video_rewriting/video_processor.py

@@ -95,7 +95,6 @@ class VideoProcessor:
                 f"**负责人**: {name}\n"
                 f"**渠道**: {channel_id}\n"
                 f"**视频主页ID**: {url}\n"
-                f"**任务标示**: {task_mark}\n"
             )
             Feishu.finish_bot(text, "https://open.feishu.cn/open-apis/bot/v2/hook/e7697dc6-5254-4411-8b59-3cd0742bf703",
                               "【 机器改造通知 】")
@@ -119,7 +118,6 @@ class VideoProcessor:
                         f"**渠道**: {channel_id}\n"
                         f"**视频主页ID**: {url}\n"
                         f"**视频Video_id**: {v_id}\n"
-                        f"**任务标示**: {task_mark}\n"
                     )
                     Feishu.finish_bot(text,
                                       "https://open.feishu.cn/open-apis/bot/v2/hook/e7697dc6-5254-4411-8b59-3cd0742bf703",
@@ -136,7 +134,6 @@ class VideoProcessor:
                         f"**渠道**: {channel_id}\n"
                         f"**视频主页ID**: {url}\n"
                         f"**视频Video_id**: {v_id}\n"
-                        f"**任务标示**: {task_mark}\n"
                     )
                     Feishu.finish_bot(text,
                                       "https://open.feishu.cn/open-apis/bot/v2/hook/e7697dc6-5254-4411-8b59-3cd0742bf703",
@@ -158,7 +155,6 @@ class VideoProcessor:
                             f"**渠道**: {channel_id}\n"
                             f"**视频主页ID**: {url}\n"
                             f"**视频Video_id**: {v_id}\n"
-                            f"**任务标示**: {task_mark}\n"
                         )
                         Feishu.finish_bot(text,
                                           "https://open.feishu.cn/open-apis/bot/v2/hook/e7697dc6-5254-4411-8b59-3cd0742bf703",
@@ -176,6 +172,8 @@ class VideoProcessor:
                             Common.logger(mark).info(f"{name}的{task_mark}下的ID{url} 视频修改已使用，状态已修改")
                             from_user_name = video['from_user_name']  # 来源用户
                             from_group_name = video['from_group_name']  # 来源群组
+                            source = video['source']  # 渠道
+                            channel_id = source
                             text = (
                                 f"**站内视频链接**: {pq_url}\n"
                                 f"**来源用户**: {from_user_name}\n"
@@ -184,7 +182,7 @@ class VideoProcessor:
                                 f"**原视频封面**: {video['cover']}\n"
                                 f"**原视频标题**: {video['old_title']}\n"
                             )
-                            Feishu.finish_bot(text, "https://open.feishu.cn/open-apis/bot/v2/hook/0553124e-7fc1-4f9b-8976-9db4218d25e2", "【 有一条新的视频号内容改造成功 】")
+                            Feishu.finish_bot(text, "https://open.feishu.cn/open-apis/bot/v2/hook/0553124e-7fc1-4f9b-8976-9db4218d25e2", f"【 有一条新的{source}内容改造成功 】")
                     text = (
                         f"**通知类型**: 视频改造成功\n"
                         f"**站内视频链接**: {pq_url}\n"
@@ -192,7 +190,6 @@ class VideoProcessor:
                         f"**渠道**: {channel_id}\n"
                         f"**视频主页ID**: {url}\n"
                         f"**视频Video_id**: {v_id}\n"
-                        f"**任务标示**: {task_mark}\n"
                     )
                     Feishu.finish_bot(text,
                                       "https://open.feishu.cn/open-apis/bot/v2/hook/e7697dc6-5254-4411-8b59-3cd0742bf703",
@@ -251,7 +248,7 @@ class VideoProcessor:
             return KS.get_ks_url(task_mark, url, number, mark, feishu_id, cookie_sheet, channel_id, name)
         elif channel_id == "快手创作者版":
             return KsFeedVideo.get_data()
-        elif channel_id == "视频号单视频":
+        elif channel_id == "单点视频":
             return SPHDD.get_sphdd_data(url)
         elif channel_id == "抖音历史":
             return DYLS.get_dyls_list(task_mark, url, number, mark)