xtn-tools-pro 1.0.1.0.8__py3-none-any.whl → 1.0.1.1.0__py3-none-any.whl

xtn_tools_pro/utils/shell.py

@@ -8,6 +8,8 @@
 # --------------------------------------------------------------------------------------------------
 # 2025/4/2    xiatn     V00.01.000    新建
 # --------------------------------------------------------------------------------------------------
+import os
+
 from fabric import Connection, Config
 from xtn_tools_pro.utils.log import Log
 
@@ -34,14 +36,18 @@ class ShellPro:
             self.server_info_list[_]["conn"] = conn
             self.__logger.info(f"{tips} 连接成功!!!")
 
-    def run_shell(self, conn, cmd, warn=False):
+    def run_shell(self, conn, cmd, warn=False, hide=True, tips=""):
         """
             传入conn和命令执行
         :param conn:
         :param cmd:
+        :param warn:
+        :param hide: 隐藏命令输出（减少控制台噪音）
+        :param tips: 备注信息
         :return:
         """
-        conn.run(cmd, warn=warn)
+        conn.run(cmd, warn=warn, hide=hide)
+        self.__logger.info(f"{tips} {cmd}")
 
     def update_file(self, local_file, remote_file, mkdir=False):
         """
@@ -56,8 +62,9 @@ class ShellPro:
             tips = server_item["tips"]
             conn = server_item["conn"]
             if mkdir:
-                cmd = f"mkdir -p {remote_file}"
-                self.run_shell(conn, cmd=cmd, warn=True)
+                remote_dir = os.path.dirname(remote_file)
+                cmd = f"mkdir -p {remote_dir}"
+                self.run_shell(conn, cmd=cmd, warn=True, tips=tips)
             conn.put(local_file, remote_file)
             self.__logger.info(f"{tips}-{ip} 覆盖远程文件成功!!!")
 

{xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.1.0.8
+Version: 1.0.1.1.0
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.1.0.dist-info}/RECORD

@@ -59,12 +59,12 @@ xtn_tools_pro/utils/helpers.py,sha256=OmPRxB6vDN1S7OhxQWgoOXnxs2YPorwSQKBVzYOiKo
 xtn_tools_pro/utils/log.py,sha256=mf5huJDA8xVxxFWPG_tl_vOsAA2_ywGDFycYSGHIDCo,10202
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
-xtn_tools_pro/utils/shell.py,sha256=FhyxtQmjQgaBg0BSLWp4_SuW20e6rYImz8cndxYOwPg,2657
+xtn_tools_pro/utils/shell.py,sha256=2SeC620Fj2Gi4bSWmr6w9-OjOBR1MB_OfTEz5HIwK-k,2940
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.1.0.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.0.8.dist-info/METADATA,sha256=hI6Vp8AqAHAa7q11hrbtflD8W0Z4VSeD5dbAUYy9d88,523
-xtn_tools_pro-1.0.1.0.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.0.8.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.0.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.0.8.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.1.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.1.0.dist-info/METADATA,sha256=wWejR6GHUrWYHHcLsByY5hMr5ovaw0l1YMmABeGCnI4,523
+xtn_tools_pro-1.0.1.1.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.1.0.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.1.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.1.0.dist-info/RECORD,,