]> ToastFreeware Gitweb - philipp/winterrodeln/wrpylib.git/commitdiff
Detect impressions sub-page.
authorPhilipp Spitzer <philipp@spitzer.priv.at>
Sun, 9 Jan 2022 21:56:09 +0000 (22:56 +0100)
committerPhilipp Spitzer <philipp@spitzer.priv.at>
Sun, 9 Jan 2022 21:56:09 +0000 (22:56 +0100)
bots/sledrun_from_json.py
bots/sledrun_wikitext_to_json.py
wrpylib/templates/sledrun_wiki.txt
wrpylib/wrmwmarkup.py

index 8a16f1547bf66592133b69b3d8fff63242dd328d..73367bde8c5605378a0c7cc1739d4b4192885435 100644 (file)
@@ -51,7 +51,11 @@ class SledrunFromJsonBot(
             map_json = json.loads(map_json_page.text)
         else:
             map_json = None
-        text = create_sledrun_wiki(sledrun_json, map_json)
+        impressions = None
+        sledrun_impressions_page = Page(self.site, self.current_page.title() + '/Impressionen')
+        if sledrun_impressions_page.exists():
+            impressions = sledrun_impressions_page.title()
+        text = create_sledrun_wiki(sledrun_json, map_json, impressions)
         summary = 'Rodelbahnbeschreibung von aus JSON Daten aktualisiert.'
         self.put_current(text, summary=summary)
 
index f5d0434d75db4594770d2521cb5c3b5115455012..eff3f25b05c74ac9d57b4af588cb725ea5abcdea 100644 (file)
@@ -380,7 +380,12 @@ class SledrunWikiTextToJsonBot(
 
             sledrun_json['allow_reports'] = True
 
-        text = create_sledrun_wiki(sledrun_json, map_json)
+        impressions = None
+        sledrun_impressions_page = Page(self.site, self.current_page.title() + '/Impressionen')
+        if sledrun_impressions_page.exists():
+            impressions = sledrun_impressions_page.title()
+
+        text = create_sledrun_wiki(sledrun_json, map_json, impressions)
         summary = 'Rodelbahnbeschreibung nach Konvertierung nach und von JSON.'
         self.put_current(text, summary=summary)
 
index 492fd2d1b2beb1719c0c553faf6235b6c5ef19fd..67b39c41a6234aced9cda858ad489f3918763bdb 100644 (file)
@@ -44,6 +44,7 @@
 {%- if position %}|Wetter=Ja{% endif -%}
 {%- if videos %}|Video={{ videos[0].url }} {% endif -%}
 |Korrektur=Seite{% if correction_email %}|Korrektur_To={{ correction_email }}{% endif -%}
+{% if impressions_title %}|Impressionen={{ impressions_title }}{% endif -%}
 {% if freizeitticket_tyrol %}|Freizeitticket=Ja{% endif -%}
 {% if regio_card_tyrol %}|Regiocard=Ja{% endif -%}}}
 {% raw %}{{Clear}}{% endraw %}
index 6394e2bf98cb8b9d1b587aab373fb43bd80bb9d9..90f52cad8f8b847cda49013c939bb6ce2f357e25 100644 (file)
@@ -389,7 +389,7 @@ class Jinja2Tools:
         return str(wrpylib.mwmarkup.create_template(value['name'], args, kwargs))
 
 
-def create_sledrun_wiki(sledrun_json: Dict, map_json: Optional[Dict]) -> str:
+def create_sledrun_wiki(sledrun_json: Dict, map_json: Optional[Dict], impressions_title: Optional[str] = None) -> str:
     env = jinja2.Environment(
         loader=jinja2.PackageLoader("wrpylib"),
         autoescape=jinja2.select_autoescape(),
@@ -489,4 +489,5 @@ def create_sledrun_wiki(sledrun_json: Dict, map_json: Optional[Dict]) -> str:
 
     return template.render(sledrun_json=sledrun_json,
                            rodelbahnbox=rodelbahnbox,
-                           map_json=map_json, h=Jinja2Tools(), **sledrun_json)
+                           map_json=map_json, impressions_title=impressions_title,
+                           h=Jinja2Tools(), **sledrun_json)