Compare commits

...

3 Commits

Author SHA1 Message Date
Ruben P
55b6b611a6 Merge d190a60ff7 into bce92001a6 2024-06-28 19:53:05 +02:00
breakheart
bce92001a6 fix: use correct Spoolman directory name (#486) 2024-06-28 17:46:19 +02:00
Ruben P
d190a60ff7 add an option to terminate or not subprocess
default is true (same behavior as now)
2022-08-29 23:17:51 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -18,6 +18,7 @@ class ShellCommand:
self.command = shlex.split(cmd) self.command = shlex.split(cmd)
self.timeout = config.getfloat('timeout', 2., above=0.) self.timeout = config.getfloat('timeout', 2., above=0.)
self.verbose = config.getboolean('verbose', True) self.verbose = config.getboolean('verbose', True)
self.terminate = config.getboolean('terminate', True)
self.proc_fd = None self.proc_fd = None
self.partial_output = "" self.partial_output = ""
self.gcode.register_mux_command( self.gcode.register_mux_command(
@@ -68,7 +69,7 @@ class ShellCommand:
if proc.poll() is not None: if proc.poll() is not None:
complete = True complete = True
break break
if not complete: if not complete and self.terminate:
proc.terminate() proc.terminate()
if self.verbose: if self.verbose:
if self.partial_output: if self.partial_output:

View File

@@ -89,7 +89,7 @@ function set_globals() {
OCTOAPP_REPO="https://github.com/crysxd/OctoApp-Plugin.git" OCTOAPP_REPO="https://github.com/crysxd/OctoApp-Plugin.git"
#=============== Spoolman ================# #=============== Spoolman ================#
SPOOLMAN_DIR="${HOME}/spoolman" SPOOLMAN_DIR="${HOME}/Spoolman"
SPOOLMAN_DB_DIR="${HOME}/.local/share/spoolman" SPOOLMAN_DB_DIR="${HOME}/.local/share/spoolman"
SPOOLMAN_REPO="https://api.github.com/repos/Donkie/Spoolman/releases/latest" SPOOLMAN_REPO="https://api.github.com/repos/Donkie/Spoolman/releases/latest"
} }