study/chsrc
1
0
Fork 0
mirror of https://github.com/RubyMetric/chsrc synced 2025-06-11 05:24:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: reset still measure speed

Browse Source
This commit is contained in:
Aoran Zeng 2024-12-06 11:05:40 +08:00
parent 5ec75b379a
commit 68961a7d9c
No known key found for this signature in database
GPG Key ID: 8F8BA8488E10ED98
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chsrc-main.c
View File

@ -528,17 +528,17 @@ get_target (const char *input, TargetOp code, char *option)
if (TargetOp_Set_Source==code) if (TargetOp_Set_Source==code)
{ {
if (target->setfn) target->setfn(option); if (target->setfn) target->setfn(option);
else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现set功能，邀您帮助: chsrc issue")); else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现 set 功能，邀您帮助: chsrc issue"));
} }
else if (TargetOp_Reset_Source==code) else if (TargetOp_Reset_Source==code)
{ {
if (target->resetfn) target->resetfn(option); if (target->resetfn) target->resetfn(option);
else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现reset功能，邀您帮助: chsrc issue")); else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现 reset 功能，邀您帮助: chsrc issue"));
} }
else if (TargetOp_Get_Source==code) else if (TargetOp_Get_Source==code)
{ {
if (target->getfn) target->getfn(""); if (target->getfn) target->getfn("");
else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现get功能，邀您帮助: chsrc issue")); else chsrc_error (xy_strjoin (3, "暂未对 ", input, " 实现 get 功能，邀您帮助: chsrc issue"));
} }
else if (TargetOp_List_Config==code) else if (TargetOp_List_Config==code)
{ {

11
src/framework/core.c
View File

@ -678,13 +678,15 @@ measure_speed_for_every_source (Source_t sources[], int size, double speed_recor
/** /**
* 自动测速选择镜像站和源 * 自动测速选择镜像站和源
*
* @translation Done
*/ */
#define auto_select_mirror(s) select_mirror_autoly(s##_sources, s##_sources_n, (char*)#s+3) #define auto_select_mirror(s) select_mirror_autoly(s##_sources, s##_sources_n, (char*)#s+3)
int int
select_mirror_autoly (Source_t *sources, size_t size, const char *target_name) select_mirror_autoly (Source_t *sources, size_t size, const char *target_name)
{ {
/* reset 时选择默认源 */
if (ProgMode_CMD_Reset)
return 0;
if (!CliOpt_DryRun) if (!CliOpt_DryRun)
{ {
char *msg = CliOpt_InEnglish ? "Measuring speed in sequence" : "测速中"; char *msg = CliOpt_InEnglish ? "Measuring speed in sequence" : "测速中";
@ -701,11 +703,8 @@ select_mirror_autoly (Source_t *sources, size_t size, const char *target_name)
} }
if (CliOpt_DryRun) if (CliOpt_DryRun)
{
/* Dry Run 时，跳过测速 */ /* Dry Run 时，跳过测速 */
if (ProgMode_CMD_Reset) {
return 0; /* 选择默认源 */
else
return 1; /* 原则第一个源 */ return 1; /* 原则第一个源 */
} }