重构 yield source

src/chsrc-main.c

@@ -775,7 +775,7 @@ chefs_handle_Measure_Source (Dish_t *dish, const char *input, char *option)
     }
   else
     {
-      auto_select_mirror (dish->sources, dish->sources_n, input);
+      dish_select_fastest_source (dish);
       return;
     }
 }

src/framework/dish.c

@@ -39,6 +39,38 @@ dish_has_sub_dishes (Dish_t *dish)
 
 
 
+void
+push_combo_stack (Dish_t *combo_dish)
+{
+  if (ProgStatus.ComboStackDepth >= MaxComboStackDepth)
+    chsrc_breakdown ("combo dish 嵌套层级过深");
+
+  int depth = ProgStatus.ComboStackDepth;
+  ProgStatus.ComboStack[depth] = combo_dish;
+  ProgStatus.ComboBackedUpPaths[depth] = xy_seq_new ();
+  ProgStatus.ComboStackDepth++;
+}
+
+void
+pop_combo_stack (void)
+{
+  if (ProgStatus.ComboStackDepth <= 0)
+    chsrc_breakdown ("combo dish 栈已为空");
+
+  ProgStatus.ComboStackDepth--;
+}
+
+Dish_t *
+current_combo_dish ()
+{
+  if (ProgStatus.ComboStackDepth <= 0)
+    return NULL;
+
+  return ProgStatus.ComboStack[ProgStatus.ComboStackDepth - 1];
+}
+
+
+
 /**
  * @brief 判断 dish 是否拥有来自指定镜像站的源
  *
@@ -129,33 +161,102 @@ combo_at_least_one_sub_dish_has_source_from_mirror (Dish_t *combo_dish, const ch
   return false;
 }
 
-void
+
-push_combo_stack (Dish_t *combo_dish)
+Source_t
+dish_select_source_by_mirror_code (Dish_t *dish, char *mirror_code)
 {
-  if (ProgStatus.ComboStackDepth >= MaxComboStackDepth)
+  char *dish_name = dish->aliases;
-    chsrc_breakdown ("combo dish 嵌套层级过深");
+  Source_t *sources = dish->sources;
+  size_t size = dish->sources_n;
 
-  int depth = ProgStatus.ComboStackDepth;
+  if (0==size)
-  ProgStatus.ComboStack[depth] = combo_dish;
+    {
-  ProgStatus.ComboBackedUpPaths[depth] = xy_seq_new ();
+      char *msg1 = CHINESE ? "当前 " : "Currently ";
-  ProgStatus.ComboStackDepth++;
+      char *msg2 = CHINESE ? " 无任何可用源，请联系维护者" : " doesn't have any source available. Please contact the maintainers";
-}
+      chsrc_error (xy_strcat (3, msg1, dish_name, msg2));
+      exit (Exit_MaintainerCause);
+    }
 
-void
+  if (1==size)
-pop_combo_stack (void)
+    {
-{
+      char *msg1 = CHINESE ? "当前 " : "Currently ";
-  if (ProgStatus.ComboStackDepth <= 0)
+      char *msg2 = CHINESE ? " 仅存在上游默认源，请联系维护者" : " only the upstream source exists. Please contact the maintainers";
-    chsrc_breakdown ("combo dish 栈已为空");
+      chsrc_error (xy_strcat (3, msg1, dish_name, msg2));
+      exit (Exit_MaintainerCause);
+    }
 
-  ProgStatus.ComboStackDepth--;
+  if (chsrc_in_reset_mode())
-}
+    {
+      char *msg = CHINESE ? "将重置为上游默认源"
+                          : "Will reset to the upstream's default source";
+      say (msg);
+      return sources[0]; /* 返回第1个，因为第1个是上游默认源 */
+    }
 
+  if (2==size)
+    {
+      char *msg1 = CHINESE ? " 是 " : " is ";
+      char *msg2 = CHINESE ? " 目前唯一可用镜像站，感谢他们的慷慨支持"
+                           : "'s ONLY mirror available currently, thanks for their generous support";
+      const char *name = CHINESE ? sources[1].mirror->name
+                                 : sources[1].mirror->abbr;
+      chsrc_succ (xy_strcat (4, name, msg1, dish_name, msg2));
+    }
 
-Dish_t *
+  if (xy_streql ("first", mirror_code))
-current_combo_dish ()
+    {
-{
+      char *msg = ENGLISH ? "Will use the first speedy source measured by maintainers" : "将使用维护团队测速第一的源";
-  if (ProgStatus.ComboStackDepth <= 0)
+      say (msg);
-    return NULL;
+      return sources[1]; /* 返回第2个，因为第1个是上游默认源 */
+    }
 
-  return ProgStatus.ComboStack[ProgStatus.ComboStackDepth - 1];
+
+
+  Source_t src = sources[0];
+
+  bool exist = false;
+
+  for (int i=0; i<size; i++)
+    {
+      src = sources[i];
+      if (xy_streql (src.mirror->code, mirror_code))
+        {
+          exist = true;
+          break;
+        }
+    }
+
+  if (!exist)
+    {
+      bool mirror_site_exist = false;
+      for (int i=0; i<xy_seq_len(ProgStore.mirror_sites); i++)
+        {
+          MirrorSite_t *mir = xy_seq_at (ProgStore.mirror_sites, i);
+          if (xy_streql_ic (mir->code, mirror_code))
+            {
+              mirror_site_exist = true;
+              break;
+            }
+        }
+
+      if (mirror_site_exist)
+        {
+          char *msg1 = CHINESE ? "镜像站 "   : "Mirror site ";
+          char *msg2 = CHINESE ? " 存在，但未提供该软件源" : " exists, but is not available for this software";
+          chsrc_error (xy_strcat (3, msg1, mirror_code, msg2));
+          exit (Exit_UserCause);
+        }
+      else
+        {
+          char *msg1 = CHINESE ? "镜像站 "   : "Mirror site ";
+          char *msg2 = CHINESE ? " 不存在" : " doesn't exist";
+          chsrc_error (xy_strcat (3, msg1, mirror_code, msg2));
+        }
+
+      char *msg = CHINESE ? "查看可使用源，请使用 chsrc list "
+                          : "To see available sources, use chsrc list ";
+      chsrc_error (xy_2strcat (msg, dish_name));
+      exit (Exit_UserCause);
+    }
+  return src;
 }

src/framework/source.c

@@ -14,114 +14,6 @@
  * 源的确定
  * ------------------------------------------------------------*/
 
-/**
- * 用于 _setsrc() 函数，检测用户输入的镜像站 code，是否存在于该 dish 可用源中
- *
- * @note 一个源Source必定来自于一个Provider，所以该函数名叫 query_mirror_exist
- *
- * @param  dish_name  菜品名
- * @param  input      如果用户输入 `first`，则选择第一个源
- */
-int
-query_mirror_exist (Source_t *sources, size_t size, char *dish_name, char *input)
-{
-  if (hp_is_url (input))
-    {
-      char *msg = ENGLISH ? "Using user-defined sources for this software is not supported at this time, please contact the developers to ask why or request support" : "暂不支持对该软件使用用户自定义源，请联系开发者询问原因或请求支持";
-      chsrc_error (msg);
-      exit (Exit_Unsupported);
-    }
-
-  if (0==size)
-    {
-      char *msg1 = ENGLISH ? "Currently " : "当前 ";
-      char *msg2 = ENGLISH ? " doesn't have any source available. Please contact the maintainers" : " 无任何可用源，请联系维护者";
-      chsrc_error (xy_strcat (3, msg1, dish_name, msg2));
-      exit (Exit_MaintainerCause);
-    }
-
-  if (1==size)
-    {
-      char *msg1 = ENGLISH ? "Currently " : "当前 ";
-      char *msg2 = ENGLISH ? " only the upstream source exists. Please contact the maintainers" : " 仅存在上游默认源，请联系维护者";
-      chsrc_error (xy_strcat (3, msg1, dish_name, msg2));
-      exit (Exit_MaintainerCause);
-    }
-
-  /* if (xy_streql ("reset", input)) 不再使用这种方式 */
-  if (chsrc_in_reset_mode())
-    {
-      char *msg = ENGLISH ? "Will reset to the upstream's default source" : "将重置为上游默认源";
-      say (msg);
-      return 0; /* 返回第1个，因为第1个是上游默认源 */
-    }
-
-  if (2==size)
-    {
-      char *msg1 = ENGLISH ? " is " : " 是 ";
-      char *msg2 = ENGLISH ? "'s ONLY mirror available currently, thanks for their generous support"
-                           : " 目前唯一可用镜像站，感谢他们的慷慨支持";
-      const char *name = ENGLISH ? sources[1].mirror->abbr
-                                 : sources[1].mirror->name;
-      chsrc_succ (xy_strcat (4, name, msg1, dish_name, msg2));
-    }
-
-  if (xy_streql ("first", input))
-    {
-      char *msg = ENGLISH ? "Will use the first speedy source measured by maintainers" : "将使用维护团队测速第一的源";
-      say (msg);
-      return 1; /* 返回第2个，因为第1个是上游默认源 */
-    }
-
-  int idx = 0;
-  Source_t src = sources[0];
-
-  bool exist = false;
-  for (int i=0; i<size; i++)
-    {
-      src = sources[i];
-      if (xy_streql (src.mirror->code, input))
-        {
-          idx = i;
-          exist = true;
-          break;
-        }
-    }
-  if (!exist)
-    {
-      bool mirror_site_exist = false;
-      for (int i=0; i<xy_seq_len(ProgStore.mirror_sites); i++)
-        {
-          MirrorSite_t *mir = xy_seq_at (ProgStore.mirror_sites, i);
-          if (xy_streql_ic (mir->code, input))
-            {
-              mirror_site_exist = true;
-              break;
-            }
-        }
-
-      if (mirror_site_exist)
-        {
-          char *msg1 = ENGLISH ? "Mirror site "   : "镜像站 ";
-          char *msg2 = ENGLISH ? " exists, but is not available for this software" : " 存在，但未提供该软件源";
-          chsrc_error (xy_strcat (3, msg1, input, msg2));
-          exit (Exit_UserCause);
-        }
-      else
-        {
-          char *msg1 = ENGLISH ? "Mirror site "   : "镜像站 ";
-          char *msg2 = ENGLISH ? " doesn't exist" : " 不存在";
-          chsrc_error (xy_strcat (3, msg1, input, msg2));
-        }
-
-      char *msg = ENGLISH ? "To see available sources, use chsrc list " : "查看可使用源，请使用 chsrc list ";
-      chsrc_error (xy_2strcat (msg, dish_name));
-      exit (Exit_UserCause);
-    }
-  return idx;
-}
-
-
 /**
  * 该函数来自 oh-my-mirrorz.py，由 @ccmywish 翻译为C语言，但功劳和版权属于原作者
  *
@@ -421,24 +313,28 @@ measure_speed_for_every_source (Source_t sources[], int size, double speed_recor
 /**
  * 自动测速选择镜像站和源
  */
-int
+Source_t
-auto_select_mirror (Source_t *sources, size_t size, const char *dish_name)
+dish_select_fastest_source (Dish_t *dish)
 {
+  Source_t *sources = dish->sources;
+  size_t size = dish->sources_n;
+  char *dish_name = dish->aliases;
+
   /* reset 时选择默认源 */
   if (chsrc_in_reset_mode())
-    return 0;
+    return sources[0];
 
   if (!in_dry_run_mode())
   {
-    char *msg = ENGLISH ? "Measuring speed in sequence" : "测速中";
+    char *msg = CHINESE ? "测速中" : "Measuring speed in sequence";
-    xy_log_brkt (App_Name, bdpurple (ENGLISH ? "MEASURE" : "测速"), msg);
+    xy_log_brkt (App_Name, bdpurple (CHINESE ? "测速" : "MEASURE"), msg);
     br();
   }
 
   if (0==size || 1==size)
     {
-      char *msg1 = ENGLISH ? "Currently " : "当前 ";
+      char *msg1 = CHINESE ? "当前 " : "Currently ";
-      char *msg2 = ENGLISH ? "No any source, please contact maintainers: chsrc issue" : " 无任何可用源，请联系维护者: chsrc issue";
+      char *msg2 = CHINESE ? " 无任何可用源，请联系维护者: chsrc issue" : "No any source, please contact maintainers: chsrc issue";
       chsrc_error (xy_strcat (3, msg1, dish_name, msg2));
       exit (Exit_MaintainerCause);
     }
@@ -446,7 +342,7 @@ auto_select_mirror (Source_t *sources, size_t size, const char *dish_name)
   if (in_dry_run_mode())
   /* Dry Run 时，跳过测速 */
     {
-      return 1; /* 原则第一个源 */
+      return sources[1]; /* 原则第一个源 */
     }
 
   bool only_one = false;
@@ -456,7 +352,8 @@ auto_select_mirror (Source_t *sources, size_t size, const char *dish_name)
   bool exist_curl = chsrc_check_program_quietly_when_exist ("curl");
   if (!exist_curl)
     {
-      char *msg = ENGLISH ? "No curl, unable to measure speed" : "没有curl命令，无法测速";
+      char *msg = CHINESE ? "没有curl命令，无法测速"
+                          : "No curl, unable to measure speed";
       chsrc_error (msg);
       exit (Exit_UserCause);
     }
@@ -474,12 +371,12 @@ auto_select_mirror (Source_t *sources, size_t size, const char *dish_name)
        */
       if (strstr (curl_version, "pc-cygwin"))
         {
-          char *msg = ENGLISH ? "You're using curl built by Cygwin which has a bug! Please use another curl!" : "你使用的是Cygwin构建的curl，该版本的curl存在bug，请改用其他版本的curl";
+          char *msg = CHINESE ? "你使用的是Cygwin构建的curl，该版本的curl存在bug，请改用其他版本的curl"     : "You're using curl built by Cygwin which has a bug! Please use another curl!";
           chsrc_error (msg);
           exit (Exit_UserCause);
         }
     }
-  /** --------------------------------------------- */
+  /* --------------------------------------------- */
 
   /* 总测速记录值 */
   double speed_records[size];
@@ -494,52 +391,39 @@ auto_select_mirror (Source_t *sources, size_t size, const char *dish_name)
     }
   */
 
-  int fast_idx = get_max_ele_idx_in_dbl_ary (speed_records, size);
+  int fastest_idx = get_max_ele_idx_in_dbl_ary (speed_records, size);
+  Source_t source = sources[fastest_idx];
 
   if (only_one)
     {
-      char *msg1 = ENGLISH ? "NOTICE  mirror site: " : "镜像站提示: ";
+      char *msg1 = CHINESE ? "镜像站提示: " : "NOTICE  mirror site: ";
-      char   *is = ENGLISH ? " is " : " 是 ";
+      char   *is = CHINESE ? " 是 " : " is ";
-      char *msg2 = ENGLISH ? "'s ONLY mirror available currently, thanks for their generous support"
+      char *msg2 = CHINESE ? " 目前唯一可用镜像站，感谢他们的慷慨支持"
-                           : " 目前唯一可用镜像站，感谢他们的慷慨支持";
+                           : "'s ONLY mirror available currently, thanks for their generous support";
-      const char *name = ENGLISH ? sources[fast_idx].mirror->abbr
+      const char *name = CHINESE ? source.mirror->name
-                                 : sources[fast_idx].mirror->name;
+                                 : source.mirror->abbr;
-      say (xy_strcat (5, msg1, bdgreen(name), green(is), green(dish_name), green(msg2)));
+      println (xy_strcat (5, msg1, bdgreen(name), green(is), green(dish_name), green(msg2)));
     }
   else
     {
-      char *msg = ENGLISH ? "FASTEST mirror site: " : "最快镜像站: ";
+      char *msg = CHINESE ? "最快镜像站: " : "FASTEST mirror site: ";
-      const char *name = ENGLISH ? sources[fast_idx].mirror->abbr
+      const char *name = CHINESE ? source.mirror->name
-                                 : sources[fast_idx].mirror->name;
+                                 : source.mirror->abbr;
-      say (xy_2strcat (msg, green(name)));
+      println (xy_2strcat (msg, green(name)));
     }
 
   // https://github.com/RubyMetric/chsrc/pull/71
   if (in_measure_mode())
     {
       char *msg = ENGLISH ? "URL of above source: " : "镜像源地址: ";
-      say (xy_2strcat (msg, green(sources[fast_idx].url)));
+      println (xy_2strcat (msg, green(source.url)));
     }
 
-  return fast_idx;
+  return source;
 }
 
 
 
-int
-use_specific_mirror_or_auto_select (char *input, Dish_t *dish)
-{
-  if (input)
-    {
-      return query_mirror_exist (dish->sources, dish->sources_n, dish->aliases, input);
-    }
-  else
-    {
-      return auto_select_mirror (dish->sources, dish->sources_n, dish->aliases);
-    }
-}
-
-
 static bool
 source_is_upstream (Source_t *source)
 {
@@ -569,24 +453,23 @@ source_has_empty_url (Source_t *source)
  *    当前 sub dish 应自动测速选择其最快镜像
  * 3. 若1和2都不成立，则直接报错
  */
-int
+Source_t
-yield_source_by_mirror_code_for_sub_dish (Dish_t *dish, char *mirror_code)
+subdish_select_source_by_mirror_code (Dish_t *dish, char *mirror_code)
 {
   if (dish_has_source_from_mirror (dish, mirror_code))
-    return query_mirror_exist (dish->sources, dish->sources_n, dish->aliases, mirror_code);
+    return dish_select_source_by_mirror_code (dish, mirror_code);
 
   if (subdish_sibling_has_source_from_mirror (dish, mirror_code))
     {
       chsrc_alert2 (CHINESE ? "当前子菜品没有来自所请求镜像站的源，尝试测速选择最快源"
                             : "Current sub dish has no source from the requested mirror, try to auto select the fastest source");
-      return auto_select_mirror (dish->sources, dish->sources_n, dish->aliases);
+      return dish_select_fastest_source (dish);
     }
 
 
   chsrc_error (CHINESE ? "所有的子菜品均没有来自所请求镜像站的源"
                        : "All sub dishes have no source from the requested mirror");
   exit (Exit_UserCause);
-  return 0;
 }
 
 
@@ -647,19 +530,16 @@ chsrc_yield_source (Dish_t *dish, char *option)
     {
       if (chsrc_in_dish_group_mode())
         {
-          int index = yield_source_by_mirror_code_for_sub_dish (dish, mirror_code);
+          source = subdish_select_source_by_mirror_code (dish, mirror_code);
-          source = dish->sources[index];
         }
       else
         {
-          int index = query_mirror_exist (dish->sources, dish->sources_n, dish->aliases, mirror_code);
+          source = dish_select_source_by_mirror_code (dish, mirror_code);
-          source = dish->sources[index];
         }
     }
   else
     {
-      int index = auto_select_mirror (dish->sources, dish->sources_n, dish->aliases);
+      source = dish_select_fastest_source (dish);
-      source = dish->sources[index];
     }
   return source;
 }

src/recipe/os/BSD/FreeBSD.c

@@ -45,11 +45,7 @@ os_freebsd_setsrc (char *option)
   // 据 @ykla，FreeBSD不自带sudo，但是我们依然要保证是root权限
   chsrc_ensure_root ();
 
-  chef_use_this (os_freebsd);
+  chsrc_use_this_source (os_freebsd);
-  int index = use_specific_mirror_or_auto_select (option, this);
-
-  Source_t source = this->sources[index];
-  chsrc_confirm_source(&source);
 
   chsrc_log2 ("1. 添加 freebsd-pkg 源 (二进制安装包)");
   chsrc_ensure_dir ("/usr/local/etc/pkg/repos");
@@ -77,13 +73,14 @@ os_freebsd_setsrc (char *option)
   bool git_exist = query_program_exist (xy_quiet_cmd ("git version"), "git", Noisy_When_Exist|Noisy_When_NonExist);
   if (git_exist)
     {
-      if (xy_streql("nju",source.mirror->code))
+      Source_t source_backup = source; // 备份当前源，后续恢复
+      if (xy_streql("nju", source.mirror->code))
         {
-          source = this->sources[index-1]; // 使用NJU的前一个源，即USTC源
+          source = this->sources[1]; // 使用USTC源
         }
       char *git_cmd = xy_strcat (3, "git clone --depth 1 https://", source.url, "/freebsd-ports/ports.git /usr/ports");
       chsrc_run (git_cmd, RunOpt_Default);
-      source = this->sources[index]; // 恢复至选中的源
+      source = source_backup; // 恢复至选中的源
       chsrc_alert2 ("下次更新请使用 git -C /usr/ports pull 而非使用 gitup");
     }
   else