Update __init__.py

Author: MineFartS

philh_myftp_biz/__init__.py

@@ -279,6 +279,9 @@ def __stdout(self) -> None:
 
                 #
                 self.stdout = ''
+
+                #
+                self.stdcomb = ''
 
                 #
                 if not self.__hide:
@@ -289,6 +292,8 @@ def __stdout(self) -> None:
                 #
                 self.stdout += line
 
+                self.stdcomb += line
+
                 #
                 if not self.__hide:
                     terminal.write(line, 'out')
@@ -305,6 +310,8 @@ def __stderr(self) -> None:
 
             self.stderr += line
 
+            self.stdcomb += line
+
             if not self.__hide:
                 terminal.write(line, 'err')
 
@@ -337,6 +344,8 @@ def start(self) -> None:
         """Process Runtime"""
         self.__stopwatch.start()
 
+        self.stdcomb = ''
+
         # Start Output Manager
         thread(self.__stdout)
 
@@ -355,6 +364,12 @@ def finished(self) -> bool:
         Check if the subprocess is finished
         """
         return (not self.__task.exists())
+    
+    def running(self) -> bool:
+        """
+        Check if the subprocess is still running
+        """
+        return self.__task.exists()
 
     def restart(self) -> None:
         """
@@ -386,15 +401,18 @@ def stop(self) -> None:
         self.__stopwatch.stop()
 
     def output(self,
-        format: Literal['json', 'hex'] = None
+        format: Literal['json', 'hex'] = None,
+        stream: Literal['out', 'err', 'comb'] = 'comb'
     ) -> 'str | dict | list | bool | Any':
         """
         Read the output from the Subprocess
         """
         from . import json
         from .text import hex
 
-        output = self.stdout.encode().strip()
+        stream: str = getattr(self, 'std'+stream)
+
+        output = stream.encode().strip()
 
         if format == 'json':
             return json.loads(output)

philh_myftp_biz/modules.py

@@ -301,8 +301,7 @@ class Service:
 
     def __init__(self,
         module: Module,
-        path: str,
-        *args
+        path: str
     ):
 
         self.__mod = module
@@ -312,8 +311,6 @@ def __init__(self,
         else:
             self.__path = path+'/'
 
-        self.__args = args
-
     def Start(self,
         force: bool = True
     ):
@@ -322,10 +319,18 @@ def Start(self,
         
         Will do nothing if already running unless force is True
         """
-        if force or (not self.Running()):
-            self.__mod.runH(
-                self.__path+'Start', *self.__args
-            )
+
+        arg = self.__path+'Start'
+
+        if force:
+
+            self.Stop()
+
+            self.__mod.runH(arg)
+
+        elif not self.Running():
+            
+            self.__mod.runH(arg)
 
     def Running(self) -> bool:
         """
@@ -342,6 +347,4 @@ def Stop(self) -> None:
         """
         Stop the Service
         """
-        self.__mod.runH(
-            self.__path+'Stop', *self.__args
-        )
+        self.__mod.runH(self.__path+'Stop')