Simplifying the architecture and speeding up the operation

Now the configuration file will be read and checked only when it is really necessary.

Author: unix-based

fcloud/cli/fcloud.py

@@ -9,6 +9,8 @@
 from dropbox.files import FolderMetadata
 
 from ..models.settings import AuthData
+from ..models.drivers import Drivers
+from ..models.settings import Config as _Config
 from .protocol import FcloudProtocol
 from .protocol import SomeStr
 
@@ -18,6 +20,7 @@
 from ..utils.cfl import read_cfl
 
 from .groups.config import Config
+from .groups.dropbox import Dropbox
 from ..exceptions.cfl_errors import CFLError
 from ..exceptions.driver_exceptions import DriverException
 from ..drivers.base import CloudProtocol
@@ -32,33 +35,34 @@ class Fcloud(FcloudProtocol):
 
     def __init__(
         self,
-        auth: AuthData,
-        main_folder: Path,
-        service: CloudProtocol,
-        cfl_extension: str,
         available_clouds: list[str],
+        config: Optional[_Config] = None,
         without_driver: bool = False,
     ):
         """
         Args:
-            auth (AuthData): Dataclass that stores cloud authorisation data in it
-            main_folder (Path): Folder path for saving files on the cloud
-            service (CloudProtocol): Driver class
-            cfl_extension (str): Default extension for cfl files
             available_clouds (list[str]): List of supported cloud storage
+            config (_Config, optional): Dataclass containing: service (driver name),
+              main_folder, cloud authorization data, cfl_extension
             without_driver (bool, optional): Use if necessary to ignore the cloud
               connection. For example for tests, --help, etc. Defaults to False.
         """
+        # init subcommands `fcloud config`, `fcloud dropbox` ...
         self.config = Config(available_clouds)
+        self.dropbox = Dropbox()
+
+        if without_driver:
+            return
+
         try:
-            if not without_driver:
-                self._driver: CloudProtocol = service(auth, main_folder)
+            driver = Drivers[config.service].value
+            self._driver: CloudProtocol = driver(config.auth, config.main_folder)
         except DriverException as er:
             echo_error((er.title, er.message))
 
-        self._auth: AuthData = auth
-        self._main_folder: Path = main_folder
-        self._cfl_extension = cfl_extension
+        self._auth: AuthData = config.auth
+        self._main_folder: Path = config.main_folder
+        self._cfl_extension = config.cfl_extension
 
     def _to_path(self, path: SomeStr) -> Path:
         return Path(str(path))

fcloud/cli/groups/config.py

@@ -7,16 +7,13 @@
 
 from ...exceptions.driver_errors import DriverError
 
-from .dropbox import Dropbox
-
 
 class Config:
     """Use to edit the configuration"""
 
     def __init__(self, available_clouds: list[str], path: Optional[Path] = None):
         if path is None:
             path = Path(environ.get("FCLOUD_CONFIG_PATH"))
-        self.dropbox = Dropbox()
         self._path = path
         self._available = available_clouds
 

fcloud/cli/groups/dropbox.py

@@ -3,6 +3,7 @@
 from os import environ
 from textwrap import dedent
 
+from ...config import not_empty
 from ...drivers.dropbox.config_error import DropboxConfigError
 from ...exceptions.base_errors import FcloudError
 
@@ -22,14 +23,13 @@ def get_token(self):
         config = configparser.ConfigParser()
         config.read(environ.get("FCLOUD_CONFIG_PATH"))
         app_key = get_config_data("DROPBOX", "app_key")
+        not_empty("app_key", app_key, "DROPBOX")
 
-        if not app_key:
-            echo_error(DropboxConfigError.app_key_empty_error)
         token = input(
             dedent(
-                f"""
-        Get the token at this link: {self._auth_link.format(app_key)}\n
-        Your token: """
+                f"""\
+                Get the token at this link: {self._auth_link.format(app_key)}\n
+                Your token: """
             )
         )
 

fcloud/cli/protocol.py

@@ -6,8 +6,8 @@
 from typing import TypeVar
 from typing import Optional
 
-from ..models.settings import AuthData
-from ..drivers.base import CloudProtocol
+from ..models.settings import Config as _Config
+
 
 # Data received from the user that Fire
 # can convert to another data type
@@ -24,20 +24,15 @@ class FcloudProtocol(Protocol):
 
     def __init__(
         self,
-        auth: AuthData,
-        main_folder: Path,
-        service: CloudProtocol,
-        cfl_extension: str,
         available_clouds: list[str],
-        wihtout_driver: bool = False,
+        config: Optional[_Config] = None,
+        without_driver: bool = False,
     ):
         """
         Args:
-            auth (AuthData): Dataclass that stores cloud authorisation data in it
-            main_folder (Path): Folder path for saving files on the cloud
-            service (CloudProtocol): Driver class
-            cfl_extension (str): Default extension for cfl files
             available_clouds (list[str]): List of supported cloud storage
+            config (_Config, optional): Dataclass containing: service (driver name),
+              main_folder, cloud authorization data, cfl_extension
             without_driver (bool, optional): Use if necessary to ignore the cloud
               connection. For example for tests, --help, etc. Defaults to False.
         """

fcloud/config.py

@@ -14,10 +14,17 @@
 from .utils.config import get_config_data
 
 
-def not_empty(key: str, value: str) -> None | NoReturn:
-    if value == "" or value == ".":
-        title, message = ConfigError.field_emty_error
-        echo_error((title.format(key), message.format(key)))
+def not_empty(
+    key: str, value: str, section: str = "FCLOUD", quit_afer: bool = True
+) -> None | NoReturn:
+    if not (value == "" or value == "."):
+        return
+
+    title, message = ConfigError.field_emty_error
+    echo_error(
+        (title.format(key), message.format(section, key)),
+        need_to_quit=quit_afer,
+    )
 
 
 def read_config(available_clouds: list[str], path: Optional[Path] = None) -> Config:
@@ -26,29 +33,32 @@ def read_config(available_clouds: list[str], path: Optional[Path] = None) -> Con
 
     if not path.exists():
         echo_error(ConfigError.config_not_found)
-
     config = configparser.ConfigParser()
     config.read(path, encoding="utf-8")
 
+    # service
     cloud = get_config_data(
         "FCLOUD", "service", error=ConfigError.service_error, config=config
     ).lower()
     if cloud not in available_clouds:
         title, message = DriverError.driver_error
         echo_error((title, message.format(cloud)))
 
-    cloud_settings = get_config_data(
-        cloud.upper(), error=ConfigError.section_error, config=config
-    )
-
+    # cfl_extension
     cfl_extension = get_config_data("FCLOUD", "cfl_extension", config=config)
 
+    # main_folder
     main_folder = Path(
         get_config_data(
             "FCLOUD", "main_folder", error=ConfigError.main_folder_error, config=config
         )
     ).as_posix()
 
+    # Section, for cloud storage settings
+    cloud_settings = get_config_data(
+        cloud.upper(), error=ConfigError.section_error, config=config
+    )
+
     auth_model = AuthData[cloud.lower()].value
 
     fields = {
@@ -57,7 +67,8 @@ def read_config(available_clouds: list[str], path: Optional[Path] = None) -> Con
         "main_folder": main_folder,
     }
     for key, value in (fields | dict(cloud_settings)).items():
-        not_empty(key, value)
+        section = "FCLOUD" if key in fields else cloud
+        not_empty(key, value, section.upper())
 
     return Config(
         service=cloud,

fcloud/exceptions/config_errors.py

@@ -32,7 +32,7 @@ class ConfigError(FileError):
     field_emty_error = (
         "The required '{}' field is missing",
         dedent("""\
-        The field required by fcloud is empty.  Use 'fcloud config set-parametr FCLOUD {} <value>' to set the required value. 
+        The field required by fcloud is empty.  Use 'fcloud config set-parametr {} {} <value>' to set the required value. 
         * Substitute the required value in place of <value>.
         """),
     )

fcloud/exceptions/driver_errors.py

@@ -6,7 +6,7 @@ class DriverError(FcloudError):
 
     driver_error = (
         "Driver Error",
-        """Can`t find any driver for '{}'""",
+        """Can`t find any driver for '{}'. Officially supported drivers: https://fcloud.tech/docs/#cloud-storage-supported""",
     )
 
     connection_error = (

fcloud/main.py

@@ -6,8 +6,6 @@
 from fire import Fire
 
 from .config import read_config
-from .models.drivers import Drivers
-from .cli.groups.config import Config
 from .cli.fcloud import Fcloud
 
 
@@ -22,18 +20,18 @@ def main():
     if len(sys.argv) == 1:
         tprint("FCLOUD")
         return
-    elif sys.argv[1] == "config":
-        Fire(Config(available_clouds, path), sys.argv[2:], "fcloud config")
 
-    config = read_config(available_clouds, path)
-    driver = Drivers[config.service].value
+    sub_command = sys.argv[1] in ["config", *available_clouds]
+    without_driver = sub_command or "--help" in sys.argv
+    if not without_driver:
+        config = read_config(available_clouds, path)
+    else:
+        config = None
+
     cli = Fcloud(
-        auth=config.auth,
-        main_folder=config.main_folder,
-        service=driver,
-        cfl_extension=config.cfl_extension,
         available_clouds=available_clouds,
-        without_driver="--help" in sys.argv,
+        config=config,
+        without_driver=without_driver,
     )
 
     Fire(cli, name="fcloud")

fcloud/utils/error.py

@@ -8,6 +8,7 @@ def echo_error(
     error_data: tuple[str, str],
     need_to_quit: bool = True,
     stderr: Optional[TextIO] = sys.stderr,
+    msg_type="Error",
 ) -> NoReturn | None:
     """Function to call an error in the console
 
@@ -19,7 +20,7 @@ def echo_error(
     title, message = error_data
 
     print(
-        f"\r\nError: {title}\r\n{message}",
+        f"\r{msg_type}: {title}\r\n{message}",
         file=stderr,
     )