Allow common args

buildbotics · May 12, 2015 · e02ceed · e02ceed
1 parent 0069b60
commit e02ceed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/duerer/App.cpp b/src/duerer/App.cpp
@@ -55,6 +55,7 @@ App::App() :
   options.pushCategory("Duerer Server");
   options.addTarget("cache", cacheDir,
                     "Cache and serve files from this directory.");
+  options.add("common", "Common conversion command args")->setDefault("");
   options.add("alarge-cmd", "Large avatar conversion command");
   options.add("asmall-cmd", "Small avatar conversion command");
   options.add("large-cmd", "Large image conversion command");
@@ -76,6 +77,11 @@ App::App() :
 }
 
 
+const string &App::getCommon() const {
+  return options["common"];
+}
+
+
 bool App::hasCmd(const string &size) const {
   return options.has(size + "-cmd") && options[size + "-cmd"].hasValue();
 }

diff --git a/src/duerer/App.h b/src/duerer/App.h
@@ -78,6 +78,7 @@ namespace duerer {
     const std::string &getCacheDir() const {return cacheDir;}
     const std::string &getAWSBucket() const {return awsBucket;}
 
+    const std::string &getCommon() const;
     bool hasCmd(const std::string &size) const;
     const std::string &getCmd(const std::string &size) const;
 

diff --git a/src/duerer/Transaction.cpp b/src/duerer/Transaction.cpp
@@ -96,6 +96,7 @@ void Transaction::convertImage() {
   string cmd = app.getCmd(size);
   cmd = String::replace(cmd, "\\$src", "orig");
   cmd = String::replace(cmd, "\\$dst", size);
+  cmd = String::replace(cmd, "\\$common", app.getCommon());
 
   Subprocess proc;
   proc.setWorkingDirectory(path);