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

onions: switch bc2 over to new onion table, drop mirrors table

Browse source 
fixes: #4
This commit is contained in:
Iain Learmonth 2022-05-17 09:44:18 +01:00
parent fce594bbc4
commit 23a8a6b8af
4 changed files with 81 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/mirrors.py
View file

@ -13,7 +13,6 @@ class Origin(AbstractConfiguration):
auto_rotation = db.Column(db.Boolean, nullable=False)
group = db.relationship("Group", back_populates="origins")
mirrors = db.relationship("Mirror", back_populates="origin")
proxies = db.relationship("Proxy", back_populates="origin")
alarms = db.relationship("Alarm", back_populates="origin")
@ -34,7 +33,7 @@ class Origin(AbstractConfiguration):
if not onion:
return None
domain_name: str = self.domain_name
return domain_name.replace(tld, f"{onion.onion_name}")
return f"https://{domain_name.replace(tld, onion.onion_name)}.onion"
class Proxy(AbstractResource):
@ -53,16 +52,3 @@ class Proxy(AbstractResource):
return super().csv_header() + [
"origin_id", "provider", "psg", "slug", "terraform_updated", "url"
]
class Mirror(AbstractResource):
origin_id = db.Column(db.Integer, db.ForeignKey("origin.id"), nullable=False)
url = db.Column(db.String(255), unique=True, nullable=False)
origin = db.relationship("Origin", back_populates="mirrors")
@classmethod
def csv_header(cls) -> List[str]:
return super().csv_header() + [
"origin_id", "url"
]