lint: reformat python code with black
This commit is contained in:
parent
331beb01b4
commit
a406a7974b
88 changed files with 2579 additions and 1608 deletions
|
@ -26,13 +26,15 @@ def onion_alternative(origin: Origin) -> List[BC2Alternative]:
|
|||
url: Optional[str] = origin.onion()
|
||||
if url is None:
|
||||
return []
|
||||
return [{
|
||||
"proto": "tor",
|
||||
"type": "eotk",
|
||||
"created_at": str(origin.added),
|
||||
"updated_at": str(origin.updated),
|
||||
"url": url
|
||||
}]
|
||||
return [
|
||||
{
|
||||
"proto": "tor",
|
||||
"type": "eotk",
|
||||
"created_at": str(origin.added),
|
||||
"updated_at": str(origin.updated),
|
||||
"url": url,
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
def proxy_alternative(proxy: Proxy) -> Optional[BC2Alternative]:
|
||||
|
@ -43,43 +45,51 @@ def proxy_alternative(proxy: Proxy) -> Optional[BC2Alternative]:
|
|||
"type": "mirror",
|
||||
"created_at": proxy.added.isoformat(),
|
||||
"updated_at": proxy.updated.isoformat(),
|
||||
"url": proxy.url
|
||||
"url": proxy.url,
|
||||
}
|
||||
|
||||
|
||||
def main_domain(origin: Origin) -> str:
|
||||
description: str = origin.description
|
||||
if description.startswith("proxy:"):
|
||||
return description[len("proxy:"):].replace("www.", "")
|
||||
return description[len("proxy:") :].replace("www.", "")
|
||||
domain_name: str = origin.domain_name
|
||||
return domain_name.replace("www.", "")
|
||||
|
||||
|
||||
def active_proxies(origin: Origin, pool: Pool) -> List[Proxy]:
|
||||
return [
|
||||
proxy for proxy in origin.proxies
|
||||
if proxy.url is not None and not proxy.deprecated and not proxy.destroyed and proxy.pool_id == pool.id
|
||||
proxy
|
||||
for proxy in origin.proxies
|
||||
if proxy.url is not None
|
||||
and not proxy.deprecated
|
||||
and not proxy.destroyed
|
||||
and proxy.pool_id == pool.id
|
||||
]
|
||||
|
||||
|
||||
def mirror_sites(pool: Pool) -> BypassCensorship2:
|
||||
origins = Origin.query.filter(Origin.destroyed.is_(None)).order_by(Origin.domain_name).all()
|
||||
origins = (
|
||||
Origin.query.filter(Origin.destroyed.is_(None))
|
||||
.order_by(Origin.domain_name)
|
||||
.all()
|
||||
)
|
||||
|
||||
sites: List[BC2Site] = []
|
||||
for origin in origins:
|
||||
# Gather alternatives, filtering out None values from proxy_alternative
|
||||
alternatives = onion_alternative(origin) + [
|
||||
alt for proxy in active_proxies(origin, pool)
|
||||
alt
|
||||
for proxy in active_proxies(origin, pool)
|
||||
if (alt := proxy_alternative(proxy)) is not None
|
||||
]
|
||||
|
||||
# Add the site dictionary to the list
|
||||
sites.append({
|
||||
"main_domain": main_domain(origin),
|
||||
"available_alternatives": list(alternatives)
|
||||
})
|
||||
sites.append(
|
||||
{
|
||||
"main_domain": main_domain(origin),
|
||||
"available_alternatives": list(alternatives),
|
||||
}
|
||||
)
|
||||
|
||||
return {
|
||||
"version": "2.0",
|
||||
"sites": sites
|
||||
}
|
||||
return {"version": "2.0", "sites": sites}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue