kkpyutil 1.33.0__py3-none-any.whl → 1.33.3__py3-none-any.whl

{kkpyutil-1.33.0.dist-info → kkpyutil-1.33.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kkpyutil
-Version: 1.33.0
+Version: 1.33.3
 Summary: Building blocks for sysadmin and DevOps
 Home-page: https://github.com/kakyoism/kkpyutil/
 License: MIT

kkpyutil-1.33.3.dist-info/RECORD

@@ -0,0 +1,7 @@
+kkpyutil.py,sha256=SZkL5zn8I5c-n07PBQ9x-D36bRVMTJQa0nvqYGEsaDQ,107200
+kkpyutil_helper/windows/kkttssave.ps1,sha256=xa3-WzqNh2rGYlOx_I4ewOuCE94gkTO5cEwYH0M67_0,446
+kkpyutil_helper/windows/kkttsspeak.ps1,sha256=7WUUHMmjTQroUWA2Mvdt4JtSt475nZUHQx-qP-7rS6o,305
+kkpyutil-1.33.3.dist-info/LICENSE,sha256=uISevGnCxB5QOU0ftbofN75_yUtd6E2h_MWE1zqagC8,1065
+kkpyutil-1.33.3.dist-info/METADATA,sha256=0--MqyDThQpYZaRVP4vPImxTy0noyJbu8Yslf1QcTNQ,1136
+kkpyutil-1.33.3.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+kkpyutil-1.33.3.dist-info/RECORD,,

kkpyutil.py

@@ -584,9 +584,25 @@ def get_clipboard_content():
 
 
 def alert(content, title='Debug', action='Close'):
+    """
+    - on Windows, mshta msgbox does not support custom button text
+    - so "action" is ignored on windows
+    - multiline message uses \n as line separator
+    - mshta (ms html application host) tend to open vbs using text editor; so we use dedicated vbscript cli instead
+    """
     if PLATFORM == 'Windows':
-        cmd = ['mshta', f'vbscript:Execute("msgbox ""{content}"", 0,""{title}"":{action}")']
-        os.system(' '.join(cmd))
+        # Escape double quotes inside content and title for VBScript
+        # vbs uses its own line-end
+        content = content.replace('\n', '" & vbCrLf & "').replace('"', '""')
+        title = title.replace('"', '""')
+        # Construct the VBScript command for the message box
+        vbs_content = f'MsgBox "{content}", 0, "{title}"'
+        vbs = osp.join(get_platform_tmp_dir(), 'msg.vbs')
+        save_text(vbs, vbs_content)
+        cmd = ['cscript', '//Nologo', vbs]
+        subprocess.run(cmd, shell=True)
+        # Clean up the temporary file
+        os.remove(vbs)
         return cmd
     if PLATFORM == 'Darwin':
         cmd = ['osascript', '-e', f'display alert "{title}" message "{content}"']

kkpyutil-1.33.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-kkpyutil.py,sha256=Eavzqsw6lUTaUPh69v_Oy2MKEV5J99qUHZjrAoxh5lY,106457
-kkpyutil_helper/windows/kkttssave.ps1,sha256=xa3-WzqNh2rGYlOx_I4ewOuCE94gkTO5cEwYH0M67_0,446
-kkpyutil_helper/windows/kkttsspeak.ps1,sha256=7WUUHMmjTQroUWA2Mvdt4JtSt475nZUHQx-qP-7rS6o,305
-kkpyutil-1.33.0.dist-info/LICENSE,sha256=uISevGnCxB5QOU0ftbofN75_yUtd6E2h_MWE1zqagC8,1065
-kkpyutil-1.33.0.dist-info/METADATA,sha256=mpP-kFpF1tSKRyhSKgXCBnM7jqd4GSv-JFdiixgmm-k,1136
-kkpyutil-1.33.0.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-kkpyutil-1.33.0.dist-info/RECORD,,