Cleanup of starting file collection

src/core/controllers/base_controller.py

@@ -1,5 +1,4 @@
 # Python imports
-import os
 
 # Lib imports
 import gi
@@ -19,6 +18,8 @@ from .bridge_controller import BridgeController
 
 class BaseController(IPCSignalsMixin, KeyboardSignalsMixin, BaseControllerData):
     def __init__(self, args, unknownargs):
+        self.collect_files_dirs(args, unknownargs)
+
         self.setup_controller_data()
 
         self._setup_styling()
@@ -29,14 +30,8 @@ class BaseController(IPCSignalsMixin, KeyboardSignalsMixin, BaseControllerData):
         if args.no_plugins == "false":
             self.plugins.launch_plugins()
 
-        for arg in unknownargs + [args.new_tab,]:
-            if os.path.isfile(arg):
-                message = f"FILE|{arg}"
-                event_system.emit("post_file_to_ipc", message)
-
-            if os.path.isdir(arg):
-                message = f"DIR|{arg}"
-                event_system.emit("post_file_to_ipc", message)
+        for file in settings_manager.get_starting_files():
+            event_system.emit("post_file_to_ipc", file)
 
         logger.info(f"Made it past {self.__class__} loading...")
 

src/core/controllers/base_controller_data.py

@@ -25,6 +25,20 @@ class BaseControllerData:
         self.setup_builder_and_container()
         self.plugins     = PluginsController()
 
+    def collect_files_dirs(self, args, unknownargs):
+        files = []
+        for arg in unknownargs + [args.new_tab,]:
+            if os.path.isdir( arg.replace("file://", "") ):
+                files.append( f"DIR|{arg.replace('file://', '')}" )
+
+            # NOTE: If passing line number with file split against :
+            if os.path.isfile( arg.replace("file://", "").split(":")[0] ):
+                files.append( f"FILE|{arg.replace('file://', '')}" )
+
+        if len(files) > 0:
+            settings_manager.set_is_starting_with_file(True)
+            settings_manager.set_starting_files(files)
+
     def get_base_container(self):
         return self.base_container