Continued:

- ops, forgot to add already found domains to list
- added info message for checking rows

diff --git a/fba/commands.py b/fba/commands.py
index 89f7d28ea11d6ba6c50388d78557a76fa0535f48..69d9ed5b03a58dcb91d928df8dafc5951345780a 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -228,6 +228,7 @@ def fetch_bkali(args: argparse.Namespace) -> int:
         elif "nodeinfo" not in rows["data"]:
             raise KeyError(f"WARNING: rows()={len(rows['data'])} does not contain key 'nodeinfo'")
 
+        logger.info("Checking %d rows ...", len(rows[data][nodeinfo]))
         for entry in rows["data"]["nodeinfo"]:
             logger.debug("entry[%s]='%s'", type(entry), entry)
             if "domain" not in entry:
@@ -1558,7 +1559,7 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
         database.cursor.execute("SELECT domain, software FROM instances WHERE original_software = ? ORDER BY last_updated ASC", [args.original_software])
     elif args.mode not in [None, ""]:
         logger.info("Fetching domains for args.mode='%s' ...", args.mode.upper())
-        database.cursor.execute("SELECT domain, software FROM instances WHERE detection_mode = ? ORDER BY last_updated ASC", [args.mode])
+        database.cursor.execute("SELECT domain, software FROM instances WHERE detection_mode = ? ORDER BY last_updated ASC", [args.mode.upper()])
     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")
@@ -1589,7 +1590,7 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
 
     logger.info("Checking %d domain(s) ...", len(rows))
     for row in rows:
-        logger.debug("row[]='%s'", type(row))
+        logger.debug("row[domain]='%s',row[software]='%s'", row["domain"], row["software"])
         if not domain_helper.is_tld_wanted(row["domain"]):
             logger.debug("row[domain]='%s' has an unwanted TLD - SKIPPED!", row["domain"])
             continue
@@ -1604,9 +1605,9 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
             logger.info("Checking nodeinfo for row[domain]='%s',row[software]='%s' (%s%%) ...", row["domain"], row["software"], "{:5.1f}".format(cnt / len(rows) * 100))
             software = federation.determine_software(row["domain"])
 
-            logger.debug("Determined software='%s',row[software]='%s'", software, row["software"])
+            logger.debug("Determined software='%s',row[software]='%s' for row[domain]='%s'", software, row["software"], row["domain"])
             if (software != row["software"] and software is not None) or args.force_all is True or args.force_update_none is True:
-                logger.debug("software='%s'", software)
+                logger.debug("software[%s]='%s',row[software]='%s' has changed for was forced.", type(software), software, row["software"])
                 if software is None:
                     logger.debug("Setting nodeinfo_url to 'None' for row[domain]='%s' ...", row["domain"])
                     instances.set_nodeinfo_url(row["domain"], None)
@@ -1614,7 +1615,7 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
                 logger.warning("Software type for row[domain]='%s' has changed from '%s' to '%s'!", row["domain"], row["software"], software)
                 instances.set_software(row["domain"], software)
 
-            logger.debug("software='%s'", software)
+            logger.debug("software[%s]='%s'", type(software), software)
             if software is not None:
                 logger.debug("Setting row[domain]='%s' as successfully determined ...", row["domain"])
                 instances.set_success(row["domain"])
@@ -1667,7 +1668,7 @@ def fetch_instances_social(args: argparse.Namespace) -> int:
 
     logger.info("Checking %d row(s) ...", len(rows))
     for row in rows:
-        logger.debug("row[]='%s' - BEFORE!", type(row))
+        logger.debug("row[name]='%s' - BEFORE!", row["name"])
         domain = tidyup.domain(row["name"]) if row["name"] not in [None, ""] else None
         logger.debug("domain='%s' - AFTER!", domain)
 
@@ -1698,6 +1699,9 @@ def fetch_instances_social(args: argparse.Namespace) -> int:
         logger.info("Fetching instances from domain='%s' ...", domain)
         federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name)
 
+        logger.debug("Appending domain='%s' ...", domain)
+        domains.append(domain)
+
     logger.debug("Success! - EXIT!")
     return 0
 
@@ -1759,6 +1763,9 @@ def fetch_relaylist(args: argparse.Namespace) -> int:
         logger.info("Fetching instances from domain='%s'", domain)
         federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name)
 
+        logger.debug("Appending domain='%s' ...", domain)
+        domains.append(domain)
+
     logger.debug("Success! - EXIT!")
     return 0