Compare commits
14 Commits
9fd70deb9d
...
f2b676043c
| Author | SHA1 | Date | |
|---|---|---|---|
|
f2b676043c
|
|||
|
24bc6bcc94
|
|||
|
7dd01260b3
|
|||
|
2dafcc8c6b
|
|||
|
cbfbb32b86
|
|||
|
942b6c3cef
|
|||
|
a281fab8db
|
|||
|
033de7e7ca
|
|||
|
405e978796
|
|||
|
68c03c18d5
|
|||
|
d0cd6353d7
|
|||
|
7705731dd5
|
|||
|
e639c12c20
|
|||
|
c10077392e
|
20
docs/Makefile
Normal file
20
docs/Makefile
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# Minimal makefile for Sphinx documentation
|
||||||
|
#
|
||||||
|
|
||||||
|
# You can set these variables from the command line, and also
|
||||||
|
# from the environment for the first two.
|
||||||
|
SPHINXOPTS ?=
|
||||||
|
SPHINXBUILD ?= sphinx-build
|
||||||
|
SOURCEDIR = source
|
||||||
|
BUILDDIR = build
|
||||||
|
|
||||||
|
# Put it first so that "make" without argument is like "make help".
|
||||||
|
help:
|
||||||
|
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
||||||
|
|
||||||
|
.PHONY: help Makefile
|
||||||
|
|
||||||
|
# Catch-all target: route all unknown targets to Sphinx using the new
|
||||||
|
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
|
||||||
|
%: Makefile
|
||||||
|
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
||||||
35
docs/make.bat
Normal file
35
docs/make.bat
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
@ECHO OFF
|
||||||
|
|
||||||
|
pushd %~dp0
|
||||||
|
|
||||||
|
REM Command file for Sphinx documentation
|
||||||
|
|
||||||
|
if "%SPHINXBUILD%" == "" (
|
||||||
|
set SPHINXBUILD=sphinx-build
|
||||||
|
)
|
||||||
|
set SOURCEDIR=source
|
||||||
|
set BUILDDIR=build
|
||||||
|
|
||||||
|
%SPHINXBUILD% >NUL 2>NUL
|
||||||
|
if errorlevel 9009 (
|
||||||
|
echo.
|
||||||
|
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
|
||||||
|
echo.installed, then set the SPHINXBUILD environment variable to point
|
||||||
|
echo.to the full path of the 'sphinx-build' executable. Alternatively you
|
||||||
|
echo.may add the Sphinx directory to PATH.
|
||||||
|
echo.
|
||||||
|
echo.If you don't have Sphinx installed, grab it from
|
||||||
|
echo.https://www.sphinx-doc.org/
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
|
||||||
|
if "%1" == "" goto help
|
||||||
|
|
||||||
|
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
|
||||||
|
goto end
|
||||||
|
|
||||||
|
:help
|
||||||
|
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
|
||||||
|
|
||||||
|
:end
|
||||||
|
popd
|
||||||
36
docs/source/conf.py
Normal file
36
docs/source/conf.py
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
# Configuration file for the Sphinx documentation builder.
|
||||||
|
#
|
||||||
|
# For the full list of built-in configuration values, see the documentation:
|
||||||
|
# https://www.sphinx-doc.org/en/master/usage/configuration.html
|
||||||
|
|
||||||
|
# -- Project information -----------------------------------------------------
|
||||||
|
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
|
||||||
|
|
||||||
|
project = 'unisync'
|
||||||
|
copyright = '2026, Paul Retourné'
|
||||||
|
author = 'Paul Retourné'
|
||||||
|
release = '0.1.0'
|
||||||
|
|
||||||
|
# -- General configuration ---------------------------------------------------
|
||||||
|
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
|
||||||
|
|
||||||
|
extensions = [
|
||||||
|
'sphinx.ext.autodoc',
|
||||||
|
'sphinx.ext.viewcode',
|
||||||
|
'sphinx.ext.napoleon',
|
||||||
|
'sphinx.ext.todo'
|
||||||
|
]
|
||||||
|
|
||||||
|
templates_path = ['_templates']
|
||||||
|
exclude_patterns = []
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# -- Options for HTML output -------------------------------------------------
|
||||||
|
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
|
||||||
|
|
||||||
|
#html_theme = 'alabaster'
|
||||||
|
html_theme = 'sphinx_rtd_theme'
|
||||||
|
html_static_path = ['_static']
|
||||||
|
|
||||||
|
autodoc_docstring_signature = True
|
||||||
24
docs/source/example.rst
Normal file
24
docs/source/example.rst
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
.. _example_how_it_works:
|
||||||
|
|
||||||
|
Example of how unisync works
|
||||||
|
============================
|
||||||
|
|
||||||
|
Let's say you have the following structure::
|
||||||
|
|
||||||
|
$ tree .
|
||||||
|
.
|
||||||
|
├── big_file
|
||||||
|
└── folder
|
||||||
|
├── file
|
||||||
|
└── other_file
|
||||||
|
|
||||||
|
If you only want to synchronise `folder` and its content on your laptop the following will be automatically generated::
|
||||||
|
|
||||||
|
$ tree .
|
||||||
|
.
|
||||||
|
├── big_file -> ../.data/big_file
|
||||||
|
└── folder
|
||||||
|
├── file
|
||||||
|
└── other_file
|
||||||
|
|
||||||
|
`big_file` is now a symbolic link and by mounting the remote directory you can still seemlessly access `big_file` through the network.
|
||||||
31
docs/source/index.rst
Normal file
31
docs/source/index.rst
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
.. unisync documentation master file, created by
|
||||||
|
sphinx-quickstart on Sun Jan 4 15:02:58 2026.
|
||||||
|
You can adapt this file completely to your liking, but it should at least
|
||||||
|
contain the root `toctree` directive.
|
||||||
|
|
||||||
|
Documentation for unisync
|
||||||
|
=========================
|
||||||
|
|
||||||
|
Unisync is a data synchronising tool built around `unison`_ and expending on it.
|
||||||
|
|
||||||
|
Unisync tries to solve two problems that are often solved separately but never together :
|
||||||
|
|
||||||
|
* Keeping your data synchronised between multiple machines (through a central server), examples of this are rsync and of course unison.
|
||||||
|
* Being able to access and edit files stored on your server without having to download them, the gui interface of nextcloud for example.
|
||||||
|
* And of course I want to be able to do all of this without ever having to leave my terminal.
|
||||||
|
|
||||||
|
Unisync solves this problem by placing each file on your local machine but with only the selected files and folders being physically present on your drive,
|
||||||
|
the others are replaced by symbolic links pointing to a directory that is mounted from your server.
|
||||||
|
|
||||||
|
See this
|
||||||
|
:ref:`example_how_it_works`.
|
||||||
|
|
||||||
|
.. _unison: https://github.com/bcpierce00/unison
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
:maxdepth: 2
|
||||||
|
:caption: Contents:
|
||||||
|
|
||||||
|
example
|
||||||
|
modules
|
||||||
|
|
||||||
7
docs/source/modules.rst
Normal file
7
docs/source/modules.rst
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
unisync
|
||||||
|
=======
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
:maxdepth: 4
|
||||||
|
|
||||||
|
unisync
|
||||||
77
docs/source/unisync.rst
Normal file
77
docs/source/unisync.rst
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
unisync package
|
||||||
|
===============
|
||||||
|
|
||||||
|
Submodules
|
||||||
|
----------
|
||||||
|
|
||||||
|
unisync.argparser module
|
||||||
|
------------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.argparser
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.config module
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.config
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.defaults module
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.defaults
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.errors module
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.errors
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.main module
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.main
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.paths module
|
||||||
|
--------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.paths
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.runners module
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.runners
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
unisync.synchroniser module
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
.. automodule:: unisync.synchroniser
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
|
|
||||||
|
Module contents
|
||||||
|
---------------
|
||||||
|
|
||||||
|
.. automodule:: unisync
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:undoc-members:
|
||||||
@@ -20,3 +20,12 @@ packages = [{include = "unisync", from = "src"}]
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry-core>=2.0.0,<3.0.0"]
|
requires = ["poetry-core>=2.0.0,<3.0.0"]
|
||||||
build-backend = "poetry.core.masonry.api"
|
build-backend = "poetry.core.masonry.api"
|
||||||
|
|
||||||
|
[dependency-groups]
|
||||||
|
docs = [
|
||||||
|
"sphinx (>=9.1.0,<10.0.0)",
|
||||||
|
"sphinx-rtd-theme (>=3.0.2,<4.0.0)",
|
||||||
|
]
|
||||||
|
dev = [
|
||||||
|
"pylint (>=4.0.4,<5.0.0)"
|
||||||
|
]
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from configparser import UNNAMED_SECTION
|
from configparser import UNNAMED_SECTION
|
||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import ipaddress
|
import ipaddress
|
||||||
import configparser
|
import configparser
|
||||||
@@ -30,8 +30,8 @@ class ServerConfig:
|
|||||||
if self.ip != "":
|
if self.ip != "":
|
||||||
try:
|
try:
|
||||||
ipaddress.ip_address(self.ip)
|
ipaddress.ip_address(self.ip)
|
||||||
except ValueError:
|
except ValueError as e:
|
||||||
raise ValueError("The provided ip address is invalid")
|
raise ValueError("The provided ip address is invalid") from e
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class RootsConfig:
|
class RootsConfig:
|
||||||
@@ -120,13 +120,13 @@ def load_config(config_path:str) -> Config:
|
|||||||
Path(config.get(other_section, "cache_dir_path", fallback=DEFAULT_MISC_CACHE_DIR_PATH)).expanduser()
|
Path(config.get(other_section, "cache_dir_path", fallback=DEFAULT_MISC_CACHE_DIR_PATH)).expanduser()
|
||||||
)
|
)
|
||||||
|
|
||||||
args_bool = list()
|
args_bool = []
|
||||||
args_val = dict()
|
args_val = {}
|
||||||
if "Unison" in config.sections():
|
if "Unison" in config.sections():
|
||||||
for key, val in config.items("Unison"):
|
for key, val in config.items("Unison"):
|
||||||
if key in config["DEFAULT"].keys():
|
if key in config["DEFAULT"].keys():
|
||||||
continue
|
continue
|
||||||
elif val == "" or val == None:
|
if val in ("", None):
|
||||||
args_bool.append(key)
|
args_bool.append(key)
|
||||||
else:
|
else:
|
||||||
args_val[key] = val
|
args_val[key] = val
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from unisync.argparser import create_argparser
|
|||||||
from unisync.runners import unisync_sync, unisync_add, unisync_mount
|
from unisync.runners import unisync_sync, unisync_add, unisync_mount
|
||||||
from unisync.config import load_config
|
from unisync.config import load_config
|
||||||
from unisync.synchroniser import Synchroniser
|
from unisync.synchroniser import Synchroniser
|
||||||
from unisync.paths import *
|
from unisync.paths import PathsManager
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
parser = create_argparser(unisync_sync, unisync_add, unisync_mount)
|
parser = create_argparser(unisync_sync, unisync_add, unisync_mount)
|
||||||
@@ -15,16 +15,15 @@ def main():
|
|||||||
|
|
||||||
config_path: Path = Path("~/.config/unisync/config.ini").expanduser()
|
config_path: Path = Path("~/.config/unisync/config.ini").expanduser()
|
||||||
# Check if --config is set
|
# Check if --config is set
|
||||||
if cli_args.config != None and Path(cli_args.config).is_file():
|
if cli_args.config is not None and Path(cli_args.config).is_file():
|
||||||
config = load_config(cli_args.config)
|
config = load_config(cli_args.config)
|
||||||
elif config_path.is_file():
|
elif config_path.is_file():
|
||||||
config = load_config(str(config_path))
|
config = load_config(str(config_path))
|
||||||
else:
|
else:
|
||||||
# TODO replace the next line with something to do if no config file is found
|
# TODO replace the next line with something to do if no config file is found
|
||||||
config = load_config(str(config_path))
|
config = load_config(str(config_path))
|
||||||
pass
|
|
||||||
|
|
||||||
# TODO make the command line arguments work and override the config options
|
# TODO: make the command line arguments work and override the config options
|
||||||
|
|
||||||
synchroniser = Synchroniser(
|
synchroniser = Synchroniser(
|
||||||
config.roots.remote,
|
config.roots.remote,
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ class PathsManager:
|
|||||||
Writes a list of new paths to the file
|
Writes a list of new paths to the file
|
||||||
"""
|
"""
|
||||||
current_paths = self.get_paths_to_sync()
|
current_paths = self.get_paths_to_sync()
|
||||||
paths_to_add = list()
|
paths_to_add = []
|
||||||
# Check if one of the parent is already being synchronised
|
# Check if one of the parent is already being synchronised
|
||||||
# If so there is no need to add the child path
|
# If so there is no need to add the child path
|
||||||
for new_path in paths:
|
for new_path in paths:
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from unisync.paths import PathsManager
|
|||||||
from unisync.config import Config
|
from unisync.config import Config
|
||||||
|
|
||||||
def unisync_sync(synchroniser:Synchroniser, paths_manager:PathsManager, config: Config):
|
def unisync_sync(synchroniser:Synchroniser, paths_manager:PathsManager, config: Config):
|
||||||
|
del config # The function signature must be the same for all runners
|
||||||
if synchroniser.create_ssh_master_connection() != 0:
|
if synchroniser.create_ssh_master_connection() != 0:
|
||||||
print("Connection failed quitting")
|
print("Connection failed quitting")
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -107,7 +107,6 @@ class Synchroniser:
|
|||||||
On slow connections one might want to increase this.
|
On slow connections one might want to increase this.
|
||||||
Returns:
|
Returns:
|
||||||
An error code (0 success, 1 TimeoutExpired, 2 KeyboardInterrupt).
|
An error code (0 success, 1 TimeoutExpired, 2 KeyboardInterrupt).
|
||||||
TODO change that to raising the exception.
|
|
||||||
"""
|
"""
|
||||||
self.control_path = os.path.expanduser(control_path)
|
self.control_path = os.path.expanduser(control_path)
|
||||||
command = [
|
command = [
|
||||||
@@ -119,6 +118,7 @@ class Synchroniser:
|
|||||||
"-p", str(self.remote_port)
|
"-p", str(self.remote_port)
|
||||||
]
|
]
|
||||||
master_ssh = subprocess.Popen(command)
|
master_ssh = subprocess.Popen(command)
|
||||||
|
# TODO: Raise an exception instead of changing the return value
|
||||||
try:
|
try:
|
||||||
ret_code = master_ssh.wait(timeout=connection_timeout)
|
ret_code = master_ssh.wait(timeout=connection_timeout)
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
|
|||||||
Reference in New Issue
Block a user