Continued:

- software doesn't need to be aliases each round as the variable isn't assigned
  inside the loop
- added check in software_helper.alias() if parameter 'software' is an empty
  string
- don't attempt to alias empty software string

diff --git a/fba/commands.py b/fba/commands.py
index ebca01e1eee11b92145e213366eb2850030dd283..c047597d4703d0a7f7945dd4911a9a781a95a441 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -516,6 +516,9 @@ def fetch_observer(args: argparse.Namespace) -> int:
     logger.info("Fetching %d different table data ...", len(types))
     for software in types:
         logger.debug("software='%s' - BEFORE!", software)
+        software = software_helper.alias(software)
+        logger.debug("software='%s' - AFTER!", software)
+
         if args.software is not None and args.software != software:
             logger.debug("args.software='%s' does not match software='%s' - SKIPPED!", args.software, software)
             continue
@@ -559,7 +562,6 @@ def fetch_observer(args: argparse.Namespace) -> int:
                 logger.debug("domain='%s' is already registered - SKIPPED!", domain)
                 continue
 
-            software = software_helper.alias(software)
             logger.info("Fetching instances for domain='%s'", domain)
             federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name)
 

diff --git a/fba/helpers/software.py b/fba/helpers/software.py
index 95a68180920f684d92640dacba965c0d57633811..29da2b6c6678e7ee348827383b3e89b104993a38 100644 (file)
--- a/fba/helpers/software.py
+++ b/fba/helpers/software.py
@@ -34,6 +34,8 @@ def alias(software: str) -> str:
 
     if not isinstance(software, str) and software is not None:
         raise ValueError(f"software[]='{type(software)}' is not type 'str'")
+    elif software == "":
+        raise ValueError("Parameter 'software' is empty")
 
     logger.debug("software='%s'- BEFORE!", software)
     software = tidyup.domain(software)

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 25ec633b85ab9556fedb4b1d86cc2f728fe35479..2c50f107934317e747835524c366d2193c82fac4 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -427,7 +427,7 @@ def determine_software(domain: str, path: str = None) -> str:
         logger.debug("Generator for domain='%s' is: '%s'", domain, software)
 
     logger.debug("software[%s]='%s'", type(software), software)
-    if software is None:
+    if software is None or software == "":
         logger.debug("Returning None - EXIT!")
         return None