From fd12b8d12b71eef00c43f986a3b11f8869a18e9f Mon Sep 17 00:00:00 2001 From: Kronk Date: Sat, 24 Jun 2023 23:14:50 +0200 Subject: [PATCH] Fixed issue with zooms_generator.py match regex. Applied right prospector arguments. --- header_version_updater.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/header_version_updater.py b/header_version_updater.py index 1c558bd..177e81e 100644 --- a/header_version_updater.py +++ b/header_version_updater.py @@ -1,44 +1,43 @@ import re from pathlib import Path -version = input("New version = ").strip() +version_input = input("New version = ").strip() js_file = Path("melpomene.js") css_file = Path("melpomene.css") -js_css_match = r"(?<=/\* Version ).*(?= \*/)" - -js_variable_match = r"(?<=const MELPOMENE_VERSION = \").*(?=\";)" +JS_CSS_MATCH = r"(?<=/\* Version ).*(?= \*/)" +JS_VARIABLE_MATCH = r"(?<=const MELPOMENE_VERSION = \").*(?=\";)" html_file = Path("melpomene.html") demo_high_res_file = Path("demos/pepper_and_carrot_e35_highres.html") demo_low_res_file = Path("demos/pepper_and_carrot_e35_lowres.html") -html_match = r"(?<=)" +HTML_MATCH = r"(?<=)" zoom_generator_file = Path("zooms_generator.py") -zoom_generator_match = r"(?<=# Version ).*(?=$)" +ZOOM_GENERATOR_MATCH = r"(?<=# Version ).*(?=$)" def replace_version(version, file_path, matcher): with open(file=file_path, mode="r", encoding="UTF8") as file: file_data = file.read() - file_data = re.sub(matcher, version, file_data) + file_data = re.sub(matcher, version, file_data, flags=re.MULTILINE) with open(file=file_path, mode="w", encoding="UTF8") as file: file.write(file_data) -if re.match(r"[.a-zA-Z\ \-0-9]{1,30}", version): - replace_version(version, js_file, js_css_match) - replace_version(version, js_file, js_variable_match) +if re.match(r"[.a-zA-Z\ \-0-9]{1,30}", version_input): + replace_version(version_input, js_file, JS_CSS_MATCH) + replace_version(version_input, js_file, JS_VARIABLE_MATCH) - replace_version(version, css_file, js_css_match) + replace_version(version_input, css_file, JS_CSS_MATCH) - replace_version(version, html_file, html_match) - replace_version(version, demo_high_res_file, html_match) - replace_version(version, demo_low_res_file, html_match) + replace_version(version_input, html_file, HTML_MATCH) + replace_version(version_input, demo_high_res_file, HTML_MATCH) + replace_version(version_input, demo_low_res_file, HTML_MATCH) - replace_version(version, zoom_generator_file, zoom_generator_match) + replace_version(version_input, zoom_generator_file, ZOOM_GENERATOR_MATCH) print("Done") else: