kkpyutil 1.33.0__tar.gz → 1.33.3__tar.gz

{kkpyutil-1.33.0 → kkpyutil-1.33.3}/PKG-INFO

@@ -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.0 → kkpyutil-1.33.3}/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 → kkpyutil-1.33.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kkpyutil"
-version = "1.33.0"
+version = "1.33.3"
 description = "Building blocks for sysadmin and DevOps"
 authors = ["Beinan Li <li.beinan@gmail.com>"]
 maintainers = ["Beinan Li <li.beinan@gmail.com>"]