update

workers/consumption_work.py

@@ -29,8 +29,8 @@ from utils.tts_help import TTS
 
 
 
-CACHE_DIR = '/app/cache/'
-# CACHE_DIR = '/Users/z/Downloads/'
+# CACHE_DIR = '/app/cache/'
+CACHE_DIR = '/Users/z/Downloads/'
 class ConsumptionRecommend(object):
     @classmethod
     def insert_pq(cls, data, oss_object_key, title, tags, tag_transport_channel, channel_mark, task_mark):
@@ -363,7 +363,7 @@ class ConsumptionRecommend(object):
                                                   "https://open.feishu.cn/open-apis/bot/v2/hook/65bc5463-dee9-46d0-bc2d-ec6c49a8f3cd",
                                                   "【 搬运&改造效率工具失败通知 】")
                                 return
-                            jpg_path = FFmpeg.video_640(rg_pw_list, file_path + "rg_")
+                            jpg_path = FFmpeg.video_640(rg_pw_list, file_path)
                             logger.info(f"[处理] 生成人工片尾成功")
                     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:
@@ -434,30 +434,44 @@ class ConsumptionRecommend(object):
 
     @classmethod
     def run(cls):
-        logger.info(f"[处理] 开始获取redis数据")
-        fs_data = os.getenv("FS_DATA")
-        # fs_data = '邓锋,DEpi6V,task:carry_data_redis_df'
-        fs_data_list = fs_data.split(',')
-        redis_name = fs_data_list[2]
-        data = RedisHelper().get_client().rpop(name = redis_name)
-        if not data:
-            logger.info('[处理] 无待执行的扫描任务')
-            return
-        data = orjson.loads(data)
         uid = str(uuid.uuid4())
         file_path = os.path.join(CACHE_DIR, uid)
-        cls.data_handle(data, file_path, redis_name)
-        for filename in os.listdir(CACHE_DIR):
-            # 检查文件名是否包含关键字
-            if uid in filename:
-                file_path = os.path.join(CACHE_DIR, filename)
-                try:
-                    # 删除文件
-                    os.remove(file_path)
-                    logger.info(f"已删除文件: {file_path}")
-                except Exception as e:
-                    logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
-        return
+        try:
+            logger.info(f"[处理] 开始获取redis数据")
+            fs_data = os.getenv("FS_DATA")
+            # fs_data = '邓锋,DEpi6V,task:carry_data_redis_df'
+            fs_data_list = fs_data.split(',')
+            redis_name = fs_data_list[2]
+            data = RedisHelper().get_client().rpop(name = redis_name)
+            if not data:
+                logger.info('[处理] 无待执行的扫描任务')
+                return
+            data = orjson.loads(data)
+
+            cls.data_handle(data, file_path, redis_name)
+            for filename in os.listdir(CACHE_DIR):
+                # 检查文件名是否包含关键字
+                if uid in filename:
+                    file_path = os.path.join(CACHE_DIR, filename)
+                    try:
+                        # 删除文件
+                        os.remove(file_path)
+                        logger.info(f"已删除文件: {file_path}")
+                    except Exception as e:
+                        logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
+            return
+        except Exception as e:
+            for filename in os.listdir(CACHE_DIR):
+                # 检查文件名是否包含关键字
+                if uid in filename:
+                    file_path = os.path.join(CACHE_DIR, filename)
+                    try:
+                        # 删除文件
+                        os.remove(file_path)
+                        logger.info(f"已删除文件: {file_path}")
+                    except Exception as e:
+                        logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
+            return
 
 
 

workers/consumption_work_studio.py

@@ -249,18 +249,32 @@ class ConsumptionRecommend(object):
         data = orjson.loads(data)
         uid = str(uuid.uuid4())
         file_path = os.path.join(CACHE_DIR, uid)
-        cls.data_handle(data, file_path)
-        for filename in os.listdir(CACHE_DIR):
-            # 检查文件名是否包含关键字
-            if uid in filename:
-                file_path = os.path.join(CACHE_DIR, filename)
-                try:
-                    # 删除文件
-                    os.remove(file_path)
-                    logger.info(f"已删除文件: {file_path}")
-                except Exception as e:
-                    logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
-        return
+        try:
+            cls.data_handle(data, file_path)
+            for filename in os.listdir(CACHE_DIR):
+                # 检查文件名是否包含关键字
+                if uid in filename:
+                    file_path = os.path.join(CACHE_DIR, filename)
+                    try:
+                        # 删除文件
+                        os.remove(file_path)
+                        logger.info(f"已删除文件: {file_path}")
+                    except Exception as e:
+                        logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
+            return
+
+        except Exception as e:
+            for filename in os.listdir(CACHE_DIR):
+                # 检查文件名是否包含关键字
+                if uid in filename:
+                    file_path = os.path.join(CACHE_DIR, filename)
+                    try:
+                        # 删除文件
+                        os.remove(file_path)
+                        logger.info(f"已删除文件: {file_path}")
+                    except Exception as e:
+                        logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
+            return
 
 
 def run():