Make use of new function format_json().

diff --git a/bots/sledrun_json_edit.py b/bots/sledrun_json_edit.py
index e98d8f589f8efd6d1ebdd14c6b3b8e6aefaaf057..07e887271e377d8661fb7e1d8885f035d968a446 100644 (file)
--- a/bots/sledrun_json_edit.py
+++ b/bots/sledrun_json_edit.py
@@ -23,7 +23,7 @@ from pywikibot.bot import (
     SingleSiteBot,
 )
 
     SingleSiteBot,
 )
 

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 from wrpylib.wrmwmarkup import create_sledrun_wiki
 
 docuReplacements = {'&params;': pagegenerators.parameterHelp}
 from wrpylib.wrmwmarkup import create_sledrun_wiki
 
 docuReplacements = {'&params;': pagegenerators.parameterHelp}


@@ -60,7 +60,7 @@ class SledrunFromJsonBot(
 
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
 
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         # *here*, sledrun_json can be processed
 
 
         # *here*, sledrun_json can be processed
 


@@ -69,7 +69,7 @@ class SledrunFromJsonBot(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'JSON Daten aktualisiert.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'JSON Daten aktualisiert.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/sledrun_json_edit_nightlight_and_sled_rental.py b/bots/sledrun_json_edit_nightlight_and_sled_rental.py
index d808d7ad076e76040d27c4e662b3c0117435c6bf..999d1602a4b282c25c7976bec0ddaf32bd98c840 100644 (file)
--- a/bots/sledrun_json_edit_nightlight_and_sled_rental.py
+++ b/bots/sledrun_json_edit_nightlight_and_sled_rental.py
@@ -23,7 +23,7 @@ from pywikibot.bot import (
     SingleSiteBot,
 )
 
     SingleSiteBot,
 )
 

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 from wrpylib.wrmwmarkup import create_sledrun_wiki
 
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki
 
 


@@ -61,7 +61,7 @@ class SledrunFromJsonBot(
 
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
 
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         sled_rental_description = sledrun_json.get('sled_rental_description')
         if sled_rental_description is not None and len(sled_rental_description) < 8 and (
 
         sled_rental_description = sledrun_json.get('sled_rental_description')
         if sled_rental_description is not None and len(sled_rental_description) < 8 and (


@@ -82,7 +82,7 @@ class SledrunFromJsonBot(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'JSON Daten aktualisiert.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'JSON Daten aktualisiert.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/sledrun_json_validate.py b/bots/sledrun_json_validate.py
index 458c89f2ac477df9d3f2a9cfa899d8764c35e896..8de9ffbd676b5f0835b615e6d5745710274637f2 100644 (file)
--- a/bots/sledrun_json_validate.py
+++ b/bots/sledrun_json_validate.py
@@ -23,7 +23,7 @@ from pywikibot.bot import (
     SingleSiteBot,
 )
 
     SingleSiteBot,
 )
 

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 docuReplacements = {'&params;': pagegenerators.parameterHelp}
 
 
 docuReplacements = {'&params;': pagegenerators.parameterHelp}
 


@@ -46,13 +46,13 @@ class SledrunFromJsonBot(
         if not sledrun_json_page.exists():
             return
         content_json = json.loads(sledrun_json_page.text)
         if not sledrun_json_page.exists():
             return
         content_json = json.loads(sledrun_json_page.text)

-        text_orig = json.dumps(content_json, ensure_ascii=False, indent=4)
+        text_orig = format_json(content_json)

         try:
             validate(instance=content_json, schema=self.sledrun_schema)
 
             content_json_ordered = order_json_keys(content_json, self.sledrun_schema)
             assert content_json_ordered == content_json
         try:
             validate(instance=content_json, schema=self.sledrun_schema)
 
             content_json_ordered = order_json_keys(content_json, self.sledrun_schema)
             assert content_json_ordered == content_json

-            text = json.dumps(content_json_ordered, ensure_ascii=False, indent=4)
+            text = format_json(content_json_ordered)

 
         except jsonschema.exceptions.ValidationError as e:
             text = str(e)
 
         except jsonschema.exceptions.ValidationError as e:
             text = str(e)

diff --git a/bots/sledrun_wikitext_to_json.py b/bots/sledrun_wikitext_to_json.py
index 81c2a9b55eddf4863c86f7eed5e35a18c0aa7fa8..c73385cfc9f2261b543891eb3f0c997ba22400ae 100644 (file)
--- a/bots/sledrun_wikitext_to_json.py
+++ b/bots/sledrun_wikitext_to_json.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -448,7 +448,7 @@ class SledrunWikiTextToJsonBot(
         jsonschema.validate(instance=sledrun_json, schema=self.sledrun_schema)
         sledrun_json_ordered = order_json_keys(sledrun_json, self.sledrun_schema)
         assert sledrun_json_ordered == sledrun_json
         jsonschema.validate(instance=sledrun_json, schema=self.sledrun_schema)
         sledrun_json_ordered = order_json_keys(sledrun_json, self.sledrun_schema)
         assert sledrun_json_ordered == sledrun_json

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         if not sledrun_json_page.exists():
             summary = 'Rodelbahnbeschreibung konvertiert von Wikitext nach JSON.'
             pywikibot.output('\03{lightpurple}---\03{default}')
         if not sledrun_json_page.exists():
             summary = 'Rodelbahnbeschreibung konvertiert von Wikitext nach JSON.'
             pywikibot.output('\03{lightpurple}---\03{default}')


@@ -457,7 +457,7 @@ class SledrunWikiTextToJsonBot(
             self.userPut(sledrun_json_page, sledrun_json_page.text, sledrun_json_text, summary=summary, contentmodel='json')
 
         if map_json is not None and not map_json_page.exists():
             self.userPut(sledrun_json_page, sledrun_json_page.text, sledrun_json_text, summary=summary, contentmodel='json')
 
         if map_json is not None and not map_json_page.exists():

-            map_json_text = json.dumps(map_json, ensure_ascii=False, indent=4)
+            map_json_text = format_json(map_json)

             summary = 'Landkarte konvertiert von Wikitext nach JSON.'
             self.userPut(map_json_page, map_json_page.text, map_json_text, summary=summary, contentmodel='json')
 
             summary = 'Landkarte konvertiert von Wikitext nach JSON.'
             self.userPut(map_json_page, map_json_page.text, map_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_car_distances.py b/bots/update_sledrun_json_from_wikitext_car_distances.py
index 20f323e2ae7678d536e8136daaf364b81bae5a9d..aaf0ed2236d2cdf2e8f60bc57c9f8c77e1656042 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_car_distances.py
+++ b/bots/update_sledrun_json_from_wikitext_car_distances.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -67,7 +67,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         car_distances = []
         for line in self.current_page.text.split('\n'):
 
         car_distances = []
         for line in self.current_page.text.split('\n'):


@@ -96,7 +96,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Entfernung mit dem Auto im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Entfernung mit dem Auto im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_correction.py b/bots/update_sledrun_json_from_wikitext_correction.py
index 01311a3f6c709b41ffed2342b4d120d7c2ddf788..3bd9c3b3a30c4735af4cd90a0463bdd1ce8a11f7 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_correction.py
+++ b/bots/update_sledrun_json_from_wikitext_correction.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -70,7 +70,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         def _button_bar():
             bb_iter = wikicode.ifilter_templates(recursive=False, matches=lambda t: t.name.strip() == 'Buttonleiste')
 
         def _button_bar():
             bb_iter = wikicode.ifilter_templates(recursive=False, matches=lambda t: t.name.strip() == 'Buttonleiste')


@@ -96,7 +96,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Korrektur-Kontakt Information im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Korrektur-Kontakt Information im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_gastronomy.py b/bots/update_sledrun_json_from_wikitext_gastronomy.py
index 3d23b8a28771b30c5da05497a81ed52ef5f4813c..42fffa7868e94c0b447e37173293f61d9ac59ec9 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_gastronomy.py
+++ b/bots/update_sledrun_json_from_wikitext_gastronomy.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -71,7 +71,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         for v in wikicode.get_sections(levels=[2], matches='Allgemeines'):
             def _gastronomy(value: str):
 
         for v in wikicode.get_sections(levels=[2], matches='Allgemeines'):
             def _gastronomy(value: str):


@@ -127,7 +127,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Gastronomie Information im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Gastronomie Information im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_gütesiegel.py b/bots/update_sledrun_json_from_wikitext_gütesiegel.py
index 3f7b5ce21b7a9dbe4795ee5876f20681e01618cc..de0831ee17e419122d1c9283ac528e5e4e5e7750 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_gütesiegel.py
+++ b/bots/update_sledrun_json_from_wikitext_gütesiegel.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -70,7 +70,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json)

 
         def _tiroler_naturrodelbahn_guetesiegel(wikicode) -> Optional[dict]:
             for gst in wikicode.filter_templates():
 
         def _tiroler_naturrodelbahn_guetesiegel(wikicode) -> Optional[dict]:
             for gst in wikicode.filter_templates():


@@ -114,7 +114,7 @@ class UpdateSledrunJsonFromWikiText(
         jsonschema.validate(instance=sledrun_json, schema=self.sledrun_schema)
         sledrun_json_ordered = order_json_keys(sledrun_json, self.sledrun_schema)
         assert sledrun_json_ordered == sledrun_json
         jsonschema.validate(instance=sledrun_json, schema=self.sledrun_schema)
         sledrun_json_ordered = order_json_keys(sledrun_json, self.sledrun_schema)
         assert sledrun_json_ordered == sledrun_json

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         if sledrun_json == sledrun_json_orig:
             return
         summary = 'Gütesiegel im Rodelbahn JSON aktualisiert vom Wikitext.'
         if sledrun_json == sledrun_json_orig:
             return
         summary = 'Gütesiegel im Rodelbahn JSON aktualisiert vom Wikitext.'

diff --git a/bots/update_sledrun_json_from_wikitext_see_also.py b/bots/update_sledrun_json_from_wikitext_see_also.py
index c09e6a8de680f174be18c93d9f76cb8bcd6dc02f..2d18f2907e390d36e02817c096795ce07f969986 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_see_also.py
+++ b/bots/update_sledrun_json_from_wikitext_see_also.py
@@ -33,7 +33,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -72,7 +72,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         def _strip_brackets(text: str) -> str:
             """Removes brackets if they are present"""
 
         def _strip_brackets(text: str) -> str:
             """Removes brackets if they are present"""


@@ -122,7 +122,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Information zu "Siehe auch" im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Information zu "Siehe auch" im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_sledrun_list.py b/bots/update_sledrun_json_from_wikitext_sledrun_list.py
index eb9e65bd4e4db61a484f76ab09e226fded0bbc0d..971d602105896bc5f2f0f92f77bce6a2b8a6ecc9 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_sledrun_list.py
+++ b/bots/update_sledrun_json_from_wikitext_sledrun_list.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -71,7 +71,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         for v in wikicode.get_sections(levels=[2], matches='Allgemeines'):
             def _sledrun_list(value: str):
 
         for v in wikicode.get_sections(levels=[2], matches='Allgemeines'):
             def _sledrun_list(value: str):


@@ -105,7 +105,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Information zu "Anderen Rodelbahnen" im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Information zu "Anderen Rodelbahnen" im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_walkup_time_note.py b/bots/update_sledrun_json_from_wikitext_walkup_time_note.py
index 8d38ae9c00b6a516cc9105904b501e48a6545c08..34c3a0d396877266aa0c78efb00416434853a576 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_walkup_time_note.py
+++ b/bots/update_sledrun_json_from_wikitext_walkup_time_note.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -68,7 +68,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         for line in self.current_page.text.split('\n'):
             match = re.match(r'\* \{\{Gehzeit}}(.*)', line)
 
         for line in self.current_page.text.split('\n'):
             match = re.match(r'\* \{\{Gehzeit}}(.*)', line)


@@ -86,7 +86,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Gehzeit-Kommentar im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Gehzeit-Kommentar im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/bots/update_sledrun_json_from_wikitext_webcam.py b/bots/update_sledrun_json_from_wikitext_webcam.py
index 90a11e2c8fc97997b7245f3fc76f990e7e50feee..be92e3eac0a61e1edaddc8f43409a5438928e47a 100644 (file)
--- a/bots/update_sledrun_json_from_wikitext_webcam.py
+++ b/bots/update_sledrun_json_from_wikitext_webcam.py
@@ -32,7 +32,7 @@ from pywikibot.bot import (
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace
 )
 from pywikibot.logging import warning
 from pywikibot.site._namespace import BuiltinNamespace

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \
 
 from wrpylib.wrmwmarkup import create_sledrun_wiki, lonlat_to_json, lonlat_ele_to_json, parse_wrmap
 from wrpylib.wrvalidators import rodelbahnbox_from_template, tristate_german_to_str, difficulty_german_to_str, \


@@ -70,7 +70,7 @@ class UpdateSledrunJsonFromWikiText(
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)
             return
         sledrun_json = json.loads(sledrun_json_page.text)
         sledrun_json_orig = json.loads(sledrun_json_page.text)

-        sledrun_json_orig_text = json.dumps(sledrun_json_orig, ensure_ascii=False, indent=4)
+        sledrun_json_orig_text = format_json(sledrun_json_orig)

 
         def _button_bar():
             bb_iter = wikicode.ifilter_templates(recursive=False, matches=lambda t: t.name.strip() == 'Buttonleiste')
 
         def _button_bar():
             bb_iter = wikicode.ifilter_templates(recursive=False, matches=lambda t: t.name.strip() == 'Buttonleiste')


@@ -90,7 +90,7 @@ class UpdateSledrunJsonFromWikiText(
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return
         assert sledrun_json_ordered == sledrun_json
         if sledrun_json == sledrun_json_orig:
             return

-        sledrun_json_text = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+        sledrun_json_text = format_json(sledrun_json_ordered)

         summary = 'Webcam Information im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 
         summary = 'Webcam Information im Rodelbahn JSON aktualisiert vom Wikitext.'
         self.userPut(sledrun_json_page, sledrun_json_orig_text, sledrun_json_text, summary=summary, contentmodel='json')
 

diff --git a/scripts/osm_to_wrgeojson.py b/scripts/osm_to_wrgeojson.py
index 5d8dcb556e86446f30f0ca65675caa3602e2ec99..c3fa3b5e216ccab67e8db4379183c05a612e6664 100644 (file)
--- a/scripts/osm_to_wrgeojson.py
+++ b/scripts/osm_to_wrgeojson.py
@@ -5,6 +5,7 @@ from typing import Optional
 from xml.etree.ElementTree import ElementTree
 
 from wrpylib.argparse_tools import bool_type
 from xml.etree.ElementTree import ElementTree
 
 from wrpylib.argparse_tools import bool_type

+from wrpylib.json_tools import format_json

 from wrpylib.wrgeojson import join_wrgeojson_ways, simplify_ways
 from wrpylib.wrosm import find_sledrun_relations, tags, convert_osm_to_geojson, DeRefError
 
 from wrpylib.wrgeojson import join_wrgeojson_ways, simplify_ways
 from wrpylib.wrosm import find_sledrun_relations, tags, convert_osm_to_geojson, DeRefError
 


@@ -49,7 +50,7 @@ def process_osm_file(filename: str, single: Optional[int], join_ways: bool, simp
             simplify_ways(sledrun_geojson)
 
         # Print result
             simplify_ways(sledrun_geojson)
 
         # Print result

-        print(json.dumps(sledrun_geojson, ensure_ascii=False, indent=4))
+        print(format_json(sledrun_geojson))

         print()
 
 
         print()
 
 

diff --git a/scripts/update_guetesiegel_from_official_list.py b/scripts/update_guetesiegel_from_official_list.py
index e42dcc0421ef4b9a4aa38dd6b9bffbb423e143f9..df415f98cbf15523033193a01de4218de123d483 100644 (file)
--- a/scripts/update_guetesiegel_from_official_list.py
+++ b/scripts/update_guetesiegel_from_official_list.py
@@ -62,6 +62,8 @@ from requests import Session
 from shapely.geometry import shape
 from sqlalchemy import create_engine, text
 
 from shapely.geometry import shape
 from sqlalchemy import create_engine, text
 

+from wrpylib.json_tools import format_json
+

 
 def update_sledrun(connection: sqlalchemy.engine.Connection, api_url: str, session: Session,
                    csrf_token: str, shp_crs: Union[dict, str], lon_lat_crs: Union[dict, str], feature: dict):
 
 def update_sledrun(connection: sqlalchemy.engine.Connection, api_url: str, session: Session,
                    csrf_token: str, shp_crs: Union[dict, str], lon_lat_crs: Union[dict, str], feature: dict):


@@ -127,7 +129,7 @@ def update_sledrun(connection: sqlalchemy.engine.Connection, api_url: str, sessi
                 print(f"{properties['STAETTE_NA']} has a different ID")
                 return
             gs['stätte_id'] = properties['STAETTE_ID']
                 print(f"{properties['STAETTE_NA']} has a different ID")
                 return
             gs['stätte_id'] = properties['STAETTE_ID']

-            new_sledrun_json = json.dumps(sledrun_json, ensure_ascii=False, indent=4)
+            new_sledrun_json = format_json(sledrun_json)

             post_data = {
                 'action': 'edit',
                 'pageid': row.sledrun_json_page_id,
             post_data = {
                 'action': 'edit',
                 'pageid': row.sledrun_json_page_id,

diff --git a/scripts/update_links_almenrausch.py b/scripts/update_links_almenrausch.py
index 8d8e624bd26336ef690ed9fc1af59ce40db0b5cb..64248addcf04a08a3d2b483939d2a00f0c87e0bd 100644 (file)
--- a/scripts/update_links_almenrausch.py
+++ b/scripts/update_links_almenrausch.py
@@ -10,7 +10,7 @@ from typing import List
 import jsonschema
 from pywikiapi import Site  # https://github.com/nyurik/pywikiapi
 
 import jsonschema
 from pywikiapi import Site  # https://github.com/nyurik/pywikiapi
 

-from wrpylib.json_tools import order_json_keys
+from wrpylib.json_tools import order_json_keys, format_json

 
 
 def query_page(site: Site, title: str) -> dict:
 
 
 def query_page(site: Site, title: str) -> dict:


@@ -39,7 +39,7 @@ def update_sledrun(site: Site, schema: dict, title: str, almenrausch_url: str):
     jsonschema.validate(instance=sledrun_json, schema=schema)
     sledrun_json_ordered = order_json_keys(sledrun_json, schema)
     assert sledrun_json_ordered == sledrun_json
     jsonschema.validate(instance=sledrun_json, schema=schema)
     sledrun_json_ordered = order_json_keys(sledrun_json, schema)
     assert sledrun_json_ordered == sledrun_json

-    sledrun_json_str = json.dumps(sledrun_json_ordered, ensure_ascii=False, indent=4)
+    sledrun_json_str = format_json(sledrun_json_ordered)

 
     site(
         'edit',
 
     site(
         'edit',