Add --nohub option to start without netsiohub running

Author: a8jan

.github/workflows/build.yml

@@ -121,20 +121,12 @@ jobs:
         target: [windows-x64]
         runner: [windows-latest]
         include:
-        #   - name: Ubuntu 22.04
-        #     target: ubuntu-22.04-amd64
-        #     runner: ubuntu-22.04
-        #     default-shell: bash
-        #   - name: Ubuntu 18.04
-        #     target: ubuntu-18.04-amd64
-        #     runner: ubuntu-18.04
-        #     default-shell: bash
-          - name: macOS 13
-            target: macos-13
-            runner: macos-13
-          # - name: macOS 14
-          #   target: macos-14
-          #   runner: macos-14
+          - name: macOS 15 ARM
+            target: macos-15-arm64
+            runner: macos-15
+          - name: macOS 15 Intel
+            target: macos-15-x64
+            runner: macos-15-intel
     # continue-on-error: true
     name: Build ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
@@ -147,17 +139,14 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: fujinet-pc-launcher
+        fetch-depth: 0
 
     - name: '🧰 Checkout Emulator Bridge'
       uses: actions/checkout@v4
       with:
         repository: FujiNetWIFI/fujinet-emulator-bridge
         path: fujinet-emulator-bridge
 
-    - name: Fetch tags
-      working-directory: fujinet-pc-launcher
-      run: git fetch --prune --unshallow --tags
-
     - name: 'Copy NetSIO hub module'
       run: cp -av fujinet-emulator-bridge/fujinet-bridge/netsiohub fujinet-pc-launcher
 
@@ -169,7 +158,7 @@ jobs:
     - name: Install Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
 
     - name: List versions
       run: |

launcher/config.py

@@ -67,6 +67,8 @@ def __init__(self) -> None:
         self.netsio_rundir : AnyStr = os.path.dirname(self.launcher_rundir)
         # module name
         self.netsio_module : str = "netsiohub"
+        # auto-start NetSIO hub
+        self.netsio_autostart : bool = True
 
         # Launcher label
         self.launcher_label : str = ""
@@ -140,6 +142,7 @@ def parse_args(self) -> None:
         arg_parser.add_argument('-s', '--sd', type=str, help='Path to SD directory (SD)')
         arg_parser.add_argument('-p', '--port', type=int, help='TCP port used by Altirra NetSIO custom device (9996)')
         arg_parser.add_argument('-r', '--netsio-port', type=int, help='UDP port used by NetSIO peripherals (9997)')
+        arg_parser.add_argument('--nohub', dest='nohub', action='store_true', help='Do not start NetSIO hub automatically')
         # -i N is shortcut for -l FujiNet-N -u localhost:8000+N -c FujiNet-N/fnconfig.ini -s FujiNet-N/SD -r 9000+N -p 10000+N"
         arg_parser.add_argument('-i', '--instance', type=int, help="FujiNet instance ID")
         arg_parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', help='Log emulation device commands')
@@ -169,7 +172,7 @@ def parse_args(self) -> None:
 
         if args.label is not None:
             self.launcher_label = args.label
-            print("label:", self.launcher_label)
+            print("Label:", self.launcher_label)
 
         if args.gui_scale is not None:
             if args.gui_scale >= 0.3 and args.gui_scale <= 3.0:
@@ -194,6 +197,10 @@ def parse_args(self) -> None:
             self.fujinet_webui_port = to_port(port_str)
             print("WebUI host:", self.fujinet_webui_host, "port:", self.fujinet_webui_port)
 
+        if args.nohub is not None:
+            self.netsio_autostart = not args.nohub
+            print("NetSIO hub auto-start:", self.netsio_autostart)
+
         if args.netsio_port is not None:
             self.netsio_port = to_port(args.netsio_port)
             print("NetSIO port:", self.netsio_port)

launcher/version.py

@@ -1,12 +1,12 @@
 NAME = "FujiNet-PC Launcher"
 
-VERSION_MAJOR = "2312"
+VERSION_MAJOR = "2602"
 VERSION_MINOR = "0"
-VERSION_BUILD = "ccb6a23"
-VERSION_DATE = "2023-12-29 00:00:00"
-VERSION_FULL = "2312.0.ccb6a23"
+VERSION_BUILD = "xxxxxxx"
+VERSION_DATE = "2026-02-06 00:00:00"
+VERSION_FULL = "2602.0.xxxxxxx"
 
 DESCRIPTION = "A launcher to control FujiNet-PC and NetSIO hub."
 
-COPYRIGHT = "(C) 2022-2025 apc"
+COPYRIGHT = "(C) 2022-2026 apc"
 WEBSITE = "https://github.com/a8jan/fujinet-pc-launcher"