Skip to content

Remove dead code and unnecessary global declarations #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhimehro merged 2 commits into from
Feb 28, 2026
Merged

Remove dead code and unnecessary global declarations #396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
662cb5e
Initial plan
Copilot Feb 20, 2026
a964692
Fix code quality issues: remove dead code and unnecessary global decl…
Copilot Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 2 additions & 162 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,154 +313,6 @@
print("")


def print_summary_table(results: List[Dict[str, Any]], dry_run: bool) -> None:
"""Prints a nicely formatted summary table."""
# Determine the width for the Profile ID column (min 25)
max_profile_len = max((len(r["profile"]) for r in results), default=25)
profile_col_width = max(25, max_profile_len)

# Calculate widths
col_widths = {
"profile": profile_col_width,
"folders": 10,
"rules": 10,
"duration": 10,
"status": 15,
}

if USE_COLORS:
# Unicode Box Drawing
chars = {
"tl": "┌", "tm": "┬", "tr": "┐",
"bl": "└", "bm": "┴", "br": "┘",
"ml": "├", "mm": "┼", "mr": "┤",
"v": "│", "h": "─",
}
else:
# ASCII Fallback
chars = {
"tl": "+", "tm": "+", "tr": "+",
"bl": "+", "bm": "+", "br": "+",
"ml": "+", "mm": "+", "mr": "+",
"v": "|", "h": "-",
}

def _print_separator(left, mid, right):
segments = [chars["h"] * (width + 2) for width in col_widths.values()]
print(f"{chars[left]}{chars[mid].join(segments)}{chars[right]}")

def _print_row(profile, folders, rules, duration, status, is_header=False):
v = chars["v"]

# 1. Pad raw strings first (so padding is calculated on visible chars)
p_val = f"{profile:<{col_widths['profile']}}"
f_val = f"{folders:>{col_widths['folders']}}"
r_val = f"{rules:>{col_widths['rules']}}"
d_val = f"{duration:>{col_widths['duration']}}"
s_val = f"{status:<{col_widths['status']}}"

# 2. Wrap in color codes if needed
if is_header and USE_COLORS:
p_val = f"{Colors.BOLD}{p_val}{Colors.ENDC}"
f_val = f"{Colors.BOLD}{f_val}{Colors.ENDC}"
r_val = f"{Colors.BOLD}{r_val}{Colors.ENDC}"
d_val = f"{Colors.BOLD}{d_val}{Colors.ENDC}"
s_val = f"{Colors.BOLD}{s_val}{Colors.ENDC}"

print(
f"{v} {p_val} {v} {f_val} {v} {r_val} {v} {d_val} {v} {s_val} {v}"
)

title_text = "DRY RUN SUMMARY" if dry_run else "SYNC SUMMARY"
title_color = Colors.CYAN if dry_run else Colors.HEADER

total_width = (
1 + (col_widths["profile"] + 2) + 1 +
(col_widths["folders"] + 2) + 1 +
(col_widths["rules"] + 2) + 1 +
(col_widths["duration"] + 2) + 1 +
(col_widths["status"] + 2) + 1
)

print("\n" + (f"{title_color}{title_text:^{total_width}}{Colors.ENDC}" if USE_COLORS else f"{title_text:^{total_width}}"))

_print_separator("tl", "tm", "tr")
# Header row - pad manually then print
_print_row("Profile ID", "Folders", "Rules", "Duration", "Status", is_header=True)
_print_separator("ml", "mm", "mr")

total_folders = 0
total_rules = 0
total_duration = 0.0
success_count = 0

for res in results:
# Profile
p_val = f"{res['profile']:<{col_widths['profile']}}"

# Folders
f_val = f"{res['folders']:>{col_widths['folders']}}"

# Rules
r_val = f"{res['rules']:>{col_widths['rules']},}"

# Duration
d_val = f"{res['duration']:>{col_widths['duration']-1}.1f}s"

# Status
status_label = res["status_label"]
s_val_raw = f"{status_label:<{col_widths['status']}}"
if USE_COLORS:
status_color = Colors.GREEN if res["success"] else Colors.FAIL
s_val = f"{status_color}{s_val_raw}{Colors.ENDC}"
else:
s_val = s_val_raw

# Delegate the actual row printing to the shared helper to avoid
# duplicating table border/spacing logic here.
_print_row(p_val, f_val, r_val, d_val, s_val)

total_folders += res["folders"]
total_rules += res["rules"]
total_duration += res["duration"]
if res["success"]:
success_count += 1

_print_separator("ml", "mm", "mr")

# Total Row
total = len(results)
all_success = success_count == total

if dry_run:
total_status_text = "✅ Ready" if all_success else "❌ Errors"
else:
total_status_text = "✅ All Good" if all_success else "❌ Errors"

p_val = f"{'TOTAL':<{col_widths['profile']}}"
if USE_COLORS:
p_val = f"{Colors.BOLD}{p_val}{Colors.ENDC}"

f_val = f"{total_folders:>{col_widths['folders']}}"
r_val = f"{total_rules:>{col_widths['rules']},}"
d_val = f"{total_duration:>{col_widths['duration']-1}.1f}s"

s_val_raw = f"{total_status_text:<{col_widths['status']}}"
if USE_COLORS:
status_color = Colors.GREEN if all_success else Colors.FAIL
s_val = f"{status_color}{s_val_raw}{Colors.ENDC}"
else:
s_val = s_val_raw

print(
f"{chars['v']} {p_val} "
f"{chars['v']} {f_val} "
f"{chars['v']} {r_val} "
f"{chars['v']} {d_val} "
f"{chars['v']} {s_val} {chars['v']}"
)

_print_separator("bl", "bm", "br")


def _get_progress_bar_width() -> int:
Expand Down Expand Up @@ -713,7 +565,7 @@
is logged but ignored - we simply start with empty cache.
This protects against crashes from corrupted cache files.
"""
global _disk_cache, _cache_stats
global _disk_cache

try:
cache_file = get_cache_dir() / "blocklists.json"
Expand Down Expand Up @@ -839,8 +691,6 @@
THREAD-SAFE: Uses _rate_limit_lock to protect shared state
GRACEFUL: Invalid/missing headers are ignored (no crashes)
"""
global _rate_limit_info

headers = response.headers

# Parse standard rate limit headers
Expand Down Expand Up @@ -937,7 +787,6 @@
f"Failed to resolve/validate domain {sanitize_for_log(hostname)}: {sanitize_for_log(e)}"
)
return False
return True


@lru_cache(maxsize=128)
Expand Down Expand Up @@ -966,8 +815,6 @@
)
return False

return True


def extract_profile_id(text: str) -> str:
"""
Expand Down Expand Up @@ -1121,28 +968,24 @@


def _api_get(client: httpx.Client, url: str) -> httpx.Response:
global _api_stats
with _api_stats_lock:
_api_stats["control_d_api_calls"] += 1
return _retry_request(lambda: client.get(url))


def _api_delete(client: httpx.Client, url: str) -> httpx.Response:
global _api_stats
with _api_stats_lock:
_api_stats["control_d_api_calls"] += 1
return _retry_request(lambda: client.delete(url))


def _api_post(client: httpx.Client, url: str, data: Dict) -> httpx.Response:
global _api_stats
with _api_stats_lock:
_api_stats["control_d_api_calls"] += 1
return _retry_request(lambda: client.post(url, data=data))


def _api_post_form(client: httpx.Client, url: str, data: Dict) -> httpx.Response:
global _api_stats
with _api_stats_lock:
_api_stats["control_d_api_calls"] += 1
return _retry_request(
Expand Down Expand Up @@ -1267,8 +1110,6 @@

SECURITY: Validates data structure regardless of cache source
"""
global _cache_stats, _api_stats

# First check: Quick check without holding lock for long
with _cache_lock:
if url in _cache:
Expand Down Expand Up @@ -1454,7 +1295,7 @@

_cache_stats["misses"] += 1

except httpx.HTTPStatusError as e:
except httpx.HTTPStatusError:
# Re-raise with original exception (don't catch and re-raise)
raise

Expand Down Expand Up @@ -2451,7 +2292,6 @@

# Handle --clear-cache: delete cache file and exit immediately
if args.clear_cache:
global _disk_cache
cache_file = get_cache_dir() / "blocklists.json"
if cache_file.exists():
try:
Expand Down Expand Up @@ -2635,7 +2475,7 @@
title_text = " DRY RUN SUMMARY " if args.dry_run else " SYNC SUMMARY "
title_color = Colors.CYAN if args.dry_run else Colors.HEADER

# Top Border (Single Cell for Title)

Check warning

Code scanning / Pylint (reported by Codacy)

Constant name "_disk_cache" doesn't conform to UPPER_CASE naming style Warning

Constant name "_disk_cache" doesn't conform to UPPER_CASE naming style

Check notice

Code scanning / Pylint (reported by Codacy)

Using the global statement Note

Using the global statement

Check warning

Code scanning / Pylintpython3 (reported by Codacy)

Constant name "_disk_cache" doesn't conform to UPPER_CASE naming style Warning

Constant name "_disk_cache" doesn't conform to UPPER_CASE naming style

Check notice

Code scanning / Pylintpython3 (reported by Codacy)

Using the global statement Note

Using the global statement
print("\n" + Box.TL + Box.H * (table_width - 2) + Box.TR)

# Title Row
Expand Down
Loading