study/chsrc
1
0
Fork 0
mirror of https://github.com/RubyMetric/chsrc synced 2025-07-13 18:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix target name displaying when cesu

Browse Source
This commit is contained in:
Aoran Zeng 2024-08-16 19:06:16 +08:00
parent 4bdce5ca83
commit 9d16a50c55
No known key found for this signature in database
GPG Key ID: 8F8BA8488E10ED98
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chsrc.c
View File

@ -360,7 +360,7 @@ get_target (const char *input, TargetOp code, char *option)
} }
else if (TargetOp_Cesu_Source==code) else if (TargetOp_Cesu_Source==code)
{ {
auto_select_ (target->sources, target->sources_n, input-3); auto_select_ (target->sources, target->sources_n, input);
return true; return true;
} }
return true; return true;

28
src/chsrc.h
View File

@ -2,13 +2,13 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2023-2024 Aoran Zeng, Heng Guo * Copyright © 2023-2024 Aoran Zeng, Heng Guo
* ------------------------------------------------------------- * -------------------------------------------------------------
* File : chsrc.h * File Name : chsrc.h
* Authors : Aoran Zeng <ccmywish@qq.com> * File Authors : Aoran Zeng <ccmywish@qq.com>
* | Heng Guo <2085471348@qq.com> * | Heng Guo <2085471348@qq.com>
* Contributors : Peng Gao <gn3po4g@outlook.com> * Contributors : Peng Gao <gn3po4g@outlook.com>
* | * |
* Created on : <2023-08-29> * Created on : <2023-08-29>
* Last modified : <2024-08-09> * Last modified : <2024-08-16>
* *
* chsrc 头文件 * chsrc 头文件
* ------------------------------------------------------------*/ * ------------------------------------------------------------*/
@ -352,11 +352,11 @@ get_max_ele_idx_in_dbl_ary (double *array, int size)
*/ */
#define auto_select(s) auto_select_(s##_sources, s##_sources_n, (char*)#s+3) #define auto_select(s) auto_select_(s##_sources, s##_sources_n, (char*)#s+3)
int int
auto_select_ (SourceInfo *sources, size_t size, const char *target) auto_select_ (SourceInfo *sources, size_t size, const char *target_name)
{ {
if (0==size || 1==size) if (0==size || 1==size)
{ {
chsrc_error (xy_strjoin (3, "当前 ", target, " 无任何可用源，请联系维护者: chsrc issue")); chsrc_error (xy_strjoin (3, "当前 ", target_name, " 无任何可用源，请联系维护者: chsrc issue"));
exit (Exit_MatinerIssue); exit (Exit_MatinerIssue);
} }
@ -406,7 +406,7 @@ auto_select_ (SourceInfo *sources, size_t size, const char *target)
int fast_idx = get_max_ele_idx_in_dbl_ary (speeds, size); int fast_idx = get_max_ele_idx_in_dbl_ary (speeds, size);
if (only_one) if (only_one)
chsrc_succ (xy_strjoin (4, sources[fast_idx].mirror->name, " 是 ", target, " 目前唯一可用镜像站，感谢他们的慷慨支持")); chsrc_succ (xy_strjoin (4, sources[fast_idx].mirror->name, " 是 ", target_name, " 目前唯一可用镜像站，感谢他们的慷慨支持"));
else else
puts (xy_2strjoin ("最快镜像站: ", to_green (sources[fast_idx].mirror->name))); puts (xy_2strjoin ("最快镜像站: ", to_green (sources[fast_idx].mirror->name)));
@ -821,19 +821,3 @@ chsrc_get_cpuarch ()
} }
} }
/* Target Info */
typedef struct TargetInfo_t {
void (*getfn) (char *option);
void (*setfn) (char *option);
void (*resetfn) (char *option);
SourceInfo *sources;
size_t sources_n;
} TargetInfo;
// 大部分target还不支持reset，所以暂时先默认设置为NULL来过渡
#define def_target(t) TargetInfo t##_target = {t##_getsrc, t##_setsrc, NULL, t##_sources, t##_sources_n}
#define def_target_full(t) TargetInfo t##_target = {t##_getsrc, t##_setsrc, t##_resetsrc, t##_sources, t##_sources_n}
#define def_target_noget(t) TargetInfo t##_target = {NULL, t##_setsrc, NULL, t##_sources, t##_sources_n}