From: Roland Häder Date: Mon, 21 Apr 2025 02:27:26 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0ce1d90ee0c41857e0e9e090698bf35d3d50f7a6;p=fba.git Continued: - avoided another indenting by using `continue` for unwanted state --- diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py index 200fa3b..7cfbd91 100644 --- a/fba/networks/pleroma.py +++ b/fba/networks/pleroma.py @@ -36,7 +36,7 @@ logger = logging.getLogger(__name__) #logger.setLevel(logging.DEBUG) # Language mapping X -> English -language_mapping = { +_language_mapping = { # English -> English "filtered media" : "filtered_media", "limited servers" : "followers_only", @@ -361,47 +361,48 @@ def fetch_blocks_from_about(domain: str) -> dict: block_level = tidyup.reason(header.text).lower() logger.debug("block_level='%s' - BEFORE!", block_level) - if block_level in language_mapping: + if block_level in _language_mapping: logger.debug("block_level='%s' - FOUND!", block_level) - block_level = language_mapping[block_level].lower() + block_level = _language_mapping[block_level].lower() else: logger.warning("block_level='%s' not found in language mapping table", block_level) logger.debug("block_level='%s - AFTER!'", block_level) - if block_level in blocklist: - # replaced find_next_siblings with find_all_next to account for instances that for example hide lists in dropdown menu - logger.debug("Found block_level='%s', importing domain blocks ...", block_level) - for line in header.find_next("table").find_all("tr")[1:]: - logger.debug("line[]='%s'", type(line)) - tds = line.find_all("td") - - logger.debug("tds[%s]()=%d", type(tds), len(tds)) - if len(tds) == 0: - logger.warning("No 'td' tag found in line[]='%s' - SKIPPED!", type(line)) - continue + if not block_level in blocklist: + logger.warning("block_level='%s' not found in blocklist()=%d - SKIPPED!", block_level, len(blocklist)) + continue + + # replaced find_next_siblings with find_all_next to account for instances that for example hide lists in dropdown menu + logger.debug("Found block_level='%s', importing domain blocks ...", block_level) + for line in header.find_next("table").find_all("tr")[1:]: + logger.debug("line[]='%s'", type(line)) + tds = line.find_all("td") + + logger.debug("tds[%s]()=%d", type(tds), len(tds)) + if len(tds) == 0: + logger.warning("No 'td' tag found in line[]='%s' - SKIPPED!", type(line)) + continue - blocked = tds[0].text.strip() - reason = tds[1].text.strip() + blocked = tds[0].text.strip() + reason = tds[1].text.strip() - logger.debug("blocked='%s',reason='%s' - BEFORE!", blocked, reason) - blocked = tidyup.domain(blocked) if blocked != "" else None - reason = tidyup.reason(reason) if reason != "" else None - logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason) + logger.debug("blocked='%s',reason='%s' - BEFORE!", blocked, reason) + blocked = tidyup.domain(blocked) if blocked != "" else None + reason = tidyup.reason(reason) if reason != "" else None + logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason) - if blocked in [None, ""]: - logger.debug("domain='%s',block_level='%s': blocked='%s' is empty - SKIPPED!", domain, block_level, blocked) - continue - elif not domain_helper.is_wanted(blocked): - logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked) - continue + if blocked in [None, ""]: + logger.debug("domain='%s',block_level='%s': blocked='%s' is empty - SKIPPED!", domain, block_level, blocked) + continue + elif not domain_helper.is_wanted(blocked): + logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked) + continue - logger.debug("Appending block_level='%s',blocked='%s',reason='%s' ...", block_level, blocked, reason) - blocklist[block_level].append({ - "blocked": blocked, - "reason" : reason, - }) - else: - logger.warning("block_level='%s' not found in blocklist()=%d", block_level, len(blocklist)) + logger.debug("Appending block_level='%s',blocked='%s',reason='%s' ...", block_level, blocked, reason) + blocklist[block_level].append({ + "blocked": blocked, + "reason" : reason, + }) logger.debug("Returning blocklist for domain='%s' - EXIT!", domain) return blocklist