Continued:

- cut out ' - ' only if found

diff --git a/fba/helpers/software.py b/fba/helpers/software.py
index 266a6ddc9d42fa874820fcd143d0c5d62f565708..31224b4d3bfd2adee559ea6a9a1be52d4685ed58 100644 (file)
--- a/fba/helpers/software.py
+++ b/fba/helpers/software.py
@@ -55,7 +55,8 @@ def alias(software: str) -> str:
     elif "powered by" in software:
         logger.debug("software='%s' has 'powered by' in it", software)
         software = version.strip_powered_by(software)
-    elif isinstance(software, str) and " by " in software:
+
+    if isinstance(software, str) and " by " in software:
         logger.debug("software='%s' has ' by ' in it", software)
         software = version.strip_until(software, " by ")
     elif isinstance(software, str) and " - " in software:

diff --git a/fba/helpers/version.py b/fba/helpers/version.py
index 19ad5207461860ae9b06fbb3bc26d18a25b6195a..2ea6219617f820584055b46cbba728296484a860 100644 (file)
--- a/fba/helpers/version.py
+++ b/fba/helpers/version.py
@@ -101,7 +101,8 @@ def strip_powered_by(software: str) -> str:
     software = software[start + 11:].strip()
     logger.debug("software='%s'", software)
 
-    software = strip_until(software, " - ")
+    if " - " in software:
+        software = strip_until(software, " - ")
 
     logger.debug("software='%s' - EXIT!", software)
     return software
@@ -122,7 +123,8 @@ def strip_hosted_on(software: str) -> str:
     software = software[0:end].strip()
     logger.debug("software[%s]='%s'", type(software), software)
 
-    software = strip_until(software, " - ")
+    if " - " in software:
+        software = strip_until(software, " - ")
 
     logger.debug("software='%s' - EXIT!", software)
     return software