zhangyong 6 月之前
父節點
當前提交
c032b95331
共有 1 個文件被更改,包括 17 次插入6 次删除
  1. 17 6
      carry_video/carry_video.py

+ 17 - 6
carry_video/carry_video.py

@@ -104,7 +104,7 @@ class CarryViode:
             return None, None
 
 
-    def insert_pq(self, REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel):
+    def insert_pq(self, REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark):
         logger.info(f"[+] {REDIS_NAME}的{data}开始写入票圈")
         n_ids = str(data["pq_ids"])
         if ',' in n_ids:
@@ -142,7 +142,7 @@ class CarryViode:
                         str(code),
                         str(n_id),
                         formatted_time,
-                        data["channel_mark"],
+                        channel_mark,
                         data["name"],
                         data["pq_ids"],
                         data["pq_label"],
@@ -273,6 +273,16 @@ class CarryViode:
                 original_title if data["title_category"] == "原标题" else data["title_category"])
         else:
             title = original_title if data["title_category"] == "原标题" else data["title_category"]
+        if tag_transport_channel == "抖音":
+            if "复制打开抖音" in data['video_url']:
+                channel_mark = "APP"
+            else:
+                channel_mark = "PC"
+        else:
+            if "https://www.kuaishou.com/f" in data['video_url']:
+                channel_mark = "PC"
+            else:
+                channel_mark = "APP"
         if data["transform_rule"] == '否'or data["transform_rule"] == "是":
             logger.info(f"[+] {REDIS_NAME}的{data}数据开始发送oss")
             oss_object_key = Oss.stitching_sync_upload_oss(video_path, str(uuid.uuid4()))  # 视频发送OSS
@@ -294,13 +304,13 @@ class CarryViode:
             oss_object_key = oss_object_key.get("oss_object_key")
             tags = ','.join(filter(None, [
                 data['pq_label'],
-                data['channel_mark'],
+                channel_mark,
                 tag_transport_channel,
                 data['tag_transport_scene'],
                 data['tag_transport_keyword'],
                 "搬运工具"
             ]))
-            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel)
+            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark)
         if data["transform_rule"] == "仅改造" or data["transform_rule"] == "是":
             logger.info(f"[+] {REDIS_NAME}的{data}视频更改分辨率处理")
             video_path = FFmpeg.video_640(video_path, file_path)
@@ -432,15 +442,16 @@ class CarryViode:
                 return
             logger.info(f"[+] {REDIS_NAME}的{data}数据发送oss成功")
             oss_object_key = oss_object_key.get("oss_object_key")
+
             tags = ','.join(filter(None, [
                 data['pq_label'],
-                data['channel_mark'],
+                channel_mark,
                 tag_transport_channel,
                 data['tag_transport_scene'],
                 data['tag_transport_keyword'],
                 "搬运改造"
             ]))
-            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel)
+            self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark)