multiscript-windows 1.0.7__tar.gz → 1.0.8__tar.gz

{multiscript_windows-1.0.7 → multiscript_windows-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiscript-windows
-Version: 1.0.7
+Version: 1.0.8
 Summary: A lightweight wrapper to run Batch and VBScript within Python.
 Author-email: KingTheCoder <kingjd490@gmail.com>
 License: GPL-3.0-only
@@ -124,6 +124,14 @@ Fixed unclear wording in `README.md`.
 
 Fixed examples in `README.md`.
 
+## 1.0.7
+
+Changed homepage to https://github.com/KingTheCoder314/multiscript-windows.
+
+## 1.0.8
+
+Changed `multiscript.py` to use one template for script functions.
+
 ## Some Extra
 
 Hey, thanks for reading all the way to the end!

{multiscript_windows-1.0.7 → multiscript_windows-1.0.8}/README.md

@@ -108,6 +108,14 @@ Fixed unclear wording in `README.md`.
 
 Fixed examples in `README.md`.
 
+## 1.0.7
+
+Changed homepage to https://github.com/KingTheCoder314/multiscript-windows.
+
+## 1.0.8
+
+Changed `multiscript.py` to use one template for script functions.
+
 ## Some Extra
 
 Hey, thanks for reading all the way to the end!

{multiscript_windows-1.0.7 → multiscript_windows-1.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "multiscript-windows"
-version = "1.0.7"
+version = "1.0.8"
 authors = [
   { name="KingTheCoder", email="kingjd490@gmail.com" },
 ]

{multiscript_windows-1.0.7 → multiscript_windows-1.0.8}/src/multiscript/multiscript.py

@@ -2,12 +2,12 @@ import os, subprocess, uuid
 
 def gentempname(ext):
     return "tmp_" + uuid.uuid4().hex[:16] + ext
-
-def batchscript(scr, err=False, rcd=False):
-    fname = gentempname(".bat")
+    
+def scriptexec(scr, err, rcd, ext, cmd):
+    fname = gentempname(ext)
     with open(fname, "w") as batfile:
         batfile.write(scr)
-    snd = subprocess.run(["cmd.exe", "/c", fname], capture_output=True, text=True)
+    snd = subprocess.run(cmd + [fname], capture_output=True, text=True)
     rtn = snd.stdout
     if err:
         rtn = (rtn + "\n" + snd.stderr)
@@ -15,6 +15,9 @@ def batchscript(scr, err=False, rcd=False):
         rtn = (rtn + "\n" + str(snd.returncode))
     os.remove(fname)
     return rtn
+
+def batchscript(scr, err=False, rcd=False):
+    return scriptexec(scr, err, rcd, ".bat", ["cmd.exe", "/c",])
 def commandlist():
     print(
 """
@@ -33,33 +36,13 @@ The usewscript argument controls if cscript or wscript is used to execute.
 """
     )  
 def vbscript(scr, err=False, rcd=False, wsc=False):
-    fname = gentempname(".vbs")
-    with open(fname, "w") as vbsfile:
-        vbsfile.write(scr)
     if wsc:
-        snd = subprocess.run(["wscript.exe", fname], capture_output=True, text=True)
+        return scriptexec(scr, err, rcd, ".vbs", ["wscript.exe"])
     else:
-        snd = subprocess.run(["cscript.exe", "//Nologo", fname], capture_output=True, text=True)
-    rtn = snd.stdout
-    if err:
-        rtn = (rtn + "\n" + snd.stderr)
-    if rcd:
-        rtn = (rtn + "\n" + str(snd.returncode))
-    os.remove(fname)
-    return rtn
+        return scriptexec(scr, err, rcd, ".vbs", ["cscript.exe", "//Nologo"])
 def javascript(scr, err=False, rcd=False, wsc=False):
-    fname = gentempname(".js")
-    with open(fname, "w") as jsfile:
-        jsfile.write(scr)
     if wsc:
-        snd = subprocess.run(["wscript.exe", "//E:jscript", fname], capture_output=True, text=True)
+        return scriptexec(scr, err, rcd, ".js", ["wscript.exe", "//E:jscript"])
     else:
-        snd = subprocess.run(["cscript.exe", "//Nologo", "//E:jscript", fname], capture_output=True, text=True)
-    rtn = snd.stdout
-    if err:
-        rtn = rtn + "\n" + snd.stderr
-    if rcd:
-        rtn = rtn + "\n" + str(snd.returncode)
-    os.remove(fname)
-    return rtn
+        return scriptexec(scr, err, rcd, ".js", ["cscript.exe", "//Nologo", "//E:jscript"])
         

{multiscript_windows-1.0.7 → multiscript_windows-1.0.8}/src/multiscript_windows.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiscript-windows
-Version: 1.0.7
+Version: 1.0.8
 Summary: A lightweight wrapper to run Batch and VBScript within Python.
 Author-email: KingTheCoder <kingjd490@gmail.com>
 License: GPL-3.0-only
@@ -124,6 +124,14 @@ Fixed unclear wording in `README.md`.
 
 Fixed examples in `README.md`.
 
+## 1.0.7
+
+Changed homepage to https://github.com/KingTheCoder314/multiscript-windows.
+
+## 1.0.8
+
+Changed `multiscript.py` to use one template for script functions.
+
 ## Some Extra
 
 Hey, thanks for reading all the way to the end!