expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-17 00:47:09 +00:00
Code Issues 18 Projects 3 Activity

fixed many problems in creating new entrances

Browse Source
This commit is contained in:
Philip Sargent
2023-11-07 02:12:57 +02:00
parent bd0a9332df
commit 07d9365747
8 changed files with 136 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/models/caves.py
View File

@@ -198,22 +198,13 @@ class Cave(TroggleModel):
res += "–" + prevR
return res
def writeDataFile(self):
"""Seems to be a duplicate of file_output() ?!
REFACTOR"""
filepath = os.path.join(settings.CAVEDESCRIPTIONS, self.filename)
t = loader.get_template("dataformat/cave.xml")
now = datetime.now(timezone.utc)
print(now)
c = dict({"cave": self, "date": now})
u = t.render(c)
writetrogglefile(filepath, u)
return
def file_output(self):
"""This produces the content which wll be re-saved as the cave_data html file.
"""
if not self.filename:
self.filename = self.slug() + ".html"
self.save()
filepath = Path(settings.CAVEDESCRIPTIONS, self.filename)
t = loader.get_template("dataformat/cave.xml")
@@ -221,6 +212,11 @@ class Cave(TroggleModel):
c = dict({"cave": self, "date": now})
content = t.render(c)
return (filepath, content, "utf8")
def writeDataFile(self):
filepath, content, coding = self.file_output()
writetrogglefile(filepath, content)
return
class Entrance(TroggleModel):
MARKING_CHOICES = (
@@ -388,6 +384,9 @@ class Entrance(TroggleModel):
return Path(settings.ENTRANCEDESCRIPTIONS, self.filename)
def file_output(self):
if not self.filename:
self.filename = self.slug + ".html"
self.save()
filepath = Path(os.path.join(settings.ENTRANCEDESCRIPTIONS, self.filename))
t = loader.get_template("dataformat/entrance.xml")
@@ -397,13 +396,8 @@ class Entrance(TroggleModel):
return (filepath, content, "utf8")
def writeDataFile(self):
filepath = os.path.join(settings.ENTRANCEDESCRIPTIONS, self.filename)
t = loader.get_template("dataformat/entrance.xml")
now = datetime.now(timezone.utc)
c = dict({"entrance": self, "date": now})
u = t.render(c)
writetrogglefile(filepath, u)
filepath, content, coding = self.file_output()
writetrogglefile(filepath, content)
return
def url_parent(self):