zhangyong hai 7 meses
pai
achega
336714f573
Modificáronse 1 ficheiros con 29 adicións e 24 borrados
  1. 29 24
      carry_video/carry_video.py

+ 29 - 24
carry_video/carry_video.py

@@ -101,7 +101,7 @@ class CarryViode:
             return None, None
 
 
-    def insert_pq(self, REDIS_NAME, data, oss_object_key, title, tags):
+    def insert_pq(self, REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel):
         logger.info(f"[+] {REDIS_NAME}的{data}开始写入票圈")
         n_ids = data["pq_ids"]
         if ',' in n_ids:
@@ -113,7 +113,7 @@ class CarryViode:
             code = PQ.insert_piaoquantv(oss_object_key, title, n_id)
             if not code:
                 logger.error(f"[+] {REDIS_NAME}的{data}写入票圈后台失败")
-                AliyunLogger.logging(data["name"], "效率工具", data["tag_transport_channel"], data["video_url"],
+                AliyunLogger.logging(data["name"], "效率工具", tag_transport_channel, data["video_url"],
                                      "改造失败,写入票圈后台失败", "3001", str(data))
                 text = (
                     f"**负责人**: {data['name']}\n"
@@ -146,7 +146,7 @@ class CarryViode:
                         data["activate_data"],
                         data["video_url"],
                         data["title_category"],
-                        data["tag_transport_channel"],
+                        tag_transport_channel,
                         data["tag_transport_scene"],
                         data["tag_transport_keyword"],
                         data["tag"],
@@ -178,29 +178,34 @@ class CarryViode:
             except Exception as e:
                 logger.error(f"[+] {REDIS_NAME}的{data}写入飞书失败{e}")
                 pass
-        AliyunLogger.logging(data["name"], "效率工具", data["tag_transport_channel"], data["video_url"],
+        AliyunLogger.logging(data["name"], "效率工具", tag_transport_channel, data["video_url"],
                              "改造成功", "1000", str(data), str(pq_list))
 
     def main(self, data, REDIS_NAME, file_path):
-        AliyunLogger.logging(data["name"],"效率工具", data["tag_transport_channel"], data["video_url"], "扫描到一条视频", "2001", str(data))
-        AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],  "符合规则等待改造", "2004", str(data))
+        tag_transport_channel = None
+
         url = data['video_url']
         if "&vid=" not in url and data['tag_transport_channel'] != "抖音":
             msg = html.unescape(url).split('?')[0]
             pattern = re.search(r'https?://[^\s<>"\'\u4e00-\u9fff]+', msg)
             if not pattern:
+                in_carry_video_data(REDIS_NAME, json.dumps(data, ensure_ascii=False, indent=4))
                 return
             url = pattern.group()
         host = urlparse(url).netloc
         if host in ['v.douyin.com', 'www.douyin.com', 'www.iesdouyin.com']:
+            tag_transport_channel = "抖音"
             logger.info(f"[+] {url}开始获取抖音视频链接")
             url, original_title =  self.get_text_dy_video(url=url)
         elif host in ['v.kuaishou.com', 'www.kuaishou.com', 'v.m.chenzhongtech.com', 'creater.eozatvmq.com']:
+            tag_transport_channel = "快手"
             logger.info(f"[+] {url}开始获取快手视频链接")
             url, original_title = self.get_text_ks_video(url=url)
         else:
+            AliyunLogger.logging(data["name"], "效率工具", "", data["video_url"], "扫描到一条视频",
+                                 "2001", str(data))
             logger.error(f"[+] {url}该链接不是抖/快 不做处理")
-            AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+            AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                  "不是抖/快不做处理", "1001", str(data))
             text = (
                 f"**负责人**: {data['name']}\n"
@@ -211,10 +216,12 @@ class CarryViode:
                               "https://open.feishu.cn/open-apis/bot/v2/hook/65bc5463-dee9-46d0-bc2d-ec6c49a8f3cd",
                               "【 搬运&改造效率工具失败通知 】")
             return
+        AliyunLogger.logging(data["name"],"效率工具", tag_transport_channel, data["video_url"], "扫描到一条视频", "2001", str(data))
+        AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],  "符合规则等待改造", "2004", str(data))
         if not url:
             in_carry_video_data(REDIS_NAME, json.dumps(data, ensure_ascii=False, indent=4))
             logger.info(f"[+] {url}没有获取到视频链接,等待重新处理")
-            AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+            AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                  "没有获取到视频链接,等待重新处理", "1002", str(data))
             text = (
                 f"**负责人**: {data['name']}\n"
@@ -232,7 +239,7 @@ class CarryViode:
         if not os.path.exists(video_path) or os.path.getsize(video_path) == 0:
             in_carry_video_data(REDIS_NAME, json.dumps(data, ensure_ascii=False, indent=4))
             logger.error(f"[+] {url}下载失败")
-            AliyunLogger.logging(data["name"],"效率工具", data["tag_transport_channel"], data["video_url"],
+            AliyunLogger.logging(data["name"],"效率工具", tag_transport_channel, data["video_url"],
                                  "视频下载失败等待重新处理", "3002", str(data))
             text = (
                 f"**负责人**: {data['name']}\n"
@@ -256,7 +263,7 @@ class CarryViode:
             status = oss_object_key.get("status")
             if status != 200:
                 logger.error(f"[+] {REDIS_NAME}的{data}数据发送oss失败")
-                AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+                AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                      "改造失败,发送oss失败", "3001", str(data))
                 text = (
                     f"**负责人**: {data['name']}\n"
@@ -272,19 +279,18 @@ class CarryViode:
             tags = ','.join(filter(None, [
                 data['pq_label'],
                 data['channel_mark'],
-                data['tag_transport_channel'],
+                tag_transport_channel,
                 data['tag_transport_scene'],
                 data['tag_transport_keyword'],
-                data['tag'],
-                "搬运"
+                "搬运工具"
             ]))
-            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags)
+            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel)
         if data["transform_rule"] == "仅改造" or data["transform_rule"] == "是":
             logger.info(f"[+] {REDIS_NAME}的{data}视频更改分辨率处理")
             video_path = FFmpeg.video_640(video_path, file_path)
             if not os.path.exists(video_path) or os.path.getsize(video_path) == 0:
                 logger.error(f"[+] {REDIS_NAME}的{data}视频更改分辨率失败")
-                AliyunLogger.logging(data["name"], "效率工具", data["tag_transport_channel"], data["video_url"],
+                AliyunLogger.logging(data["name"], "效率工具", tag_transport_channel, data["video_url"],
                                      "改造失败,片尾拼接失败", "3001", str(data))
                 text = (
                     f"**负责人**: {data['name']}\n"
@@ -317,7 +323,7 @@ class CarryViode:
                 pw_url = TTS.get_pw_zm(pw_srt_text, voice)
                 if not pw_url:
                     logger.error(f"[+] {REDIS_NAME}的{data}数据片尾获取失败")
-                    AliyunLogger.logging(data["name"],"效率工具", data["tag_transport_channel"], data["video_url"],
+                    AliyunLogger.logging(data["name"],"效率工具", tag_transport_channel, data["video_url"],
                                          "改造失败,片尾获取失败", "3001", str(data))
                     text = (
                         f"**负责人**: {data['name']}\n"
@@ -333,7 +339,7 @@ class CarryViode:
                 pw_mp3_path = TTS.download_mp3(pw_url, file_path)
                 if not pw_mp3_path:
                     logger.error(f"[+] {REDIS_NAME}的{data}数据片尾音频下载失败")
-                    AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+                    AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                          "改造失败,片尾音频下载失败", "3001", str(data))
                     text = (
                         f"**负责人**: {data['name']}\n"
@@ -348,7 +354,7 @@ class CarryViode:
                 jpg_path = FFmpeg.video_png(video_path, file_path)  # 生成视频最后一帧jpg
                 if not os.path.exists(jpg_path) or os.path.getsize(jpg_path) == 0:
                     logger.error(f"[+] {REDIS_NAME}的{data}数据片尾获取最后一帧失败")
-                    AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+                    AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                          "改造失败,获取最后一帧失败", "3001", str(data))
                     text = (
                         f"**负责人**: {data['name']}\n"
@@ -363,7 +369,7 @@ class CarryViode:
                 pw_path = FFmpeg.pw_video(jpg_path, file_path, pw_mp3_path, pw_srt)  # 生成片尾视频
                 if not os.path.exists(pw_path) or os.path.getsize(pw_path) == 0:
                     logger.error(f"[+] {REDIS_NAME}的{data}数据片尾拼接失败")
-                    AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+                    AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                          "改造失败,片尾拼接失败", "3001", str(data))
                     text = (
                         f"**负责人**: {data['name']}\n"
@@ -379,7 +385,7 @@ class CarryViode:
                 video_path = FFmpeg.single_video(video_path, file_path, data["video_share"])
                 if not os.path.exists(video_path) or os.path.getsize(video_path) == 0:
                     logger.error(f"[+] {REDIS_NAME}的{data}数据添加片中字幕失败")
-                    AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],
+                    AliyunLogger.logging(data["name"], "效率工具",tag_transport_channel, data["video_url"],
                                          "改造失败,添加片中字幕失败", "3001", str(data))
                     text = (
                         f"**负责人**: {data['name']}\n"
@@ -396,7 +402,7 @@ class CarryViode:
             status = oss_object_key.get("status")
             if status != 200:
                 logger.error(f"[+] {REDIS_NAME}的{data}数据发送oss失败")
-                AliyunLogger.logging(data["name"],"效率工具", data["tag_transport_channel"], data["video_url"],
+                AliyunLogger.logging(data["name"],"效率工具", tag_transport_channel, data["video_url"],
                                      "改造失败,发送oss失败", "3001", str(data))
                 text = (
                     f"**负责人**: {data['name']}\n"
@@ -412,13 +418,12 @@ class CarryViode:
             tags = ','.join(filter(None, [
                 data['pq_label'],
                 data['channel_mark'],
-                data['tag_transport_channel'],
+                tag_transport_channel,
                 data['tag_transport_scene'],
                 data['tag_transport_keyword'],
-                data['tag'],
                 "搬运改造"
             ]))
-            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags)
+            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel)