zhangyong 7 months ago
parent
commit
3e390cca29
2 changed files with 7 additions and 6 deletions
  1. 2 2
      data_channel/piaoquan.py
  2. 5 4
      video_rewriting/video_processor.py

+ 2 - 2
data_channel/piaoquan.py

@@ -291,8 +291,8 @@ class PQ:
     def decrypt_video(cls, data: bytes, decode_key: int, enc_length: int = 131072) -> bytes:
         try:
             ffi = cffi.FFI()
-            # lib = ffi.dlopen(r'/Users/tzld/Desktop/video_rewriting/libsph_decrypt.dylib')
-            lib = ffi.dlopen(r'/root/video_rewriting/libsph_decrypt.so')
+            lib = ffi.dlopen(r'/Users/tzld/Desktop/video_rewriting/libsph_decrypt.dylib')
+            # lib = ffi.dlopen(r'/root/video_rewriting/libsph_decrypt.so')
             ffi.cdef('void decrypt(unsigned char *data, const size_t data_length, const uint32_t key);')
 
             c_data = ffi.new('unsigned char[]', list(data))

+ 5 - 4
video_rewriting/video_processor.py

@@ -36,11 +36,12 @@ class VideoProcessor:
     """
 
     @classmethod
-    def create_folders(cls, mark, task_mark):
+    def create_folders(cls, mark):
         """
         根据标示和任务标示创建目录
         """
-        video_path_url = config['PATHS']['VIDEO_PATH'] + mark + "/" + task_mark + "/"
+        id = cls.random_id()
+        video_path_url = config['PATHS']['VIDEO_PATH'] + mark + "/" + str(id) + "/"
         if not os.path.exists(video_path_url):
             os.makedirs(video_path_url)
         return video_path_url
@@ -92,7 +93,7 @@ class VideoProcessor:
             voice = random.choice(voices)
         else:
             voice = "zhifeng_emo"
-        video_path_url = cls.create_folders(mark, str(task_mark))
+        video_path_url = cls.create_folders(mark)
         zm = Material.get_pzsrt_data("summary", "500Oe0", video_share)
         Common.logger(mark).info(f"{name}的{task_mark}下{channel_id}的用户:{url}开始获取视频")
         data_list = cls.get_data_list(channel_id, task_mark, url, number, mark, feishu_id, cookie_sheet, name, task)
@@ -544,7 +545,7 @@ class VideoProcessor:
             if mark == 'pl-gjc' and task['channel_id'] == '抖音搜索':
                 count = get_first_value_with_prefix()
                 increment_key()
-                if int(count) == 100:
+                if int(count) == 300:
                     Common.logger(mark).log(f"抖音搜索接口今日已经上限")
                     return "抖音搜索上限"
             VideoProcessor.process_task(task, mark, name, feishu_id, cookie_sheet)