xtn-tools-pro 1.0.1.0.8__py3-none-any.whl → 1.0.1.0.9__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- xtn_tools_pro/utils/shell.py +10 -4
- {xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.0.9.dist-info}/METADATA +1 -1
- {xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.0.9.dist-info}/RECORD +7 -7
- {xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.0.9.dist-info}/LICENSE +0 -0
- {xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.0.9.dist-info}/WHEEL +0 -0
- {xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.0.9.dist-info}/entry_points.txt +0 -0
- {xtn_tools_pro-1.0.1.0.8.dist-info → xtn_tools_pro-1.0.1.0.9.dist-info}/top_level.txt +0 -0
xtn_tools_pro/utils/shell.py
CHANGED
@@ -8,6 +8,8 @@
|
|
8
8
|
# --------------------------------------------------------------------------------------------------
|
9
9
|
# 2025/4/2 xiatn V00.01.000 新建
|
10
10
|
# --------------------------------------------------------------------------------------------------
|
11
|
+
import os
|
12
|
+
|
11
13
|
from fabric import Connection, Config
|
12
14
|
from xtn_tools_pro.utils.log import Log
|
13
15
|
|
@@ -34,14 +36,17 @@ class ShellPro:
|
|
34
36
|
self.server_info_list[_]["conn"] = conn
|
35
37
|
self.__logger.info(f"{tips} 连接成功!!!")
|
36
38
|
|
37
|
-
def run_shell(self, conn, cmd, warn=False):
|
39
|
+
def run_shell(self, conn, cmd, warn=False, hide=True,tips=""):
|
38
40
|
"""
|
39
41
|
传入conn和命令执行
|
40
42
|
:param conn:
|
41
43
|
:param cmd:
|
44
|
+
:param warn:
|
45
|
+
:param hide: 隐藏命令输出(减少控制台噪音)
|
46
|
+
:param tips: 备注信息
|
42
47
|
:return:
|
43
48
|
"""
|
44
|
-
conn.run(cmd, warn=warn)
|
49
|
+
conn.run(cmd, warn=warn, hide=True)
|
45
50
|
|
46
51
|
def update_file(self, local_file, remote_file, mkdir=False):
|
47
52
|
"""
|
@@ -56,8 +61,9 @@ class ShellPro:
|
|
56
61
|
tips = server_item["tips"]
|
57
62
|
conn = server_item["conn"]
|
58
63
|
if mkdir:
|
59
|
-
|
60
|
-
|
64
|
+
remote_dir = os.path.dirname(remote_file)
|
65
|
+
cmd = f"mkdir -p {remote_dir}"
|
66
|
+
self.run_shell(conn, cmd=cmd, warn=True,tips=tips)
|
61
67
|
conn.put(local_file, remote_file)
|
62
68
|
self.__logger.info(f"{tips}-{ip} 覆盖远程文件成功!!!")
|
63
69
|
|
@@ -59,12 +59,12 @@ xtn_tools_pro/utils/helpers.py,sha256=OmPRxB6vDN1S7OhxQWgoOXnxs2YPorwSQKBVzYOiKo
|
|
59
59
|
xtn_tools_pro/utils/log.py,sha256=mf5huJDA8xVxxFWPG_tl_vOsAA2_ywGDFycYSGHIDCo,10202
|
60
60
|
xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
|
61
61
|
xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
|
62
|
-
xtn_tools_pro/utils/shell.py,sha256=
|
62
|
+
xtn_tools_pro/utils/shell.py,sha256=pWOL0hrpqSqwoyJP-A0PcQiD9H1rlQ_ppD63YqvwqWE,2893
|
63
63
|
xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
|
64
64
|
xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
|
65
|
-
xtn_tools_pro-1.0.1.0.
|
66
|
-
xtn_tools_pro-1.0.1.0.
|
67
|
-
xtn_tools_pro-1.0.1.0.
|
68
|
-
xtn_tools_pro-1.0.1.0.
|
69
|
-
xtn_tools_pro-1.0.1.0.
|
70
|
-
xtn_tools_pro-1.0.1.0.
|
65
|
+
xtn_tools_pro-1.0.1.0.9.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
66
|
+
xtn_tools_pro-1.0.1.0.9.dist-info/METADATA,sha256=8MPSg9LUGunHt5Uw7Nw_nndkfjhEd2_zrjWgW2JD6Mc,523
|
67
|
+
xtn_tools_pro-1.0.1.0.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
68
|
+
xtn_tools_pro-1.0.1.0.9.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
|
69
|
+
xtn_tools_pro-1.0.1.0.9.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
|
70
|
+
xtn_tools_pro-1.0.1.0.9.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|