From a0b7aaabf45293c755212f1f9f4a7e7a7c99d306 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Sun, 10 Aug 2025 22:15:02 +0800 Subject: [PATCH] Rename to `Flatpak` --- src/chsrc-main.c | 7 +++---- src/framework/core.c | 14 +++++++------- src/framework/struct.h | 6 ++---- src/recipe/menu.c | 2 +- src/recipe/ware/{Flathub.c => Flatpak.c} | 18 +++++++++--------- 5 files changed, 22 insertions(+), 25 deletions(-) rename src/recipe/ware/{Flathub.c => Flatpak.c} (92%) diff --git a/src/chsrc-main.c b/src/chsrc-main.c index 32c1a43..8236387 100644 --- a/src/chsrc-main.c +++ b/src/chsrc-main.c @@ -560,7 +560,6 @@ iterate_menu_ (TargetRegisterInfo_t registry[], size_t size, const char *input, { if (entry->prelude) { - chsrc_log ("该target已定义 prelude()"); entry->prelude(); } else @@ -769,9 +768,9 @@ main (int argc, char const *argv[]) if (in_dry_run_mode()) { - char *dry_msg = ENGLISH ? "Enable [Dry Run] mode. " \ - "Simulate the source changing process (skipping speed measurement). " \ - "Commands only print but don't run\n" + char *dry_msg = ENGLISH ? "Enable [Dry Run] mode. " + "Simulate the source changing process (skipping speed measurement). " + "Commands only print but don't run\n" : "开启Dry Run模式，模拟换源过程(跳过测速)，命令仅打印并不运行\n"; chsrc_log (bdyellow(dry_msg)); } diff --git a/src/framework/core.c b/src/framework/core.c index bfef052..bf49253 100644 --- a/src/framework/core.c +++ b/src/framework/core.c @@ -458,11 +458,11 @@ chsrc_check_file (char *path) * * @note 一个源Source必定来自于一个Provider，所以该函数名叫 query_mirror_exist * - * @param target 目标名 - * @param input 如果用户输入 default 或者 def，则选择第一个源 + * @param target_name 目标名 + * @param input 如果用户输入 default 或者 def，则选择第一个源 */ int -query_mirror_exist (Source_t *sources, size_t size, char *target, char *input) +query_mirror_exist (Source_t *sources, size_t size, char *target_name, char *input) { if (chef_is_url (input)) { @@ -475,7 +475,7 @@ query_mirror_exist (Source_t *sources, size_t size, char *target, char *input) { char *msg1 = ENGLISH ? "Currently " : "当前 "; char *msg2 = ENGLISH ? " doesn't have any source available. Please contact the maintainers" : " 无任何可用源，请联系维护者"; - chsrc_error (xy_strjoin (3, msg1, target, msg2)); + chsrc_error (xy_strjoin (3, msg1, target_name, msg2)); exit (Exit_MaintainerCause); } @@ -483,7 +483,7 @@ query_mirror_exist (Source_t *sources, size_t size, char *target, char *input) { char *msg1 = ENGLISH ? "Currently " : "当前 "; char *msg2 = ENGLISH ? " only the upstream source exists. Please contact the maintainers" : " 仅存在上游默认源，请联系维护者"; - chsrc_error (xy_strjoin (3, msg1, target, msg2)); + chsrc_error (xy_strjoin (3, msg1, target_name, msg2)); exit (Exit_MaintainerCause); } @@ -502,7 +502,7 @@ query_mirror_exist (Source_t *sources, size_t size, char *target, char *input) : " 目前唯一可用镜像站，感谢他们的慷慨支持"; const char *name = ENGLISH ? sources[1].mirror->abbr : sources[1].mirror->name; - chsrc_succ (xy_strjoin (4, name, msg1, target, msg2)); + chsrc_succ (xy_strjoin (4, name, msg1, target_name, msg2)); } if (xy_streql ("first", input)) @@ -535,7 +535,7 @@ query_mirror_exist (Source_t *sources, size_t size, char *target, char *input) } char *msg = ENGLISH ? "To see available sources, use chsrc list " : "查看可使用源，请使用 chsrc list "; - chsrc_error (xy_2strjoin (msg, target)); + chsrc_error (xy_2strjoin (msg, target_name)); exit (Exit_UserCause); } return idx; diff --git a/src/framework/struct.h b/src/framework/struct.h index 6851d0c..3b83741 100644 --- a/src/framework/struct.h +++ b/src/framework/struct.h @@ -7,7 +7,7 @@ * Contributors : Shengwei Chen <414685209@qq.com> * | * Created On : <2023-08-29> - * Last Modified : <2025-08-09> + * Last Modified : <2025-08-10> * * chsrc struct * ------------------------------------------------------------*/ @@ -117,8 +117,6 @@ Contributor_t; typedef struct Target_t { - char *name; /* 目标名称，该名称必须是 menu 中的 aliase 之一 */ - void (*getfn) (char *option); void (*setfn) (char *option); void (*resetfn) (char *option); @@ -166,7 +164,7 @@ typedef struct TargetRegisterInfo_t TargetRegisterInfo_t; -#define def_target(t) void t##_getsrc(char *option);void t##_setsrc(char *option);void t##_resetsrc(char *option); Target_t t##_target={0}; +#define def_target(t) void t##_getsrc(char *option);void t##_setsrc(char *option);void t##_resetsrc(char *option); Target_t t##_target={name}; /* 以下宏仅能放在 prelude() 中使用 */ #define use_this(t) Target_t *this = &t##_target; diff --git a/src/recipe/menu.c b/src/recipe/menu.c index 676d2d9..9f5c775 100644 --- a/src/recipe/menu.c +++ b/src/recipe/menu.c @@ -90,7 +90,7 @@ chsrc_wr_menu[] = {t(wr_homebrew), "brew homebrew"}, {t(wr_cocoapods), "cocoa cocoapods cocoapod"}, {t(wr_dockerhub), "dockerhub docker"}, - {t(wr_flathub), "flathub flatpak"}, + {t(wr_flatpak), "flatpak flathub"}, {t(wr_nix), "nix"}, {t(wr_guix), "guix"}, {t(wr_emacs), "emacs elpa"}, diff --git a/src/recipe/ware/Flathub.c b/src/recipe/ware/Flatpak.c similarity index 92% rename from src/recipe/ware/Flathub.c rename to src/recipe/ware/Flatpak.c index b811e9c..2c2bc29 100644 --- a/src/recipe/ware/Flathub.c +++ b/src/recipe/ware/Flatpak.c @@ -2,13 +2,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(wr_flathub); +def_target(wr_flatpak); void -wr_flathub_prelude () +wr_flatpak_prelude () { - use_this(wr_flathub); - chef_allow_gsr(wr_flathub); + use_this(wr_flatpak); + chef_allow_gsr(wr_flatpak); chef_set_created_on (this, "2023-09-11"); chef_set_last_updated (this, "2025-08-09"); @@ -53,7 +53,7 @@ wr_flathub_prelude () void -wr_flathub_getsrc (char *option) +wr_flatpak_getsrc (char *option) { chsrc_run ("flatpak remotes", RunOpt_Default); chsrc_run ("flatpak remote-info flathub", RunOpt_Default); @@ -64,9 +64,9 @@ wr_flathub_getsrc (char *option) * @consult https://mirrors.sjtug.sjtu.edu.cn/docs/flathub */ void -wr_flathub_setsrc (char *option) +wr_flatpak_setsrc (char *option) { - use_this_source(wr_flathub); + use_this_source(wr_flatpak); chsrc_alert2 ("若出现问题，可先调用以下命令:"); char *note = xy_strjoin (3, @@ -89,7 +89,7 @@ wr_flathub_setsrc (char *option) void -wr_flathub_resetsrc (char *option) +wr_flatpak_resetsrc (char *option) { - wr_flathub_setsrc (option); + wr_flatpak_setsrc (option); }