diff --git a/CHANGELOG.org b/CHANGELOG.org index 31f3afe..405c7dd 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -26,4 +26,7 @@ ** 0.7.0 <2023-03-17 Fri> Added the configuration to the application. Moved database file to the user data directory. +** 0.8.1 <2023-03-18 Sat> + Made the package executable. + Updated the package information. diff --git a/README.rst b/README.rst index 6edcde1..bfe16ac 100644 --- a/README.rst +++ b/README.rst @@ -4,6 +4,12 @@ tui-rsync tui-rsync is the application that will help you to manage yours backups. It uses rsync for syncing backups. +Dependencies +============ + +- rsync +- fzf + Author ====== diff --git a/pyproject.toml b/pyproject.toml index 2e7eaf5..cf844a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,14 +1,18 @@ [tool.poetry] name = "tui-rsync" -version = "0.5.0" +version = "0.8.1" description = "" authors = ["Kostiantyn Klochko "] readme = "README.rst" license = "GPL-3.0-or-later" packages = [{include = "tui_rsync"}] repository = "https://gitlab.com/KKlochko/tui-rsync" +Bug Tracker keywords = ["tui", "cli", "rsync", "backup"] +[tool.poetry.urls] +"Bug Tracker" = "https://gitlab.com/KKlochko/tui-rsync/issues" + [tool.poetry.dependencies] python = "^3.10" rich = "^13.3.1" @@ -17,6 +21,9 @@ peewee = "^3.15.4" pyfzf = "^0.3.1" platformdirs = "^3.1.1" +[tool.poetry.scripts] +tui-rsync = "tui_rsync.main:main" + [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" diff --git a/tui_rsync/cli/__init__.py b/tui_rsync/cli/__init__.py index 8f61cb2..ffaa1b3 100644 --- a/tui_rsync/cli/__init__.py +++ b/tui_rsync/cli/__init__.py @@ -1,5 +1,5 @@ -from cli.cli import cli_app -from cli.source import source -from cli.sync import sync -from cli.rsync import Rsync -from cli.label_prompt import LabelPrompt +from tui_rsync.cli.cli import cli_app +from tui_rsync.cli.source import source +from tui_rsync.cli.sync import sync +from tui_rsync.cli.rsync import Rsync +from tui_rsync.cli.label_prompt import LabelPrompt diff --git a/tui_rsync/cli/cli.py b/tui_rsync/cli/cli.py index d55c06f..b036777 100644 --- a/tui_rsync/cli/cli.py +++ b/tui_rsync/cli/cli.py @@ -19,9 +19,9 @@ from rich.console import Console import typer -from cli.source import source -from cli.sync import sync -from cli.groups import groups +from tui_rsync.cli.source import source +from tui_rsync.cli.sync import sync +from tui_rsync.cli.groups import groups console = Console() cli_app = typer.Typer(rich_markup_mode="rich") diff --git a/tui_rsync/cli/group_prompt.py b/tui_rsync/cli/group_prompt.py index 4062e80..bb71926 100644 --- a/tui_rsync/cli/group_prompt.py +++ b/tui_rsync/cli/group_prompt.py @@ -19,8 +19,8 @@ from rich.console import Console from pyfzf import FzfPrompt -from models.models import all_group_labels -from cli.label_prompt import LabelPrompt +from tui_rsync.models.models import all_group_labels +from tui_rsync.cli.label_prompt import LabelPrompt console = Console() diff --git a/tui_rsync/cli/groups.py b/tui_rsync/cli/groups.py index 9d8289f..b720048 100644 --- a/tui_rsync/cli/groups.py +++ b/tui_rsync/cli/groups.py @@ -22,9 +22,9 @@ from rich.prompt import Confirm, Prompt from typing import List, Optional import typer -from cli.label_prompt import LabelPrompt -from cli.rsync import Rsync -from models.models import Group, count_all_labels_except +from tui_rsync.cli.label_prompt import LabelPrompt +from tui_rsync.cli.rsync import Rsync +from tui_rsync.models.models import Group, count_all_labels_except console = Console() groups = typer.Typer() diff --git a/tui_rsync/cli/label_prompt.py b/tui_rsync/cli/label_prompt.py index a194aac..02bf9f7 100644 --- a/tui_rsync/cli/label_prompt.py +++ b/tui_rsync/cli/label_prompt.py @@ -21,7 +21,7 @@ from rich.console import Console from rich.prompt import Prompt from pyfzf import FzfPrompt import uuid -from models.models import all_labels, all_labels_except +from tui_rsync.models.models import all_labels, all_labels_except console = Console() diff --git a/tui_rsync/cli/path_prompt.py b/tui_rsync/cli/path_prompt.py index f33a311..9124dd7 100644 --- a/tui_rsync/cli/path_prompt.py +++ b/tui_rsync/cli/path_prompt.py @@ -22,7 +22,7 @@ from rich.console import Console from rich.prompt import Prompt from pyfzf import FzfPrompt import os -from models.models import Destination +from tui_rsync.models.models import Destination, Path console = Console() err_console = Console(stderr=True) diff --git a/tui_rsync/cli/source.py b/tui_rsync/cli/source.py index e80e818..ad3bb60 100644 --- a/tui_rsync/cli/source.py +++ b/tui_rsync/cli/source.py @@ -22,9 +22,9 @@ from rich.prompt import Prompt from typing import List, Optional import typer -from models.models import Source, Destination, SyncCommand, Path -from cli.label_prompt import LabelPrompt -from cli.source_update import source_update +from tui_rsync.models.models import Source, Destination, SyncCommand, Path +from tui_rsync.cli.label_prompt import LabelPrompt +from tui_rsync.cli.source_update import source_update console = Console() source = typer.Typer() diff --git a/tui_rsync/cli/source_update.py b/tui_rsync/cli/source_update.py index e1afa31..94573b6 100644 --- a/tui_rsync/cli/source_update.py +++ b/tui_rsync/cli/source_update.py @@ -22,8 +22,8 @@ from rich.prompt import Prompt from typing import List, Optional import typer -from models.models import Source, Destination, SyncCommand, Path -from cli.label_prompt import LabelPrompt +from tui_rsync.models.models import Source, Destination, SyncCommand, Path +from tui_rsync.cli.label_prompt import LabelPrompt console = Console() source_update = typer.Typer() diff --git a/tui_rsync/cli/sync.py b/tui_rsync/cli/sync.py index aeda860..6dff63f 100644 --- a/tui_rsync/cli/sync.py +++ b/tui_rsync/cli/sync.py @@ -22,12 +22,13 @@ from rich.prompt import Prompt from typing import List, Optional import typer -from models.models import Source, Group, Destination, SyncCommand, Path -from models.models import all_labels -from cli.label_prompt import LabelPrompt -from cli.group_prompt import GroupPrompt -from cli.path_prompt import PathPrompt -from cli.rsync import Rsync +from tui_rsync.models.models import Source, Group, Destination, SyncCommand +from tui_rsync.models.models import Path +from tui_rsync.models.models import all_labels +from tui_rsync.cli.label_prompt import LabelPrompt +from tui_rsync.cli.group_prompt import GroupPrompt +from tui_rsync.cli.path_prompt import PathPrompt +from tui_rsync.cli.rsync import Rsync console = Console() sync = typer.Typer() diff --git a/tui_rsync/config/__init__.py b/tui_rsync/config/__init__.py index 3e9ca50..91acc82 100644 --- a/tui_rsync/config/__init__.py +++ b/tui_rsync/config/__init__.py @@ -1,2 +1,2 @@ -from config.app import App +from tui_rsync.config.app import App diff --git a/tui_rsync/main.py b/tui_rsync/main.py index 39e9d17..62765d3 100644 --- a/tui_rsync/main.py +++ b/tui_rsync/main.py @@ -1,6 +1,9 @@ -from models.models import create_tables -from cli.cli import cli_app +from .models.models import create_tables +from .cli.cli import cli_app -if __name__ == "__main__": +def main(): create_tables() cli_app() + +if __name__ == "__main__": + main() diff --git a/tui_rsync/models/__init__.py b/tui_rsync/models/__init__.py index 56eb1db..da23f3e 100644 --- a/tui_rsync/models/__init__.py +++ b/tui_rsync/models/__init__.py @@ -1,5 +1,5 @@ -from models.models import Source -from models.models import Path -from models.models import Destination -from models.models import SyncCommand -from models.models import create_tables +from tui_rsync.models.models import Source +from tui_rsync.models.models import Path +from tui_rsync.models.models import Destination +from tui_rsync.models.models import SyncCommand +from tui_rsync.models.models import create_tables diff --git a/tui_rsync/models/models.py b/tui_rsync/models/models.py index 7ba201f..11ca06d 100644 --- a/tui_rsync/models/models.py +++ b/tui_rsync/models/models.py @@ -18,7 +18,7 @@ ################################################################################ from peewee import * -from config.app import App +from tui_rsync.config.app import App import os app = App()