稍简化 Java recipe 实现 以及 格式化代码

[GitHub #278]
This commit is contained in:
Aoran Zeng 2025-08-27 11:32:06 +08:00
parent b309c46a4c
commit bcc3206bdd
No known key found for this signature in database
GPG Key ID: 8F8BA8488E10ED98

View File

@ -50,19 +50,13 @@ pl_java_check_cmd (bool *maven_exist, bool *gradle_exist, bool *maven_daemon_exi
}
}
bool
pl_java_is_home (const char *str)
{
return (xy_str_start_with (str, "Maven home:"));
}
bool
pl_java_find_maven_home (const char *line)
{
if(pl_java_is_home(line))
pl_java_is_maven_home_line (const char *line)
{
if (xy_str_start_with (line, "Maven home:"))
return true;
}
else
return false;
}
@ -73,15 +67,13 @@ pl_java_find_maven_config ()
int status = xy_run_capture ("mvn -v", &output);
if (0==status)
{
char *maven_home_line = xy_run_iter_lines ("mvn -v", 0, pl_java_find_maven_home);
char *maven_home_line = xy_run_iter_lines ("mvn -v", 0, pl_java_is_maven_home_line);
char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml"));
return maven_config;
}
else
{
printf("no find maven home\n");
}
chsrc_alert2 ("未找到 maven home, 将使用用户配置文件");
return "~/.m2/settings.xml";
}
@ -92,15 +84,13 @@ pl_java_find_maven_daemon_config ()
int status = xy_run_capture ("mvnd -v", &output);
if (0==status)
{
char *maven_home_line = xy_run_iter_lines ("mvnd -v", 0, pl_java_find_maven_home);
char *maven_home_line = xy_run_iter_lines ("mvnd -v", 0, pl_java_is_maven_home_line);
char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml"));
return maven_config;
}
else
{
printf ("no find maven home\n");
}
chsrc_alert2 ("未找到 maven home, 将使用用户配置文件");
return "~/.m2/settings.xml";
}
@ -149,8 +139,8 @@ pl_java_setsrc (char *option)
char *file = xy_str_gsub (RAWSTR_pl_java_maven_config, "@1@", source.mirror->code);
file = xy_str_gsub (file, "@name@", source.mirror->name);
file = xy_str_gsub (file, "@url@", source.url);
char *maven_config = pl_java_find_maven_daemon_config ();
chsrc_note2 (xy_strcat (3, "请在 maven 配置文件 ", maven_config, " 中添加:"));
char *maven_daemon_config = pl_java_find_maven_daemon_config ();
chsrc_note2 (xy_strcat (3, "请在 maven daemon 配置文件 ", maven_daemon_config, " 中添加:"));
println (file);
}