Robust CLI parsing, eclipse checks, and 'next' search

Remove IDE CMakeSettings.json and expand README with detailed output field and API docs. Harden CLI option parsing by treating -h/--help and other --* tokens as missing values (arg_parser.hpp, cli_common.cpp) and adding missing-value helpers (entry.cpp, global_context.cpp). Add current_jd_utc() and missing_opt_value_token() utilities and improve find_opt_val/infer_jd_interval to default search start to current time when appropriate. Strengthen validation for cmd_eclipse (require positive sample, require paired point lat/lon, require grid/global options only with global visibility or geojson, validate positive grid steps, handle point-height/point-refine dependencies). Implement next/search support and helpers (cmd_next_range_search.cpp) to collect, filter and format upcoming events. Misc: small prep_cmd_args --bsp empty check and other related adjustments; tests updated to match behavior changes.

Author: lzray-universe

CMakeSettings.json

@@ -62,9 +62,12 @@ class ArgParser{
 	static std::string require_value(const std::vector<std::string>&args,
 									 std::size_t&idx,const std::string&opt){
 		if(idx+1>=args.size()){
-			throw std::invalid_argument("missing value for "+opt);
+			throw std::invalid_argument("missing value for option: "+opt);
 		}
 		++idx;
+		if(args[idx]=="-h"||args[idx]=="--help"||args[idx].rfind("--",0)==0){
+			throw std::invalid_argument("missing value for option: "+opt);
+		}
 		return args[idx];
 	}
 

README.md

@@ -51,6 +51,9 @@ std::string req_val(const std::vector<std::string>&args,std::size_t&idx,
 		throw std::invalid_argument("missing value for option: "+opt);
 	}
 	++idx;
+	if(args[idx]=="-h"||args[idx]=="--help"||args[idx].rfind("--",0)==0){
+		throw std::invalid_argument("missing value for option: "+opt);
+	}
 	return args[idx];
 }
 

include/lunar/arg_parser.hpp

@@ -14,6 +14,18 @@
 
 namespace{
 
+std::string req_global_opt_value(const std::vector<std::string>&args,
+								 std::size_t&i,const std::string&opt){
+	if(i+1>=args.size()){
+		throw std::invalid_argument("missing value for option: "+opt);
+	}
+	++i;
+	if(args[i]=="-h"||args[i]=="--help"||args[i].rfind("--",0)==0){
+		throw std::invalid_argument("missing value for option: "+opt);
+	}
+	return args[i];
+}
+
 std::vector<std::string> parse_global_opts(const std::vector<std::string>&args,
 										   const std::string&default_lang){
 	LunarEclipseCalcMethod method=LunarEclipseCalcMethod::Modern;
@@ -27,12 +39,8 @@ std::vector<std::string> parse_global_opts(const std::vector<std::string>&args,
 	for(std::size_t i=0;i<args.size();++i){
 		const std::string&arg=args[i];
 		if(arg=="--eclipse-method"){
-			if(i+1>=args.size()){
-				throw std::invalid_argument(
-					"--eclipse-method requires: modern|legacy");
-			}
 			LunarEclipseCalcMethod parsed=LunarEclipseCalcMethod::Modern;
-			const std::string&value=args[++i];
+			const std::string&value=req_global_opt_value(args,i,arg);
 			if(!parse_lunar_eclipse_calc_method(value,&parsed)){
 				throw std::invalid_argument(
 					"invalid --eclipse-method: "+value+
@@ -44,6 +52,10 @@ std::vector<std::string> parse_global_opts(const std::vector<std::string>&args,
 		if(arg.rfind(prefix,0)==0){
 			LunarEclipseCalcMethod parsed=LunarEclipseCalcMethod::Modern;
 			std::string value=arg.substr(prefix.size());
+			if(value.empty()){
+				throw std::invalid_argument(
+					"missing value for option: --eclipse-method");
+			}
 			if(!parse_lunar_eclipse_calc_method(value,&parsed)){
 				throw std::invalid_argument(
 					"invalid --eclipse-method: "+value+
@@ -53,10 +65,7 @@ std::vector<std::string> parse_global_opts(const std::vector<std::string>&args,
 			continue;
 		}
 		if(arg=="--lang"){
-			if(i+1>=args.size()){
-				throw std::invalid_argument("--lang requires: zh|zht|en|ja|ko");
-			}
-			const std::string&value=args[++i];
+			const std::string&value=req_global_opt_value(args,i,arg);
 			if(!lunar::i18n::try_parse_lang(value,&lang)){
 				throw std::invalid_argument(
 					"invalid --lang: "+value+" (expected zh|zht|en|ja|ko)");
@@ -65,6 +74,9 @@ std::vector<std::string> parse_global_opts(const std::vector<std::string>&args,
 		}
 		if(arg.rfind(lang_prefix,0)==0){
 			std::string value=arg.substr(lang_prefix.size());
+			if(value.empty()){
+				throw std::invalid_argument("missing value for option: --lang");
+			}
 			if(!lunar::i18n::try_parse_lang(value,&lang)){
 				throw std::invalid_argument(
 					"invalid --lang: "+value+" (expected zh|zht|en|ja|ko)");

src/cli_common.cpp

@@ -3,6 +3,7 @@
 #include<algorithm>
 #include<cctype>
 #include<cmath>
+#include<ctime>
 #include<filesystem>
 #include<limits>
 #include<optional>
@@ -52,6 +53,10 @@ std::string trim_copy(const std::string&s){
 	return s.substr(beg,end-beg);
 }
 
+bool missing_opt_value_token(const std::string&s){
+	return s=="-h"||s=="--help"||s.rfind("--",0)==0;
+}
+
 bool ends_with_bsp(const std::string&s){
 	if(s.size()<4){
 		return false;
@@ -122,6 +127,19 @@ void add_unique_existing(std::vector<std::string>&out,
 	}
 }
 
+double current_jd_utc(){
+	const std::time_t now=std::time(nullptr);
+	std::tm utc_tm{};
+#if defined(_WIN32)
+	gmtime_s(&utc_tm,&now);
+#else
+	gmtime_r(&now,&utc_tm);
+#endif
+	return greg2jd(utc_tm.tm_year+1900,utc_tm.tm_mon+1,utc_tm.tm_mday,
+				   utc_tm.tm_hour,utc_tm.tm_min,
+				   static_cast<double>(utc_tm.tm_sec));
+}
+
 std::optional<std::pair<int,int>> parse_ym(const std::string&s){
 	std::size_t pos=s.find('-');
 	if(pos==std::string::npos){
@@ -161,7 +179,7 @@ std::optional<std::string> find_opt_val(const std::vector<std::string>&args,
 	for(std::size_t i=0;i<args.size();++i){
 		const std::string&arg=args[i];
 		if(arg==opt){
-			if(i+1<args.size()){
+			if(i+1<args.size()&&!missing_opt_value_token(args[i+1])){
 				return args[i+1];
 			}
 			return std::nullopt;
@@ -249,14 +267,17 @@ std::optional<std::pair<double,double>> infer_jd_interval(
 				return std::make_pair(std::min(f.jd_utc,t.jd_utc),
 									  std::max(f.jd_utc,t.jd_utc));
 			}
-			if(command=="search"&&from){
-				IsoTime f=parse_iso(*from,default_tz);
+			if(command=="search"){
+				double jd_from=current_jd_utc();
+				if(from){
+					jd_from=parse_iso(*from,default_tz).jd_utc;
+				}
 				int count=1;
 				if(auto c=find_opt_val(args,"--count")){
 					count=std::max(1,std::stoi(*c));
 				}
 				double span=std::max(30.0,static_cast<double>(count)*45.0);
-				return std::make_pair(f.jd_utc,f.jd_utc+span);
+				return std::make_pair(jd_from,jd_from+span);
 			}
 			return std::nullopt;
 		}
@@ -507,6 +528,9 @@ std::vector<std::string> prep_cmd_args(const std::string&command,
 		}
 		if(arg.rfind("--bsp=",0)==0){
 			explicit_bsp=arg.substr(6);
+			if(explicit_bsp.empty()){
+				throw std::invalid_argument("missing value for option: --bsp");
+			}
 			continue;
 		}
 		stripped.push_back(arg);

src/entry.cpp

@@ -28,11 +28,16 @@ int cmd_eclipse(const std::vector<std::string>&args){
 	double point_height_m=0.0;
 	bool has_point_lat=false;
 	bool has_point_lon=false;
+	bool has_point_height=false;
+	bool point_refine_set=false;
 
 	bool global_vis=false;
 	std::string global_format="json";
 	double grid_lat_step=10.0;
 	double grid_lon_step=10.0;
+	bool global_format_set=false;
+	bool grid_lat_step_set=false;
+	bool grid_lon_step_set=false;
 
 	const OptMap handlers={
 		{"--kind",[&](const std::vector<std::string>&src,std::size_t&idx,
@@ -54,6 +59,7 @@ int cmd_eclipse(const std::vector<std::string>&args){
 		{"--point-refine",[&](const std::vector<std::string>&src,std::size_t&idx,
 							  const std::string&opt){
 			 point_refine=parse_bool01(req_val(src,idx,opt),opt);
+			 point_refine_set=true;
 		 }},
 		{"--point-lat",[&](const std::vector<std::string>&src,std::size_t&idx,
 						   const std::string&opt){
@@ -68,6 +74,7 @@ int cmd_eclipse(const std::vector<std::string>&args){
 		{"--point-height",[&](const std::vector<std::string>&src,std::size_t&idx,
 							  const std::string&opt){
 			 point_height_m=parse_double(req_val(src,idx,opt),opt);
+			 has_point_height=true;
 		 }},
 		{"--global-vis",[&](const std::vector<std::string>&src,std::size_t&idx,
 							const std::string&opt){
@@ -80,14 +87,17 @@ int cmd_eclipse(const std::vector<std::string>&args){
 		{"--global-format",[&](const std::vector<std::string>&src,
 							   std::size_t&idx,const std::string&opt){
 			 global_format=to_low(req_val(src,idx,opt));
+			 global_format_set=true;
 		 }},
 		{"--grid-lat-step",[&](const std::vector<std::string>&src,
 							   std::size_t&idx,const std::string&opt){
 			 grid_lat_step=parse_double(req_val(src,idx,opt),opt);
+			 grid_lat_step_set=true;
 		 }},
 		{"--grid-lon-step",[&](const std::vector<std::string>&src,
 							   std::size_t&idx,const std::string&opt){
 			 grid_lon_step=parse_double(req_val(src,idx,opt),opt);
+			 grid_lon_step_set=true;
 		 }},
 		{"--tz",[&](const std::vector<std::string>&src,std::size_t&idx,
 					const std::string&opt){ tz=req_val(src,idx,opt); }},
@@ -116,17 +126,34 @@ int cmd_eclipse(const std::vector<std::string>&args){
 	if(kind_opt!="lunar"&&kind_opt!="solar"){
 		throw std::invalid_argument("--kind must be lunar or solar");
 	}
+	if(!(sample_minutes>0.0)){
+		throw std::invalid_argument("--sample-min must be > 0");
+	}
 	if(has_point_lat!=has_point_lon){
 		throw std::invalid_argument(
 			"point visibility requires both --point-lat and --point-lon");
 	}
+	if((has_point_height||point_refine_set)&&!has_point_lat){
+		throw std::invalid_argument(
+			"--point-height/--point-refine require --point-lat and --point-lon");
+	}
 	if(global_format!="json"&&global_format!="geojson"){
 		throw std::invalid_argument("--global-format must be json or geojson");
 	}
 	chk_fmt(format,{"json","txt","geojson"},"eclipse");
 	if(format=="geojson"){
 		global_vis=true;
 	}
+	if((global_format_set||grid_lat_step_set||grid_lon_step_set)&&!global_vis){
+		throw std::invalid_argument(
+			"--global-format/--grid-lat-step/--grid-lon-step require --global-vis 1 or --format geojson");
+	}
+	if(grid_lat_step_set&&!(grid_lat_step>0.0)){
+		throw std::invalid_argument("--grid-lat-step must be > 0");
+	}
+	if(grid_lon_step_set&&!(grid_lon_step>0.0)){
+		throw std::invalid_argument("--grid-lon-step must be > 0");
+	}
 
 	int y=0;
 	int m=0;