Merge branch 'abstract_defaults'

Abstract the defaults into a seperate file

pyproject.toml

@@ -10,6 +10,9 @@ requires-python = ">=3.13"
 dependencies = [
 ]
 
+[project.scripts]
+unisync = "unisync.main:main"
+
 [tool.poetry]
 packages = [{include = "unisync", from = "src"}]
 

src/unisync/argparser.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2025 Paul Retourné
+# Copyright (C) 2025-2026 Paul Retourné
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -11,7 +11,7 @@ def create_argparser(sync_function, add_function, mount_function) -> argparse.Ar
     parser = argparse.ArgumentParser(
             prog='unisync',
             description='File synchronisation application',
-            epilog="Copyright © 2025 Paul Retourné.\n"
+            epilog="Copyright © 2025-2026 Paul Retourné.\n"
             "License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.",
             formatter_class=argparse.RawDescriptionHelpFormatter
             )

src/unisync/config.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2025 Paul Retourné
+# Copyright (C) 2025-2026 Paul Retourné
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from configparser import UNNAMED_SECTION
@@ -7,16 +7,18 @@ from pathlib import Path
 import ipaddress
 import configparser
 
+from unisync.defaults import *
+
 @dataclass
 class ServerConfig:
     """
     Dataclass keeping the config for connecting to the server
     """
     user: str
-    sshargs: str = ""
+    sshargs: str
-    hostname: str = ""
+    hostname: str
-    ip: str = ""
+    ip: str
-    port: int = 22
+    port: int
 
     def __post_init__(self):
         """
@@ -44,15 +46,15 @@ class UnisonConfig:
     """
     Dataclass keeping unison specific configurations
     """
-    bools: list = field(default_factory=list)
+    bools: list
-    values: dict = field(default_factory=dict)
+    values: dict
 
 @dataclass
 class OtherConfig:
     """
     Dataclass keeping miscellanous configuration options
     """
-    cache_dir_path: Path = Path("~/.unisync").expanduser()
+    cache_dir_path: Path
 
 @dataclass
 class Config:
@@ -62,7 +64,7 @@ class Config:
     server: ServerConfig
     roots: RootsConfig
     unison: UnisonConfig
-    other: OtherConfig = field(default_factory=OtherConfig)
+    other: OtherConfig
 
 
 def load_config(config_path:str) -> Config:
@@ -79,18 +81,22 @@ def load_config(config_path:str) -> Config:
     # Check if sections are provided
     server_section = "Server" if "Server" in config.sections() else UNNAMED_SECTION
     roots_section = "Roots" if "Roots" in config.sections() else UNNAMED_SECTION
+    other_section = "Other" if "Other" in config.sections() else UNNAMED_SECTION
 
     server_config = ServerConfig(
             config.get(server_section, "user"),
-            config.get(server_section, "sshargs", fallback=""),
+            config.get(server_section, "sshargs", fallback=DEFAULT_SERVER_SSHARGS),
-            config.get(server_section, "hostname", fallback=""),
+            config.get(server_section, "hostname", fallback=DEFAULT_SERVER_HOSTNAME),
-            config.get(server_section, "ip", fallback=""),
+            config.get(server_section, "ip", fallback=DEFAULT_SERVER_IP),
-            config.getint(server_section, "port", fallback=22)
+            config.getint(server_section, "port", fallback=DEFAULT_SERVER_PORT)
         )
     roots_config = RootsConfig(
-            config.get(roots_section, "local"),
+            config.get(roots_section, "local", fallback=DEFAULT_ROOTS_LOCAL),
             config.get(roots_section, "remote")
         )
+    other_config = OtherConfig(
+            config.get(other_section, "cache_dir_path", fallback=DEFAULT_MISC_CACHE_DIR_PATH)
+        )
 
     args_bool = list()
     args_val = dict()
@@ -104,4 +110,4 @@ def load_config(config_path:str) -> Config:
                 args_val[key] = val
     unison_config = UnisonConfig(args_bool, args_val)
 
-    return Config(server_config, roots_config, unison_config)
+    return Config(server_config, roots_config, unison_config, other_config)

src/unisync/defaults.py

@@ -0,0 +1,18 @@
+# copyright (c) 2026 paul retourné
+# spdx-license-identifier: gpl-3.0-or-later
+
+from pathlib import Path
+
+# Commented out values are part of the config but are required so there is no defaults.
+# This allows this file to be a list of all the config options.
+
+# DEFAULT_SERVER_USER: str = "" 
+DEFAULT_SERVER_SSHARGS: str = ""
+DEFAULT_SERVER_HOSTNAME: str = ""
+DEFAULT_SERVER_IP: str = ""
+DEFAULT_SERVER_PORT: int = 22
+
+DEFAULT_ROOTS_LOCAL: str = str(Path("~/files").expanduser())
+# DEFAULT_ROOTS_REMOTE: str = ""
+
+DEFAULT_MISC_CACHE_DIR_PATH: Path = Path("~/.unisync").expanduser()

src/unisync/errors.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2025-2026 Paul Retourné
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 class RemoteMountedError(BaseException):
     pass
 

src/unisync/main.py

@@ -1,13 +1,14 @@
-# Copyright (C) 2025 Paul Retourné
+# Copyright (C) 2025-2026 Paul Retourné
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
-from argparser import create_argparser
-from runners import unisync_sync, unisync_add, unisync_mount
-from config import load_config
-from synchroniser import Synchroniser
 from pathlib import Path
-from paths import *
+
+from unisync.argparser import create_argparser
+from unisync.runners import unisync_sync, unisync_add, unisync_mount
+from unisync.config import load_config
+from unisync.synchroniser import Synchroniser
+from unisync.paths import *
 
 def main():
     parser = create_argparser(unisync_sync, unisync_add, unisync_mount)

src/unisync/paths.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2025 Paul Retourné
+# Copyright (C) 2025-2026 Paul Retourné
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 

src/unisync/runners.py

@@ -1,5 +1,8 @@
-from synchroniser import Synchroniser
+# Copyright (C) 2025-2026 Paul Retourné
-from paths import PathsManager
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from unisync.synchroniser import Synchroniser
+from unisync.paths import PathsManager
 
 
 def unisync_sync(synchroniser:Synchroniser, paths_manager:PathsManager):

src/unisync/synchroniser.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2025 Paul Retourné
+# Copyright (C) 2025-2026 Paul Retourné
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import subprocess
@@ -9,7 +9,7 @@ import logging
 
 from pathlib import Path
 
-from errors import RemoteMountedError, InvalidMountError
+from unisync.errors import RemoteMountedError, InvalidMountError
 
 logger = logging.getLogger(__name__)