From: Roland Häder Date: Tue, 1 Jul 2025 23:48:49 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=71d0b6a6be2007d5239288e193cfa48f1ef0ed33;p=fba.git Continued: - renamed processing.() to processing.process_() - fixed some `f-string-without-interpolation` warnings --- diff --git a/daemon.py b/daemon.py index 0c73a22..eaad355 100755 --- a/daemon.py +++ b/daemon.py @@ -149,14 +149,14 @@ LIMIT ?", [value, amount] ) elif mode == "added": database.cursor.execute( - f"SELECT * \ + "SELECT * \ FROM instances \ ORDER BY first_seen DESC \ LIMIT ?", [amount] ) elif mode == "updated": database.cursor.execute( - f"SELECT * \ + "SELECT * \ FROM instances \ ORDER BY last_updated DESC \ LIMIT ?", [amount] diff --git a/fba/commands.py b/fba/commands.py index 6483a29..4997215 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -196,7 +196,7 @@ def fetch_bkali(args: argparse.Namespace) -> int: logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) sources.update(source_domain) - domains = [] + domains = {} try: logger.info("Fetching domainlist from source_domain='%s' ...", source_domain) fetched = network.post_json_api( @@ -228,7 +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])) + 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: @@ -463,7 +463,7 @@ def fetch_blocks(args: argparse.Namespace) -> int: logger.info("Fetching new instance block[blocked]'%s' for row[domain]='%s' ...", block["blocked"], row["domain"]) federation.fetch_instances(block["blocked"], row["domain"], None, inspect.currentframe().f_code.co_name) - if processing.block(row["domain"], block["blocked"], block["reason"], block["block_level"]) and block["block_level"] in ["rejected", "suspended"] and _bot_enabled: + if processing.process_block(row["domain"], block["blocked"], block["reason"], block["block_level"]) and block["block_level"] in ["rejected", "suspended"] and _bot_enabled: logger.debug("Appending block[blocked]'%s',reason='%s' for row[domain]='%s' ...", block["blocked"], block["block_level"], row["domain"]) blockdict.append({ "blocked": block["blocked"], @@ -699,7 +699,7 @@ def fetch_todon_wiki(args: argparse.Namespace) -> int: logger.info("Adding new block: blocked='%s',block_level='%s'", blocked, block_level) - if processing.block(blocker, blocked, None, block_level) and block_level in ["suspended", "rejected"] and _bot_enabled: + if processing.process_block(blocker, blocked, None, block_level) and block_level in ["suspended", "rejected"] and _bot_enabled: logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", blocked, block_level, blocker) blockdict.append({ "blocked": blocked, @@ -806,7 +806,7 @@ def fetch_cs(args: argparse.Namespace): logger.warning("Exception '%s' during fetching instances (fetch_cs) from row[domain]='%s'", type(exception), row["domain"]) instances.set_last_error(row["domain"], exception) - if processing.block(blocker, row["domain"], row["reason"], block_level) and block_level in ["suspended", "rejected"] and _bot_enabled: + if processing.process_block(blocker, row["domain"], row["reason"], block_level) and block_level in ["suspended", "rejected"] and _bot_enabled: logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", row["domain"], block_level, blocker) blockdict.append({ "blocked": row["domain"], @@ -1183,7 +1183,7 @@ def fetch_txt(args: argparse.Namespace) -> int: continue logger.debug("Processing domain='%s',row[blocker]='%s' ...", domain, row["blocker"]) - processed = processing.instance(domain, row["blocker"], inspect.currentframe().f_code.co_name, force=args.force_all) + processed = processing.process_instance(domain, row["blocker"], inspect.currentframe().f_code.co_name, force=args.force_all) logger.debug("processed='%s'", processed) logger.debug("Success! - EXIT!") @@ -1458,7 +1458,7 @@ def recheck_obfuscation(args: argparse.Namespace) -> int: block["block_level"] = blocks_helper.alias_block_level(block["block_level"]) logger.debug("block[block_level]='%s' - AFTER!", block["block_level"]) - if processing.block(row["domain"], blocked, block["reason"], block["block_level"]) and block["block_level"] in ["suspended", "rejected"] and _bot_enabled: + if processing.process_block(row["domain"], blocked, block["reason"], block["block_level"]) and block["block_level"] in ["suspended", "rejected"] and _bot_enabled: logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", blocked, block["block_level"], row["domain"]) blockdict.append({ "blocked": blocked, diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py index 09f223c..0b735ce 100644 --- a/fba/helpers/processing.py +++ b/fba/helpers/processing.py @@ -41,7 +41,7 @@ logger = logging.getLogger(__name__) # "Cache" configuration get() invocations _bot_enabled = config.get("bot_enabled") -def instance(blocked: str, blocker: str, command: str, force: bool = False) -> bool: +def process_instance(blocked: str, blocker: str, command: str, force: bool = False) -> bool: logger.debug("blocked='%s',blocker='%s',command='%s',force='%s' - CALLED!", blocked, blocker, command, force) domain_helper.raise_on(blocked) domain_helper.raise_on(blocker) @@ -91,7 +91,7 @@ def instance(blocked: str, blocker: str, command: str, force: bool = False) -> b logger.debug("processed='%s' - EXIT!", processed) return processed -def block(blocker: str, blocked: str, reason: str, block_level: str) -> bool: +def process_block(blocker: str, blocked: str, reason: str, block_level: str) -> bool: logger.debug("blocker='%s',blocked='%s',reason='%s',block_level='%s' - CALLED!", blocker, blocked, reason, block_level) domain_helper.raise_on(blocker) domain_helper.raise_on(blocked) @@ -227,10 +227,10 @@ def csv_block(blocker: str, url: str, command: str) -> None: continue logger.debug("Processing domain='%s',blocker='%s',command='%s' ...", domain, blocker, command) - processed = instance(domain, blocker, command) + processed = process_instance(domain, blocker, command) logger.debug("processed='%s'", processed) - if block(blocker, domain, reason, severity) and _bot_enabled: + if process_block(blocker, domain, reason, severity) and _bot_enabled: logger.debug("Appending blocked='%s',reason='%s' for blocker='%s' ...", domain, reason, blocker) blockdict.append({ "blocked": domain, @@ -240,10 +240,11 @@ def csv_block(blocker: str, url: str, command: str) -> None: logger.debug("reject_media='%s',reject_reports='%s'", reject_media, reject_reports) if reject_media: logger.debug("blocker='%s',domain='%s',reject_media=True", blocker, domain) - block(blocker, domain, None, "reject_media") + process_block(blocker, domain, None, "reject_media") + if reject_reports: logger.debug("blocker='%s',domain='%s',reject_reports=True", blocker, domain) - block(blocker, domain, None, "reject_reports") + process_block(blocker, domain, None, "reject_reports") logger.debug("Invoking commit() ...") database.connection.commit() @@ -333,7 +334,7 @@ def csv_instance(instance: str, url: str, command: str) -> None: continue logger.debug("Processing domain='%s',instance='%s',command='%s' ...", domain, instance, command) - processed = instance(domain, instance, command) + processed = process_instance(domain, instance, command) logger.debug("processed='%s'", processed) logger.debug("Invoking commit() ...") diff --git a/fba/helpers/software.py b/fba/helpers/software.py index f7565e1..10a1cf2 100644 --- a/fba/helpers/software.py +++ b/fba/helpers/software.py @@ -312,7 +312,7 @@ def is_relay(software: str) -> bool: def remove_extras(software: str): logger.debug("software[%s]='%s' - CALLED!", type(software), software) if not isinstance(software, str): - raise TypeError(f"software[]='%s' is not type of 'str'", type(software)) + raise TypeError(f"software[]='{type(software)}' is not type of 'str'") if software == "": logger.debug("Corrected empty string to None for software.") diff --git a/fba/models/blocks.py b/fba/models/blocks.py index 61db783..b4eb2f5 100644 --- a/fba/models/blocks.py +++ b/fba/models/blocks.py @@ -255,7 +255,7 @@ def delete(domain: str) -> None: logger.debug("domain='%s' - CALLED!", domain) domain_helper.raise_on(domain) - database.cursor.execute(f"DELETE FROM blocks WHERE blocker = ? OR blocked = ?", [domain, domain]) + database.cursor.execute("DELETE FROM blocks WHERE blocker = ? OR blocked = ?", [domain, domain]) logger.debug("Invoking commit() ...") database.connection.commit()