toolkits 0.2.8__tar.gz → 0.2.9__tar.gz

{toolkits-0.2.8 → toolkits-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolkits
-Version: 0.2.8
+Version: 0.2.9
 Summary: toolkits for quickly reference
 Author-Email: li_jia_yue <59727816@qq.com>
 License: MIT

{toolkits-0.2.8 → toolkits-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toolkits"
-version = "0.2.8"
+version = "0.2.9"
 description = "toolkits for quickly reference"
 authors = [
     { name = "li_jia_yue", email = "59727816@qq.com" },

{toolkits-0.2.8 → toolkits-0.2.9}/src/toolkits/system/shell_helper.py

@@ -150,6 +150,21 @@ async def run_command_async(command, timeout=5, encoding="utf-8", shell=False, c
         return ret
 
 
+def get_loop_obj():
+    try:
+        # 尝试获取当前线程的事件循环（可能会失败）
+        loop = asyncio.get_event_loop()
+    except RuntimeError as e:
+        # 如果报错 "There is no current event loop..."，则创建新的事件循环
+        if "There is no current event loop" in str(e):
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+        else:
+            # 其他 RuntimeError 直接抛出
+            raise
+    return loop
+
+
 def exec_shell_async(command, timeout=60 * 10, encoding="utf-8", cwd=None, env=None):
     """
     异常执行命令，检测执行时间超时
@@ -169,7 +184,8 @@ def exec_shell_async(command, timeout=60 * 10, encoding="utf-8", cwd=None, env=N
         }
         return ret
 
-    loop = asyncio.get_event_loop()
+    # asyncio.get_event_loop()
+    loop = get_loop_obj()
     return loop.run_until_complete(run_command_async(command, timeout=timeout, encoding=encoding, cwd=cwd, env=env))