toolkits 0.2.8__py3-none-any.whl → 0.2.9__py3-none-any.whl

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))
 
 

{toolkits-0.2.8.dist-info → toolkits-0.2.9.dist-info}/METADATA

@@ -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.dist-info → toolkits-0.2.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
-toolkits-0.2.8.dist-info/METADATA,sha256=121FvPMYfCOhTy7dYjZwzJBMQ461qD70MCQqpF6PkYs,1157
-toolkits-0.2.8.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-toolkits-0.2.8.dist-info/entry_points.txt,sha256=ioUpExuekI3N4XaBZ8NKV1mx0DZnKWLkg2PoGICq6OY,72
+toolkits-0.2.9.dist-info/METADATA,sha256=hOzP91GG1CrzEbDHiUrLcpF9Q7DmxZEUearWc5tPghU,1157
+toolkits-0.2.9.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+toolkits-0.2.9.dist-info/entry_points.txt,sha256=ioUpExuekI3N4XaBZ8NKV1mx0DZnKWLkg2PoGICq6OY,72
 toolkits/3des/3des.py,sha256=DWfAUGtU7U74GrpnIgA8ZEw7R-kKWyKGfv3Ycqachlw,3400
 toolkits/3des/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/__init__.py,sha256=CBKKalWuRi-mXuf2iwrAI5zzzGcUU5e8xhQNgqBERmg,50
@@ -42,7 +42,7 @@ toolkits/system/load_module.py,sha256=UXNfE9drsfz9oOBq9EGdV4gjmiIYlJQECIt3PFaLxw
 toolkits/system/priority_tasks.py,sha256=eUtKQatAnYcV3f3V3XY4FQ0u3afX8NHuqiBRcuv0d0I,7632
 toolkits/system/process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/system/process_monitor/process_monitor.py,sha256=_tXmWSOzAqAlHeGiBPrMGFU1Wjdr4zUAKNSPucqGRO8,12887
-toolkits/system/shell_helper.py,sha256=BzQgPFj1Lg7QdhDxXFaZ9XlkZRIyixvEhZyoSXSdrDE,9099
+toolkits/system/shell_helper.py,sha256=sjoeVczxRyn_45bm-M95nAbEmz3ENffiWraivCxL0o4,9632
 toolkits/system/str_helper.py,sha256=89qw0jF6Pf19uuMhBh7XFoCxHvEiZztPwlCDdYuPBEQ,5096
 toolkits/system/tasks_deamon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/system/tasks_deamon/tasks_controller.py,sha256=aobnJ0vJmvHQs94-yXasHqyxGsBHrv8Vqd1lq6JtmOo,2380
@@ -53,4 +53,4 @@ toolkits/system/time_helper.py,sha256=_nxy97rnnagCn_m5sppZTDsx2sdn5debsTfXPEjoWz
 toolkits/system/win32_env.py,sha256=KYkZ-clZYkSQnSvPvpydeOVepaCrPH0egkC-MY-Bs0w,1829
 toolkits/tookits_app.py,sha256=2qz6V5XkEGc6NjxafFvFavE1hpt-tE0PoGonLAvZNXs,380
 toolkits/tookits_cli.py,sha256=PZmhHLqm8rhLOl3_Fty6WPkW4UxIHMGcswxaHrOe_Ek,5274
-toolkits-0.2.8.dist-info/RECORD,,
+toolkits-0.2.9.dist-info/RECORD,,

{toolkits-0.2.8.dist-info → toolkits-0.2.9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.4)
+Generator: pdm-backend (2.4.5)
 Root-Is-Purelib: true
 Tag: py3-none-any