Continued:

- also search for instances with detected software

diff --git a/fba/boot.py b/fba/boot.py
index 93d45462014eca19219bf437846a365ab09f123a..2ffdf16a4b44e2a4f0dfd72f4dce0382d5ab9a99 100644 (file)
--- a/fba/boot.py
+++ b/fba/boot.py
@@ -226,6 +226,7 @@ def init_parser():
     parser.add_argument("--no-software", action="store_true", help="Checks only entries with no software type detected.")
     parser.add_argument("--no-auto", action="store_true", help="Checks only entries with other than AUTO_DISCOVERY as detection mode.")
     parser.add_argument("--no-detection", action="store_true", help="Checks only entries with no detection mode set.")
+    parser.add_argument("--with-software", action="store_true", help="Checks only entries with any software type detected.")
 
     ### Fetch instances from instances.social ###
     parser = subparser_command.add_parser(

diff --git a/fba/commands.py b/fba/commands.py
index 8027683bd0932bcb989baaef18ad2cf76349bd16..ef8ee42f8251967d773f651750836b7510429cf3 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1489,6 +1489,9 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
     elif args.no_software:
         logger.info("Fetching domains with no software type detected ...")
         database.cursor.execute("SELECT domain, software FROM instances WHERE software IS NULL ORDER BY last_updated ASC")
+    elif args.with_software:
+        logger.info("Fetching domains with any software type detected ...")
+        database.cursor.execute("SELECT domain, software FROM instances WHERE software IS NOT NULL ORDER BY last_updated ASC")
     elif args.no_auto:
         logger.info("Fetching domains with other detection mode than AUTO_DISOVERY being set ...")
         database.cursor.execute("SELECT domain, software FROM instances WHERE detection_mode IS NOT NULL AND detection_mode != 'AUTO_DISCOVERY' ORDER BY last_updated ASC")