From 4ccddc5aa54828e2bb09021db576d3ffd0c062f0 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Thu, 4 Jul 2024 01:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=20.yml=20?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=20YAML=20=E6=89=A9=E5=B1=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{pages.yaml => pages.yml} | 0 assets/{dump-configs.yaml => dump-configs.yml} | 0 assets/{fallback-configs.yaml => fallback-configs.yml} | 0 assets/fonts/ark-pixel/version.json | 4 ++-- assets/patch-glyphs/10/{config.yaml => config.yml} | 0 assets/patch-glyphs/12/{config.yaml => config.yml} | 0 assets/patch-glyphs/8/{config.yaml => config.yml} | 0 assets/{update-configs.yaml => update-configs.yml} | 0 tools/configs/dump.py | 2 +- tools/configs/fallback.py | 2 +- tools/configs/font.py | 2 +- tools/configs/update.py | 2 +- tools/services/update_service.py | 4 ++-- 13 files changed, 8 insertions(+), 8 deletions(-) rename .github/workflows/{pages.yaml => pages.yml} (100%) rename assets/{dump-configs.yaml => dump-configs.yml} (100%) rename assets/{fallback-configs.yaml => fallback-configs.yml} (100%) rename assets/patch-glyphs/10/{config.yaml => config.yml} (100%) rename assets/patch-glyphs/12/{config.yaml => config.yml} (100%) rename assets/patch-glyphs/8/{config.yaml => config.yml} (100%) rename assets/{update-configs.yaml => update-configs.yml} (100%) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yml similarity index 100% rename from .github/workflows/pages.yaml rename to .github/workflows/pages.yml diff --git a/assets/dump-configs.yaml b/assets/dump-configs.yml similarity index 100% rename from assets/dump-configs.yaml rename to assets/dump-configs.yml diff --git a/assets/fallback-configs.yaml b/assets/fallback-configs.yml similarity index 100% rename from assets/fallback-configs.yaml rename to assets/fallback-configs.yml diff --git a/assets/fonts/ark-pixel/version.json b/assets/fonts/ark-pixel/version.json index e10c27cf..74a5d093 100644 --- a/assets/fonts/ark-pixel/version.json +++ b/assets/fonts/ark-pixel/version.json @@ -1,6 +1,6 @@ { - "sha": "45e860d6fa8498a86c0b1fd1100c9655c5cc9a26", + "sha": "c361a4abf4e72741d8944b862c588c5b3d1d6265", "version": "develop", "version_url": "https://github.com/TakWolf/ark-pixel-font/tree/develop", - "asset_url": "https://github.com/TakWolf/ark-pixel-font/archive/45e860d6fa8498a86c0b1fd1100c9655c5cc9a26.zip" + "asset_url": "https://github.com/TakWolf/ark-pixel-font/archive/c361a4abf4e72741d8944b862c588c5b3d1d6265.zip" } diff --git a/assets/patch-glyphs/10/config.yaml b/assets/patch-glyphs/10/config.yml similarity index 100% rename from assets/patch-glyphs/10/config.yaml rename to assets/patch-glyphs/10/config.yml diff --git a/assets/patch-glyphs/12/config.yaml b/assets/patch-glyphs/12/config.yml similarity index 100% rename from assets/patch-glyphs/12/config.yaml rename to assets/patch-glyphs/12/config.yml diff --git a/assets/patch-glyphs/8/config.yaml b/assets/patch-glyphs/8/config.yml similarity index 100% rename from assets/patch-glyphs/8/config.yaml rename to assets/patch-glyphs/8/config.yml diff --git a/assets/update-configs.yaml b/assets/update-configs.yml similarity index 100% rename from assets/update-configs.yaml rename to assets/update-configs.yml diff --git a/tools/configs/dump.py b/tools/configs/dump.py index 9471ba64..5d0f016b 100644 --- a/tools/configs/dump.py +++ b/tools/configs/dump.py @@ -8,7 +8,7 @@ class DumpConfig: @staticmethod def load_all() -> dict[int, list['DumpConfig']]: - configs_data = fs_util.read_yaml(path_define.assets_dir.joinpath('dump-configs.yaml')) + configs_data = fs_util.read_yaml(path_define.assets_dir.joinpath('dump-configs.yml')) dump_configs = {font_size: [] for font_size in configs.font_sizes} for name, items_data in configs_data.items(): version = fs_util.read_json(path_define.fonts_dir.joinpath(name, 'version.json'))['version'] diff --git a/tools/configs/fallback.py b/tools/configs/fallback.py index f48de9aa..72b478ad 100644 --- a/tools/configs/fallback.py +++ b/tools/configs/fallback.py @@ -8,7 +8,7 @@ class FallbackConfig: @staticmethod def load_all() -> dict[int, list['FallbackConfig']]: - configs_data = fs_util.read_yaml(path_define.assets_dir.joinpath('fallback-configs.yaml')) + configs_data = fs_util.read_yaml(path_define.assets_dir.joinpath('fallback-configs.yml')) fallback_configs = {font_size: [] for font_size in configs.font_sizes} for config_data in configs_data: font_size = config_data['font_size'] diff --git a/tools/configs/font.py b/tools/configs/font.py index 66ebf555..34a113a0 100644 --- a/tools/configs/font.py +++ b/tools/configs/font.py @@ -27,7 +27,7 @@ def load_all() -> dict[int, 'FontConfig']: @staticmethod def load(font_size: int) -> 'FontConfig': - file_path = path_define.patch_glyphs_dir.joinpath(str(font_size), 'config.yaml') + file_path = path_define.patch_glyphs_dir.joinpath(str(font_size), 'config.yml') config_data = fs_util.read_yaml(file_path) layout_params = {} diff --git a/tools/configs/update.py b/tools/configs/update.py index 1a474d3e..9755f3d1 100644 --- a/tools/configs/update.py +++ b/tools/configs/update.py @@ -14,7 +14,7 @@ def __init__(self, file_name: str | None, copy_list: list[tuple[str, str]]): class UpdateConfig: @staticmethod def load_all() -> list['UpdateConfig']: - configs_data = fs_util.read_yaml(path_define.assets_dir.joinpath('update-configs.yaml')) + configs_data = fs_util.read_yaml(path_define.assets_dir.joinpath('update-configs.yml')) update_configs = [] for config_data in configs_data: name = config_data['name'] diff --git a/tools/services/update_service.py b/tools/services/update_service.py index 21315c37..d4475d28 100644 --- a/tools/services/update_service.py +++ b/tools/services/update_service.py @@ -86,8 +86,8 @@ def setup_ark_pixel_glyphs(): continue shutil.copytree(source_glyphs_dir_from, source_glyphs_dir_to) - config_file_path_from = path_define.ark_pixel_glyphs_dir.joinpath(str(font_size), 'config.yaml') - config_file_path_to = path_define.patch_glyphs_dir.joinpath(str(font_size), 'config.yaml') + config_file_path_from = path_define.ark_pixel_glyphs_dir.joinpath(str(font_size), 'config.yml') + config_file_path_to = path_define.patch_glyphs_dir.joinpath(str(font_size), 'config.yml') if config_file_path_to.exists(): os.remove(config_file_path_to) config_file_path_to.parent.mkdir(parents=True, exist_ok=True)