Private instance vars, public get properties
This commit is contained in:
@@ -28,11 +28,31 @@ class SingleShotEntry(Entry):
|
||||
timestamp: Creation timestamp for this entry
|
||||
"""
|
||||
super().__init__(id, timestamp)
|
||||
self.script = script
|
||||
self.stdout = ""
|
||||
self.stderr = ""
|
||||
self.exit_code: Optional[int] = None
|
||||
self._script = script
|
||||
self._stdout = ""
|
||||
self._stderr = ""
|
||||
self._exit_code: Optional[int] = None
|
||||
self._executed = False
|
||||
|
||||
@property
|
||||
def script(self) -> str:
|
||||
"""Get the script/command being executed."""
|
||||
return self._script
|
||||
|
||||
@property
|
||||
def stdout(self) -> str:
|
||||
"""Get the captured standard output."""
|
||||
return self._stdout
|
||||
|
||||
@property
|
||||
def stderr(self) -> str:
|
||||
"""Get the captured standard error."""
|
||||
return self._stderr
|
||||
|
||||
@property
|
||||
def exit_code(self) -> Optional[int]:
|
||||
"""Get the exit code of the process (None if still running)."""
|
||||
return self._exit_code
|
||||
|
||||
def update(self) -> None:
|
||||
"""
|
||||
@@ -52,21 +72,21 @@ class SingleShotEntry(Entry):
|
||||
)
|
||||
|
||||
# Store results
|
||||
self.stdout = process.stdout
|
||||
self.stderr = process.stderr
|
||||
self.exit_code = process.returncode
|
||||
self._stdout = process.stdout
|
||||
self._stderr = process.stderr
|
||||
self._exit_code = process.returncode
|
||||
|
||||
except subprocess.SubprocessError as e:
|
||||
# Handle subprocess errors by capturing the error message
|
||||
self.stdout = ""
|
||||
self.stderr = str(e)
|
||||
self.exit_code = -1
|
||||
self._stdout = ""
|
||||
self._stderr = str(e)
|
||||
self._exit_code = -1
|
||||
|
||||
except Exception as e:
|
||||
# Handle any other errors
|
||||
self.stdout = ""
|
||||
self.stderr = f"Error executing script: {str(e)}"
|
||||
self.exit_code = -1
|
||||
self._stdout = ""
|
||||
self._stderr = f"Error executing script: {str(e)}"
|
||||
self._exit_code = -1
|
||||
|
||||
self._executed = True
|
||||
|
||||
@@ -89,13 +109,13 @@ class SingleShotEntry(Entry):
|
||||
if self._executed:
|
||||
# Add stdout element if there is output
|
||||
stdout_elem = ET.SubElement(element, "stdout")
|
||||
stdout_elem.text = escape_text_for_xml(self.stdout)
|
||||
stdout_elem.text = escape_text_for_xml(self._stdout)
|
||||
|
||||
# Add stderr element if there are errors
|
||||
stderr_elem = ET.SubElement(element, "stderr")
|
||||
stderr_elem.text = escape_text_for_xml(self.stderr)
|
||||
stderr_elem.text = escape_text_for_xml(self._stderr)
|
||||
|
||||
# Add exit code attribute after execution
|
||||
element.set("exit_code", str(self.exit_code))
|
||||
element.set("exit_code", str(self._exit_code))
|
||||
|
||||
return element
|
||||
Reference in New Issue
Block a user