jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lots of typing fixes

Browse source
This commit is contained in:
Iain Learmonth 2022-05-16 11:44:03 +01:00
parent 51f580a304
commit 3665c34961
43 changed files with 260 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/models/mirrors.py
View file

@ -1,4 +1,4 @@
from typing import Optional
from typing import Optional, List
from tldextract import extract
@ -18,12 +18,12 @@ class Origin(AbstractConfiguration):
alarms = db.relationship("Alarm", back_populates="origin")
@classmethod
def csv_header(cls):
def csv_header(cls) -> List[str]:
return super().csv_header() + [
"group_id", "domain_name"
]
def destroy(self):
def destroy(self) -> None:
super().destroy()
for proxy in self.proxies:
proxy.destroy()
@ -33,7 +33,8 @@ class Origin(AbstractConfiguration):
onion = Onion.query.filter(Onion.domain_name == tld).first()
if not onion:
return None
return self.domain_name.replace(tld, f"{onion.onion_name}")
domain_name: str = self.domain_name
return domain_name.replace(tld, f"{onion.onion_name}")
class Proxy(AbstractResource):
@ -48,7 +49,7 @@ class Proxy(AbstractResource):
alarms = db.relationship("Alarm", back_populates="proxy")
@classmethod
def csv_header(cls):
def csv_header(cls) -> List[str]:
return super().csv_header() + [
"origin_id", "provider", "psg", "slug", "terraform_updated", "url"
]
@ -61,7 +62,7 @@ class Mirror(AbstractResource):
origin = db.relationship("Origin", back_populates="mirrors")
@classmethod
def csv_header(cls):
def csv_header(cls) -> List[str]:
return super().csv_header() + [
"origin_id", "url"
]