update

data/porter_tasks/porter_task_chenjieshen_douyin_live_record_to_youtube.json

@@ -4,6 +4,7 @@
     "type": "douyin_live_record",
     "room_name": "老陈的退路",
     "room_id": "330025930592",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -13,6 +14,7 @@
     "type": "douyin_live_record",
     "room_name": "老陈come_back",
     "room_id": "78835697536",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -22,6 +24,7 @@
     "type": "douyin_live_record",
     "room_name": "清源第一帅",
     "room_id": "654177813521",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -31,6 +34,7 @@
     "type": "douyin_live_record",
     "room_name": "清源第二帅",
     "room_id": "831568261978",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -40,6 +44,7 @@
     "type": "douyin_live_record",
     "room_name": "清源第三帅",
     "room_id": "26569028431",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -49,6 +54,7 @@
     "type": "douyin_live_record",
     "room_name": "清源人工智能研究院",
     "room_id": "81728900292",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -58,6 +64,7 @@
     "type": "douyin_live_record",
     "room_name": "小熊Bella与老爸",
     "room_id": "139751520143",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -67,6 +74,7 @@
     "type": "douyin_live_record",
     "room_name": "清源之虎",
     "room_id": "998621457719",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -76,6 +84,7 @@
     "type": "douyin_live_record",
     "room_name": "老陈真是好人",
     "room_id": "599130203190",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
@@ -85,6 +94,7 @@
     "type": "douyin_live_record",
     "room_name": "老陈小帮手",
     "room_id": "738682070097",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
     "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"

data/porter_tasks/porter_task_chenjieshen_douyin_live_to_bilibili_live.json

@@ -5,7 +5,8 @@
     "room_name": "老陈的退路",
     "room_id": "330025930592",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -13,7 +14,8 @@
     "room_name": "老陈come_back",
     "room_id": "78835697536",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -21,7 +23,8 @@
     "room_name": "清源第一帅",
     "room_id": "654177813521",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -29,16 +32,17 @@
     "room_name": "清源第二帅",
     "room_id": "831568261978",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
-    "type": "douyin_live_record",
+    "type": "douyin_live_to_bilibili_live",
     "room_name": "清源第三帅",
     "room_id": "26569028431",
     "check_interval": 10,
-    "output_video_dir": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森",
-    "output_video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_youtube/live_record/陈杰森/file_info.json"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -46,7 +50,8 @@
     "room_name": "清源人工智能研究院",
     "room_id": "81728900292",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -54,7 +59,8 @@
     "room_name": "小熊Bella与老爸",
     "room_id": "139751520143",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -62,7 +68,8 @@
     "room_name": "清源之虎",
     "room_id": "998621457719",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -70,7 +77,8 @@
     "room_name": "老陈真是好人",
     "room_id": "599130203190",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   },
   {
     "enable": true,
@@ -78,6 +86,7 @@
     "room_name": "老陈小帮手",
     "room_id": "738682070097",
     "check_interval": 10,
-    "key_of_credentials": "bilibili_chenjiesen_credentials"
+    "key_of_douyin_credentials": "douyin_wentao_credentials",
+    "key_of_bilibili_credentials": "bilibili_chenjiesen_credentials"
   }
 ]

data/porter_tasks/porter_task_chenjing_douyin_live_record_to_youtube.json

@@ -4,6 +4,7 @@
     "type": "douyin_live_record",
     "room_name": "大成说创业",
     "room_id": "29576618707",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/chenjing_douyin_live_record_to_youtube/live_record/",
     "output_video_info_file": "data/tasks/chenjing_douyin_live_record_to_youtube/live_record/清华陈晶/file_info.json"

data/porter_tasks/porter_task_huchenfeng_douyin_live_record_to_youtube.json

@@ -4,6 +4,7 @@
     "type": "douyin_live_record",
     "room_name": "户子刺身",
     "room_id": "84446810554",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/huchenfeng_douyin_live_record_to_youtube/live_record/户晨风",
     "output_video_info_file": "data/tasks/huchenfeng_douyin_live_record_to_youtube/live_record/户晨风/file_info.json"
@@ -13,6 +14,7 @@
     "type": "douyin_live_record",
     "room_name": "户晨风说真话",
     "room_id": "49379702184",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/huchenfeng_douyin_live_record_to_youtube/live_record/户晨风",
     "output_video_info_file": "data/tasks/huchenfeng_douyin_live_record_to_youtube/live_record/户晨风/file_info.json"
@@ -22,6 +24,7 @@
     "type": "douyin_live_record",
     "room_name": "户晨风实话实说",
     "room_id": "36333641076",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/huchenfeng_douyin_live_record_to_youtube/live_record/户晨风",
     "output_video_info_file": "data/tasks/huchenfeng_douyin_live_record_to_youtube/live_record/户晨风/file_info.json"

data/porter_tasks/porter_task_lvxiaotong_douyin_live_record_to_youtube.json

@@ -4,6 +4,7 @@
     "type": "douyin_live_record",
     "room_name": "吕晓彤",
     "room_id": "25132757833",
+    "key_of_credentials": "douyin_wentao_credentials",
     "check_interval": 10,
     "output_video_dir": "data/tasks/lvxiaotong_douyin_live_record_to_youtube/live_record/吕晓彤",
     "output_video_info_file": "data/tasks/lvxiaotong_douyin_live_record_to_youtube/live_record/吕晓彤/file_info.json"

tabs/shell_tab.py

@@ -21,6 +21,25 @@ def get_shell_tab():
             outputs=[shell_output],
         )
 
+        gr.Examples(
+            examples=[
+                [
+                    "echo \"CPU使用率: $(grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage \"%\"}')\""
+                ],
+                [
+                    "echo \"内存使用: $(free -m | awk '/Mem:/ {printf \"%.1f%%\", $3/$2*100}')\""
+                ],
+                [
+                    "echo \"内存总量: $(grep MemTotal /proc/meminfo | awk '{print $2/1024 \" MB\"}')\""
+                ],
+                [
+                    "echo \"可用内存: $(grep MemAvailable /proc/meminfo | awk '{print $2/1024 \" MB\"}')\""
+                ]
+            ],
+            inputs=[shell_text],
+            outputs=[shell_output],
+        )
+
     return locals()
 
 

toolbox/porter/tasks/douyin_live_record_task.py

@@ -33,6 +33,7 @@ class DouyinLiveRecordTask(BaseTask):
     def __init__(self,
                  room_name: str,
                  room_id: str,
+                 key_of_credentials: str,
                  check_interval: int,
                  output_video_dir: str = "output",
                  output_video_info_file: str = "output.json",
@@ -43,6 +44,7 @@ class DouyinLiveRecordTask(BaseTask):
         )
         self.room_name = room_name
         self.room_id = room_id
+        self.key_of_credentials = key_of_credentials
 
         if not os.path.isabs(output_video_dir):
             self.output_video_dir = project_path / output_video_dir
@@ -53,7 +55,11 @@ class DouyinLiveRecordTask(BaseTask):
         else:
             self.output_video_info_file = Path(output_video_info_file)
 
+        credentials_info = environment.get(self.key_of_credentials, dtype=json.loads)
         self.douyin_client = LiveRecording()
+        self.douyin_client.login_with_credentials_info(
+            credentials_info=credentials_info
+        )
 
         # state
         self.ssl_verify = True

toolbox/porter/tasks/douyin_live_to_bilibili_live_task.py

@@ -30,7 +30,8 @@ class DouyinLiveToBilibiliLiveTask(BaseTask):
                  room_name: str,
                  room_id: str,
                  check_interval: int,
-                 key_of_credentials: str,
+                 key_of_douyin_credentials: str,
+                 key_of_bilibili_credentials: str,
                  ):
         super().__init__(
             flag=f"[{self.__class__.__name__}_{room_name}]",
@@ -38,12 +39,19 @@ class DouyinLiveToBilibiliLiveTask(BaseTask):
         )
         self.room_name = room_name
         self.room_id = room_id
-        self.key_of_credentials = key_of_credentials
+        self.key_of_douyin_credentials = key_of_douyin_credentials
+        self.key_of_bilibili_credentials = key_of_bilibili_credentials
 
+        credentials_info = environment.get(self.key_of_douyin_credentials, dtype=json.loads)
         self.douyin_client = DouyinLiveRecording()
+        self.douyin_client.login_with_credentials_info(
+            credentials_info=credentials_info
+        )
+
+        credentials_info = environment.get(self.key_of_bilibili_credentials, dtype=json.loads)
         self.bilibili_client = BilibiliLiveManager()
         self.bilibili_client.login_with_credentials_info(
-            credentials_info=environment.get(self.key_of_credentials, dtype=json.loads)
+            credentials_info=credentials_info
         )
 
         # success_rate