Cleanup

src/fprime_gds/common/files/uplinker.py

@@ -147,7 +147,7 @@ class FileUplinker(fprime_gds.common.handlers.DataHandler):
 
     CHUNK_SIZE = 256
 
-    def __init__(self, file_store, file_encoder, chunk=CHUNK_SIZE, timeout=20):
+    def __init__(self, file_encoder, chunk=CHUNK_SIZE, timeout=20):
         """
         Constructor to build the file uplinker.
         """
@@ -157,7 +157,6 @@ def __init__(self, file_store, file_encoder, chunk=CHUNK_SIZE, timeout=20):
         self.sequence = 0
         self.chunk = chunk
         self.file_encoder = file_encoder
-        self.file_store = file_store
         self.__destination_dir = "/"
         self.__expected = []
         self.__timeout = Timeout()

src/fprime_gds/common/pipeline/files.py

@@ -24,22 +24,22 @@ def __init__(self):
         self.__downlinker = None
 
     def setup_file_handling(
-        self, file_store, file_encoder, file_decoder, distributor, log_dir
+        self, down_store, file_encoder, file_decoder, distributor, log_dir
     ):
         """
         Sets up the file handling (uplink and downlink) from a pair of encoders and decoders
 
-        :param file_store: uplink/downlink storage directory
+        :param down_store: downlink storage directory
         :param file_encoder: file encoder for uplink
         :param file_decoder: file decoder for downlink
         :param distributor: data distributor to register handshaking to
         :param log_dir: log directory to output downlink logs
         """
         self.__uplinker = fprime_gds.common.files.uplinker.FileUplinker(
-            file_store, file_encoder # maybe not here after all??
+            file_encoder
         )
         self.__downlinker = fprime_gds.common.files.downlinker.FileDownlinker(
-            file_store, log_dir=log_dir
+            down_store, log_dir=log_dir
         )
         file_decoder.register(self.__downlinker)
         distributor.register("FW_PACKET_HAND", self.__uplinker)

src/fprime_gds/common/pipeline/standard.py

@@ -44,6 +44,9 @@ def __init__(self):
         self.client_socket = None
         self.logger = None
         self.dictionary_path = None
+        self.up_store = None
+        self.down_store = None
+
 
         self.__dictionaries = dictionaries.Dictionaries()
         self.__coders = encoding.EncodingDecoding()
@@ -65,6 +68,9 @@ def setup(
         :param packet_spec: location of packetized telemetry XML specification.
         """
         assert dictionary is not None and Path(dictionary).is_file(), f"Dictionary {dictionary} does not exist"
+        # File storage configuration for uplink and downlink
+        self.up_store = Path(file_store) / "fprime-uplink"
+        self.down_store = Path(file_store) / "fprime-downlink"
         self.dictionary_path = Path(dictionary)
         # Loads the distributor and client socket
         self.distributor = fprime_gds.common.distributor.distributor.Distributor(config)
@@ -76,8 +82,7 @@ def setup(
         )
         self.histories.setup_histories(self.coders)
         self.files.setup_file_handling(
-            # here
-            file_store,
+            self.down_store,
             self.coders.file_encoder,
             self.coders.file_decoder,
             self.distributor,

src/fprime_gds/executables/cli.py

@@ -535,18 +535,18 @@ def get_arguments(self) -> Dict[Tuple[str, ...], Dict[str, Any]]:
 
         return {
             ("--file-storage-directory",): {
-                "dest": "files_directory",
+                "dest": "files_storage_directory",
                 "action": "store",
-                "default": "/tmp/" + username + "/fprime-downlink/",
+                "default": "/tmp/" + username,
                 "required": False,
                 "type": str,
-                "help": "File to store uplink and downlink files. Default: %(default)s",
+                "help": "Directory to store uplink and downlink files. Default: %(default)s",
             }
         }
 
     def handle_arguments(self, args, **kwargs):
         """Handle arguments as parsed"""
-        os.makedirs(args.files_directory, exist_ok=True)
+        os.makedirs(args.files_storage_directory, exist_ok=True)
         return args
 
 
@@ -572,7 +572,7 @@ def pipeline_factory(args_ns, pipeline=None) -> StandardPipeline:
         pipeline_arguments = {
             "config": ConfigManager(),
             "dictionary": args_ns.dictionary,
-            "file_store": args_ns.files_directory,
+            "file_store": args_ns.files_storage_directory,
             "packet_spec": args_ns.packet_spec,
             "logging_prefix": args_ns.logs,
         }