X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Ftool%2Fmain.cpp;h=c5b7dbc8a4159dd88605c663cde5cddff6cc12c7;hb=b3306a52f847c71ca900fa403ceebe953745147c;hp=4f1618ca94ffa50e1fcdaa721c08920590ef8b3d;hpb=9268bf3c8225b1efd2978599d9964f135da4426b;p=synfig.git

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index 4f1618c..c5b7dbc 100644
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -35,6 +35,7 @@
 #include <list>
 #include <ETL/clock>
 #include <algorithm>
+#include <cstring>
 
 #include <synfig/loadcanvas.h>
 #include <synfig/savecanvas.h>
@@ -57,8 +58,13 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
+#ifdef ENABLE_NLS
 #undef _
 #define _(x) gettext(x)
+#else
+#undef _
+#define _(x) (x)
+#endif
 
 enum exit_code
 {
@@ -299,12 +305,14 @@ void display_help(int amount)
 				cerr<<strprintf(" %s %s %s",flag, arg, spaces+strlen(arg)+strlen(flag)+1)+description<<endl;
 			else
 				cerr<<strprintf(" %s %s",flag,spaces+strlen(flag))+description<<endl;
-
 		}
 	};
-	cerr<<_("syntax: ")<<progname<<" [DEFAULT OPTIONS] ([SIF FILE] [SPECIFIC OPTIONS])..."<<endl;
-	cerr<<endl;
-	if(amount>=1)
+
+	cerr << endl << _("syntax: ") << progname << " [DEFAULT OPTIONS] ([SIF FILE] [SPECIFIC OPTIONS])..." << endl << endl;
+
+	if(amount == 0)
+		Argument("--help",NULL,_("Print out usage and syntax info"));
+	else
 	{
 		Argument("-t","<output type>",_("Specify output target (Default:unknown)"));
 		Argument("-w","<pixel width>",_("Set the image width (Use zero for file default)"));
@@ -318,16 +326,13 @@ void display_help(int amount)
 		Argument("-c","<canvas id>",_("Render the canvas with the given id instead of the root."));
 		Argument("-o","<output file>",_("Specify output filename"));
 		Argument("-T","<# of threads>",_("Enable multithreaded renderer using specified # of threads"));
-
 		Argument("-b",NULL,_("Print Benchmarks"));
-
 		Argument("--fps","<framerate>",_("Set the frame rate"));
 		Argument("--time","<time>",_("Render a single frame at <seconds>"));
 		Argument("--begin-time","<time>",_("Set the starting time"));
 		Argument("--end-time","<time>",_("Set the ending time"));
 		Argument("--dpi","<res>",_("Set the dots-per-inch"));
 		Argument("--append","<filename>",_("Append layers in <filename> to composition"));
-
 		Argument("--layer-info","<layer>",_("Print out layer's description, parameter info, etc."));
 		Argument("--layers",NULL,_("Print out the list of available layers"));
 		Argument("--targets",NULL,_("Print out the list of available targets"));
@@ -343,9 +348,7 @@ void display_help(int amount)
 		Argument("--signal-test",NULL,_("Test signal implementation"));
 #endif
 	}
-	else
 
-	Argument("--help",NULL,_("Print out usage and syntax info"));
 	cerr<<endl;
 }
 
@@ -370,11 +373,9 @@ int process_global_flags(arg_list_t &arg_list)
 			return SYNFIGTOOL_HELP;
 		}
 
-
 		if(*iter == "--help")
 		{
 			display_help(1);
-
 			return SYNFIGTOOL_HELP;
 		}
 
@@ -450,7 +451,6 @@ int process_global_flags(arg_list_t &arg_list)
 			synfig::Target::Book::iterator iter=synfig::Target::book().begin();
 			for(;iter!=synfig::Target::book().end();iter++)
 				cout<<iter->first<<endl;
-
 			return SYNFIGTOOL_HELP;
 		}
 
@@ -461,7 +461,6 @@ int process_global_flags(arg_list_t &arg_list)
 			synfig::LinkableValueNode::Book::iterator iter=synfig::LinkableValueNode::book().begin();
 			for(;iter!=synfig::LinkableValueNode::book().end();iter++)
 				cout<<iter->first<<endl;
-
 			return SYNFIGTOOL_HELP;
 		}
 
@@ -472,16 +471,13 @@ int process_global_flags(arg_list_t &arg_list)
 			synfig::Importer::Book::iterator iter=synfig::Importer::book().begin();
 			for(;iter!=synfig::Importer::book().end();iter++)
 				cout<<iter->first<<endl;
-
 			return SYNFIGTOOL_HELP;
 		}
 
 		if(*iter == "--version")
 		{
 			cerr<<PACKAGE<<" "<<VERSION<<endl;
-
 			arg_list.erase(iter);
-
 			return SYNFIGTOOL_HELP;
 		}
 
@@ -497,33 +493,26 @@ int process_global_flags(arg_list_t &arg_list)
 **\n\
 **	" << endl << endl;
 			arg_list.erase(iter);
-
 			return SYNFIGTOOL_HELP;
 		}
 
 		if(*iter == "-v")
 		{
 			verbosity++;
-
 			arg_list.erase(iter);
-
 			continue;
 		}
 
 		if(*iter == "-q")
 		{
 			be_quiet=true;
-
 			arg_list.erase(iter);
-
 			continue;
 		}
 		if(*iter == "-b")
 		{
 			print_benchmarks=true;
-
 			arg_list.erase(iter);
-
 			continue;
 		}
 	}
@@ -531,6 +520,15 @@ int process_global_flags(arg_list_t &arg_list)
 	return SYNFIGTOOL_OK;
 }
 
+/* true if the given flag takes an extra parameter */
+bool flag_requires_value(String flag) {
+	return (flag=="-a"	|| flag=="-c"	|| flag=="-g"	|| flag=="-h"	|| flag=="-o" ||
+			flag=="-Q"	|| flag=="-s"	|| flag=="-t"	|| flag=="-T"	|| flag=="-w" ||
+			flag=="--append"	|| flag=="--begin-time"		|| flag=="--dpi"		|| flag=="--dpi-x"	||
+			flag=="--dpi-y"		|| flag=="--end-frame"		|| flag=="--end-time"	|| flag=="--fps"	||
+			flag=="--frame"		|| flag=="--start-frame"	|| flag=="--start-time"	|| flag=="--time"	);
+}
+
 int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
 {
 	arg_list_t::iterator iter, next;
@@ -543,29 +541,7 @@ int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
 			return SYNFIGTOOL_OK;
 		}
 
-		if(
-			*iter=="-t" ||
-			*iter=="-w" ||
-			*iter=="-h" ||
-			*iter=="-a" ||
-			*iter=="-g" ||
-			*iter=="-o" ||
-			*iter=="-s" ||
-			*iter=="-Q" ||
-			*iter=="-c" ||
-			*iter=="--fps" ||
-			*iter=="--start-time" ||
-			*iter=="--begin-time" ||
-			*iter=="--end-time" ||
-			*iter=="--start-frame" ||
-			*iter=="--end-frame" ||
-			*iter=="--time" ||
-			*iter=="--frame" ||
-			*iter=="--dpi" ||
-			*iter=="--dpi-x" ||
-			*iter=="--dpi-y" ||
-			*iter=="--append" ||
-			*iter=="-T" )
+		if (flag_requires_value(*iter))
 		{
 			cluster.push_back(*iter);
 			arg_list.erase(iter);
@@ -691,6 +667,8 @@ int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc)
 			//desc.set_gamma(Gamma(atof(iter->c_str())));
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 	if(w&&h)
 	{
@@ -728,6 +706,8 @@ int extract_quality(arg_list_t &arg_list,int &quality)
 			VERBOSE_OUT(1)<<strprintf(_("Quality set to %d"),quality)<<endl;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -746,6 +726,8 @@ int extract_threads(arg_list_t &arg_list,int &threads)
 			VERBOSE_OUT(1)<<strprintf(_("Threads set to %d"),threads)<<endl;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -765,6 +747,8 @@ int extract_target(arg_list_t &arg_list,string &type)
 			type=*iter;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -784,6 +768,8 @@ int extract_append(arg_list_t &arg_list,string &filename)
 			filename=*iter;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -805,6 +791,8 @@ int extract_outfile(arg_list_t &arg_list,string &outfile)
 			arg_list.erase(iter);
 			ret=SYNFIGTOOL_OK;
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return ret;
@@ -824,6 +812,8 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid)
 			canvasid=*iter;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -840,8 +830,11 @@ int main(int argc, char *argv[])
 	job_list_t job_list;
 
 	setlocale(LC_ALL, "");
+
+#ifdef ENABLE_NLS
 	bindtextdomain("synfig", LOCALEDIR);
 	textdomain("synfig");
+#endif
 
 	progname=argv[0];
 	Progress p(argv[0]);
@@ -888,9 +881,8 @@ int main(int argc, char *argv[])
 			  return ret;
 
 			// Open the composition
-			{
-				job_list.front().root=open_canvas(job_list.front().filename);
-			}
+			job_list.front().root=open_canvas(job_list.front().filename);
+
 			if(!job_list.front().root)
 			{
 				cerr<<_("Unable to open ")<<job_list.front().filename<<"."<<endl;
@@ -956,7 +948,7 @@ int main(int argc, char *argv[])
 					}
 					VERBOSE_OUT(2)<<_("Appended contents of ")<<composite_file<<endl;
 				}
-			}while(false);
+			} while(false);
 
 			VERBOSE_OUT(4)<<_("Attempting to determine target/outfile...")<<endl;
 
@@ -968,9 +960,25 @@ int main(int argc, char *argv[])
 				string ext = filename_extension(job_list.front().outfilename);
 				if (ext.length()) ext = ext.substr(1);
 				if(Target::ext_book().count(ext))
+				{
 					target_name=Target::ext_book()[ext];
+					info("target name not specified - using %s", target_name.c_str());
+				}
 				else
-					target_name=ext;
+				{
+					string lower_ext(ext);
+
+					for(unsigned int i=0;i<ext.length();i++)
+						lower_ext[i] = tolower(ext[i]);
+
+					if(Target::ext_book().count(lower_ext))
+					{
+						target_name=Target::ext_book()[lower_ext];
+						info("target name not specified - using %s", target_name.c_str());
+					}
+					else
+						target_name=ext;
+				}
 			}
 
 			// If the target type is STILL not yet defined, then
@@ -1040,8 +1048,6 @@ int main(int argc, char *argv[])
 				job_list.pop_front();
 				continue;
 			}
-			//string bleh;
-			//getline(cin,bleh);
 		}
 	}