Add option '--list-canvases' to list exported canvases.

[synfig.git] / synfig-core / trunk / src / tool / main.cpp

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index 64ac382..238d23a 100644 (file)
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -258,6 +258,7 @@ struct Job
 
        int quality;
        bool sifout;
+       bool list_canvases;
 };
 
 typedef list<String> arg_list_t;
@@ -330,8 +331,12 @@ void display_help(int amount)
                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("--start-time","<time>",_("Set the starting time"));
                Argument("--end-time","<time>",_("Set the ending time"));
-               Argument("--dpi","<res>",_("Set the dots-per-inch"));
+               Argument("--dpi","<res>",_("Set the physical resolution (dots-per-inch)"));
+               Argument("--dpi-x","<res>",_("Set the physical X resolution (dots-per-inch"));
+               Argument("--dpi-y","<res>",_("Set the physical Y resolution (dots-per-inch)"));
+               Argument("--list-canvases",NULL,_("List the exported canvases in the composition"));
                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"));
@@ -415,6 +420,10 @@ int process_global_flags(arg_list_t &arg_list)
                        Progress p(PACKAGE);
                        synfig::Main synfig_main(dirname(progname),&p);
                        iter=next++;
+                       if (iter==arg_list.end()) {
+                               error("The `%s' flag requires a value.  Use --help for a list of options.", "--layer-info");
+                               return SYNFIGTOOL_MISSINGARGUMENT;
+                       }
                        Layer::Handle layer=synfig::Layer::create(*iter);
                        cout<<"Layer Name: "<<layer->get_name()<<endl;
                        cout<<"Localized Layer Name: "<<layer->get_local_name()<<endl;
@@ -523,11 +532,10 @@ int process_global_flags(arg_list_t &arg_list)
 
 /* 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"       );
+       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-time"      || flag=="--fps"                || flag=="--layer-info" || flag=="--start-time" || flag=="--time"       );
 }
 
 int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
@@ -820,6 +828,20 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid)
        return SYNFIGTOOL_OK;
 }
 
+int extract_list_canvases(arg_list_t &arg_list,bool &list_canvases)
+{
+       arg_list_t::iterator iter, next;
+
+       for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
+               if(*iter=="--list-canvases")
+               {
+                       list_canvases = true;
+                       arg_list.erase(iter);
+               }
+
+       return SYNFIGTOOL_OK;
+}
+
 /* === M E T H O D S ======================================================= */
 
 /* === E N T R Y P O I N T ================================================= */
@@ -892,6 +914,10 @@ int main(int argc, char *argv[])
                                continue;
                        }
 
+                       bool list_canvases = false;
+                       extract_list_canvases(imageargs, list_canvases);
+                       job_list.front().list_canvases = list_canvases;
+
                        job_list.front().root->set_time(0);
 
                        string canvasid;
@@ -1086,7 +1112,22 @@ int main(int argc, char *argv[])
 
                RenderProgress p;
                p.task(job_list.front().filename+" ==> "+job_list.front().outfilename);
-               if(!job_list.front().sifout)
+               if(job_list.front().sifout)
+               {
+                       if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
+                       {
+                               cerr<<"Render Failure."<<endl;
+                               return SYNFIGTOOL_RENDERFAILURE;
+                       }
+               }
+               else if (job_list.front().list_canvases)
+               {
+                       cerr << "Listing Canvases:" << endl;
+                       Canvas::Children children(job_list.front().canvas->children());
+                       for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
+                               cout << "  " << job_list.front().filename << "#:" << (*iter)->get_id() << endl;
+               }
+               else
                {
                        VERBOSE_OUT(1)<<_("Rendering...")<<endl;
                        etl::clock timer;
@@ -1102,14 +1143,6 @@ int main(int argc, char *argv[])
                                cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
                        }
                }
-               else
-               {
-                       if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
-                       {
-                               cerr<<"Render Failure."<<endl;
-                               return SYNFIGTOOL_RENDERFAILURE;
-                       }
-               }
        }
 
        job_list.clear();