sbo-create 2.3.1__tar.gz → 2.3.2__tar.gz

{sbo_create-2.3.1 → sbo_create-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbo-create
-Version: 2.3.1
+Version: 2.3.2
 Summary: SBo tool for creating SlackBuilds.
 Keywords: sbo,templates,slackbuild
 Author-email: Dimitris Zlatanidis <dslackw@gmail.com>

{sbo_create-2.3.1 → sbo_create-2.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "sbo-create"
-version = "2.3.1"
+version = "2.3.2"
 authors = [
     { name = "Dimitris Zlatanidis", email = "dslackw@gmail.com" },
 ]
@@ -35,6 +35,10 @@ dependencies = [
     "urllib3>=1.26"
 ]
 
+[tool.isort]
+profile = "black"
+known_first_party = ["sbo_create"]
+
 [tool.mypy]
 strict = true
 warn_return_any = true

{sbo_create-2.3.1 → sbo_create-2.3.2}/sbo_create/__metadata__.py

@@ -4,7 +4,7 @@
 __prog__: str = 'sbo-create'
 __author__: str = 'dslackw'
 __copyright__: str = '2015-2026'
-__version__: str = '2.3.1'
+__version__: str = '2.3.2'
 __license__: str = 'GNU General Public License v3 (GPLv3)'
 __email__: str = 'dslackw@gmail.com'
 __website__: str = 'https://gitlab.com/dslackw/sbo-create'

{sbo_create-2.3.1 → sbo_create-2.3.2}/sbo_create/handlers/files.py

@@ -9,8 +9,15 @@ import sys
 from collections.abc import Callable
 from pathlib import Path
 
-from sbo_create.models import (PROG, AppContext, colorize, confirm,
-                               select_option, set_arm_labels, set_x86_labels)
+from sbo_create.models import (
+    PROG,
+    AppContext,
+    colorize,
+    confirm,
+    select_option,
+    set_arm_labels,
+    set_x86_labels,
+)
 from sbo_create.template_loader import TemplateLoader
 
 

{sbo_create-2.3.1 → sbo_create-2.3.2}/sbo_create/handlers/fix.py

@@ -8,8 +8,13 @@ import re
 from pathlib import Path
 
 from sbo_create.handlers.files import FileHandler
-from sbo_create.models import (SOURCE_EXTENSIONS, UNSUPPORTED, AppContext,
-                               colorize, confirm)
+from sbo_create.models import (
+    SOURCE_EXTENSIONS,
+    UNSUPPORTED,
+    AppContext,
+    colorize,
+    confirm,
+)
 
 
 class FixHandler:  # pylint: disable=too-few-public-methods

{sbo_create-2.3.1 → sbo_create-2.3.2}/sbo_create/handlers/misc.py

@@ -17,8 +17,14 @@ from urllib3.exceptions import HTTPError  # pylint: disable=import-error
 from sbo_create.handlers.fallback import SboResolver
 from sbo_create.handlers.files import FileHandler
 from sbo_create.handlers.validate import ValidateHandler
-from sbo_create.models import (EMAIL_RE, PROG, SOURCE_EXTENSIONS, AppContext,
-                               colorize, confirm)
+from sbo_create.models import (
+    EMAIL_RE,
+    PROG,
+    SOURCE_EXTENSIONS,
+    AppContext,
+    colorize,
+    confirm,
+)
 
 
 def _print_tree_branch(  # pylint: disable=too-many-arguments,too-many-positional-arguments
@@ -433,7 +439,7 @@ class MiscHandler:
             raise SystemExit(1) from exc
         raise SystemExit(0)
 
-    def _diff_files(self, sbo_pkg_path: Path, local_path: Path, context: int) -> bool:  # pylint: disable=too-many-locals
+    def _diff_files(self, sbo_pkg_path: Path, local_path: Path, context: int) -> bool:  # pylint: disable=[too-many-locals, too-many-branches]
         """Compute and print a unified diff between SBo repo files and local files.
 
         Args:
@@ -444,9 +450,21 @@ class MiscHandler:
         Returns:
             True if at least one file had differences, False otherwise.
         """
+        try:
+            repo_files: set[str] = {f.name for f in sbo_pkg_path.iterdir() if f.is_file()}
+            local_files: set[str] = {f.name for f in local_path.iterdir() if f.is_file()}
+        except FileNotFoundError as err:
+            if not sbo_pkg_path.is_dir():
+                print(colorize(f"Error: SBo repository path not found: '{sbo_pkg_path}'", "red"))
+            elif not local_path.is_dir():
+                print(colorize(f"Error: Local package path not found: '{local_path}'", "red"))
+            else:
+                print(colorize(f"Error: Path not found: '{err.filename}'", "red"))
+            return False
+
         any_diff: bool = False
         skipped: list[str] = []
-        for filename in sorted(f.name for f in sbo_pkg_path.iterdir() if f.is_file()):
+        for filename in sorted(repo_files):
             if filename.endswith(SOURCE_EXTENSIONS):
                 if (local_path / filename).is_file():
                     skipped.append(filename)
@@ -476,8 +494,9 @@ class MiscHandler:
             for src in skipped:
                 print(src)
 
-        repo_files: set[str] = {f.name for f in sbo_pkg_path.iterdir() if f.is_file()}
-        local_files: set[str] = {f.name for f in local_path.iterdir() if f.is_file()}
+        # repo_files: set[str] = {f.name for f in sbo_pkg_path.iterdir() if f.is_file()}
+        # local_files: set[str] = {f.name for f in local_path.iterdir() if f.is_file()}
+
         new_files: list[str] = sorted(local_files - repo_files)
         if new_files:
             print("\nNew in local (not in SBo repo):")
@@ -516,8 +535,12 @@ class MiscHandler:
             if not sbo_pkg_path.is_dir():
                 print(colorize(f"{PROG}: '{category}/{name}' not found in repo.", 'red'))
                 continue
-            local_path: Path = (self.ctx.current_folder if from_cwd
-                                else self.ctx.current_folder / orig_name)
+
+            if from_cwd or self.ctx.current_folder.name == name:
+                local_path: Path = self.ctx.current_folder
+            else:
+                local_path = self.ctx.current_folder / orig_name
+
             if sbo_pkg_path.resolve() == local_path.resolve():
                 print(colorize(
                     f"{PROG}: '{name}' local path and repo path are the same directory.\n"

{sbo_create-2.3.1 → sbo_create-2.3.2}/sbo_create/handlers/validate.py

@@ -13,8 +13,14 @@ import urllib3  # pylint: disable=import-error
 from sbo_create.handlers.fallback import SboResolver
 from sbo_create.handlers.files import FileHandler
 from sbo_create.handlers.fix import FixHandler
-from sbo_create.models import (EMAIL_RE, PROG, SOURCE_EXTENSIONS, UNSUPPORTED,
-                               AppContext, colorize)
+from sbo_create.models import (
+    EMAIL_RE,
+    PROG,
+    SOURCE_EXTENSIONS,
+    UNSUPPORTED,
+    AppContext,
+    colorize,
+)
 
 
 class ValidateHandler: