update for newer ztd version

example.mim

@@ -1,49 +1,43 @@
-
-
 Device "Launch Control"
 
   //display value 0:127 for knobs 21-28
   Command controller
     id=21:28
-    shell=echo "Knob #$id ch$channel:$value"
+    shell='echo "Knob #$id ch$channel:$value"'
 
-  //display value 0:127 for knob 41 from any channel
+  //display value -100:100 for knob 41 on channel 0
   Command controller
     id=41
-    channel=*
-    shell=echo "Knob #$id ch$channel:$value"
-
-  //display value -100:100 for knob 42 on channel 0
-  Command controller
-    id=42
     channel=0
     remap=-100:100
-    shell=echo "Knob #$id ch0:$value r:$rawvalue"
+    shell='echo "Knob #$id ch0:$value r:$rawvalue"'
 
-  //display value 0:1:0 for knob 42 on channel 1 (first half)
+  //display value 0:1:0 for knob 41 on channel 1 (first half)
   Command controller
     id=42
     channel=1
     range=0:63
     remap=0:1
     float=true
-    shell=echo "Knob #$id ch1:$value r:$rawvalue"
+    shell='echo "Knob #$id ch1:$value r:$rawvalue"'
 
-  //display value 0:1:0 for knob 42 on channel 1 (second half)
+  //display value 0:1:0 for knob 41 on channel 1 (second half)
   Command controller
     id=42
     channel=1
     range=64:127
     remap=1:0
     float=true
-    shell=echo "Knob #$id ch1:$value r:$rawvalue"
+    shell='echo "Knob #$id ch1:$value r:$rawvalue"'
 
 
 Device "Launchpad S"
 
+  //display any note pressed and its velocity
   Command note
-    shell=echo "Note $id on  velocity:$velocity"
+    shell=echo Note $id on  velocity:$velocity
 
+  //display any note off
   Command note
     trigger=0
-    shell=echo "Note $id off"
+    shell=echo Note $id off

example.zfd

@@ -10,46 +10,38 @@
       //displays value 0:127 for knobs 21-28
       type=controller
       id=21:28
-      shell=echo "Knob #$id ch$channel:$value"
-    },
-    // KNOBS LOW
-    {
-      //KNOB L1
-      //displays value 0:127 for knob 41 from any channel
-      type=controller
-      id=41
-      shell=echo "Knob #$id ch$channel:$value"
+      shell='echo "Knob #$id ch$channel:$value"'
     },
     {
       //KNOB L2
-      //displays value -100:100 for knob 42 on channel 0
+      //displays value -100:100 for knob 41 on channel 0
       type=controller
       id=42
       channel=0
       remap=-100:100
-      shell=echo "Knob #$id ch0:$value r:$rawvalue"
+      shell='echo "Knob #$id ch0:$value r:$rawvalue"'
     },
     {
       //KNOB L3 H1
-      //displays value 0:1:0 for knob 42 on channel 1 (first half)
+      //displays value 0:1:0 for knob 41 on channel 1 (first half)
       type=controller
       id=42
       channel=1
       range=0:63
       remap=0:1
       float=true
-      shell=echo "Knob #$id ch1:$value r:$rawvalue"
+      shell='echo "Knob #$id ch1:$value r:$rawvalue"'
     },
     {
       //KNOB L3 H2
-      //displays value 0:1:0 for knob 42 on channel 1 (second half)
+      //displays value 0:1:0 for knob 41 on channel 1 (second half)
       type=controller
       id=42
       channel=1
       range=64:127
       remap=1:0
       float=true
-      shell=echo "Knob #$id ch1:$value r:$rawvalue"
+      shell='echo "Knob #$id ch1:$value r:$rawvalue"'
     }
   ]
 }
@@ -61,13 +53,13 @@
     {
       // ANY NOTE ON
       type=note
-      shell=echo "Note $id on  velocity:$velocity"
+      shell=echo Note $id on  velocity:$velocity
     },
     {
       // ANY NOTE OFF
       type=note
       trigger=0
-      shell=echo "Note $id off"
+      shell=echo Note $id off
     }
   ]
 }

gen_help_format.sh

@@ -1,11 +1,38 @@
 FORMAT_FOLDER=help_format
 IDIR=include
 
-cp $FORMAT_FOLDER/help_template_head $IDIR/help.h
+SLASHSCRIPT='s|\\|\\\\|g;s|\"|\\\"|g'
+NEWLINESCRIPT=':a;N;$!ba;s/\n/\\n/g;'
 
-echo "#define ZFD_FORMAT \"zmidimap$(sed -n -e 'H;${x;s/\n/\\n/g;s/^,//;p;}' $FORMAT_FOLDER/zfd-format)\"" >> $IDIR/help.h
-echo "#define MIM_FORMAT \"zmidimap$(sed -n -e 'H;${x;s/\n/\\n/g;s/^,//;p;}' $FORMAT_FOLDER/mim-format)\"" >> $IDIR/help.h
-echo "#define SHELL_FORMAT \"zmidimap$(sed -n -e 'H;${x;s/\n/\\n/g;s/^,//;p;}' $FORMAT_FOLDER/shell-format)\"" >> $IDIR/help.h
-echo "#define COMMAND_TAGS \"zmidimap$(sed -n -e 'H;${x;s/\n/\\n/g;s/^,//;p;}' $FORMAT_FOLDER/command-tags)\"" >> $IDIR/help.h
+filetocstr()
+{
+  sed -e $SLASHSCRIPT "$1" | sed $NEWLINESCRIPT
+}
 
-cat $FORMAT_FOLDER/help_template_tail >> $IDIR/help.h
+gen_line()
+{
+  name="$(basename "$1")"
+  echo "#define $(echo "$name" | tr '[:lower:]' '[:upper:]') \"$(filetocstr "$1")\""
+}
+
+help_header()
+{
+  echo '#ifndef HELP_H
+#define HELP_
+'
+}
+
+help_footer()
+{
+  echo '
+#endif //HELP_H'
+}
+
+help_header > "$IDIR/help.h"
+
+for I in help_format/*
+do
+  gen_line "$I" >> "$IDIR/help.h"
+done
+
+help_footer >> "$IDIR/help.h"

help_format/help_template_head

@@ -1,2 +0,0 @@
-#ifndef HELP_H
-#define HELP_H

help_format/help_template_tail

@@ -1 +0,0 @@
-#endif //HELP_H

help_format/mim_format

@@ -20,7 +20,7 @@ Device <name>
 *shell: shell command to be executed
   > mandatory
 
-Shell command can be concatenated with \"\" or ''
+Shell commands can be concatenated with "" or ''
 Comments are written with // or # and end at end of line
 Multiple tags can be put on the same line by separating them with ;
 See --command-tags for optional command tags

help_format/zfd_format

@@ -26,5 +26,5 @@ ZFD format: http://zawz.net/doc/ztd/zfd.html
 *shell: shell command to be executed
   > mandatory
 
-Shell command can be concatenated with \"\" or ''
+Shell commands can be concatenated with "" or ''
 see --command-tags for optional command tags

include/format.hpp

@@ -5,6 +5,8 @@
 
 ztd::chunkdat mimtochk(std::string mim);
 
+std::string chktomim(ztd::chunkdat const& chk, std::string const& aligner);
+
 std::string file_strimport(const std::string& path);
 
 bool is_mim(const std::string& str);

include/help.h

@@ -1,7 +1,9 @@
 #ifndef HELP_H
-#define HELP_H
-#define ZFD_FORMAT "zmidimap\n-- [ZFD FILE FORMAT] --\n\nZFD format: http://zawz.net/doc/ztd/zfd.html\n\n[<device>,<device>]\n\n-- <device> format --\n  {\n    name=<name>\n    commands=[<command>,<command>]\n  }\n--\n*name: string referring to client name of the device\n\n<command> format\n  {\n    type=<type>\n    shell=<shell command>\n    <tag>=<value>\n    <tag>=<value>\n    ...\n  }\n--\n*type: type of the signal: note/controller/pitch/system/connect/disconnect\n  > mandatory\n*shell: shell command to be executed\n  > mandatory\n\nShell command can be concatenated with \"\" or ''\nsee --command-tags for optional command tags"
-#define MIM_FORMAT "zmidimap\n-- [MIM FILE FORMAT] --\n\nDevice <name>\n  Command <type>\n    shell=<shell command>\n    <tag>=<value>\n    <tag>=<value>\n    ...\n  Command <type>\n    ...\n\nDevice <name>\n...\n\n--\n*name: string referring to client name of the device\n  > mandatory\n*type: type of the signal: note/controller/pitch/system/connect/disconnect\n  > mandatory\n*shell: shell command to be executed\n  > mandatory\n\nShell command can be concatenated with \"\" or ''\nComments are written with // or # and end at end of line\nMultiple tags can be put on the same line by separating them with ;\nSee --command-tags for optional command tags"
-#define SHELL_FORMAT "zmidimap\n-- [SHELL FORMAT] --\n\nShell command follows regular shell format\n\n-- [Environment] --\n\n[Note]\n  $id: id of the note\n  $channel: channel of the note\n  $velocity: velocity of the note\n\n[Controller]\n  $value: value of the controller (remapped)\n  $id: id of the controller\n  $channel: channel of the controller\n  $rawvalue: original value of the controller\n\n[Pitch]\n  $value: value of the bend (remapped)\n  $rawvalue: original value of the bend\n\n[System]\n  $code: hexadecimal code of the system signal"
-#define COMMAND_TAGS "zmidimap\n-- [COMMAND TAGS] --\n\n[Note tags]\n  id=<interval>\n  channel=<x/*>\n  trigger=<interval>\n--\n  *id: note id from 0 to 127\n    > optional, default 0:127\n  *channel: value from 0 to 16 for channel, * for any channel\n    > optional, default *\n  *trigger: note velocity from 0 to 127 that triggers the command\n    > optional, default 1:127\n\n[Controller tags]\n  id=<interval>\n  channel=<x/*>\n  range=<interval>\n  remap=<interval>\n  float=<true/false>\n--\n  *id: controller id from 0 to 127\n    > optional, default 0:127\n  *channel: value from 0 to 16 for channel, * for any channel\n    > optional, default *\n  *range: controller value from 0 to 127 that triggers command\n    > optional, default 0:127\n  *remap: remaps the range to given interval\n    > optional, default same as range\n  *float: boolean value defining if output is a floating point value\n    > optional, default false\n\n[Pitch bend tags]\n  range=<interval>\n  remap=<interval>\n  float=<true/false>\n--\n  *range: controller value from -8192 to 8191 that triggers command\n    > optional, default -8192:8191\n  *remap: remaps the range to given interval\n    > optional, default same as range\n  *float: boolean value defining if output is a floating point value\n    > optional, default false\n\n[Interval Format]\n  x:y   range from x to y\n  x     single value x\n  *     all possible values"
+#define HELP_
+
+#define COMMAND_TAGS "-- [COMMAND TAGS] --\n\n[Note tags]\n  id=<interval>\n  channel=<x/*>\n  trigger=<interval>\n--\n  *id: note id from 0 to 127\n    > optional, default 0:127\n  *channel: value from 0 to 16 for channel, * for any channel\n    > optional, default *\n  *trigger: note velocity from 0 to 127 that triggers the command\n    > optional, default 1:127\n\n[Controller tags]\n  id=<interval>\n  channel=<x/*>\n  range=<interval>\n  remap=<interval>\n  float=<true/false>\n--\n  *id: controller id from 0 to 127\n    > optional, default 0:127\n  *channel: value from 0 to 16 for channel, * for any channel\n    > optional, default *\n  *range: controller value from 0 to 127 that triggers command\n    > optional, default 0:127\n  *remap: remaps the range to given interval\n    > optional, default same as range\n  *float: boolean value defining if output is a floating point value\n    > optional, default false\n\n[Pitch bend tags]\n  range=<interval>\n  remap=<interval>\n  float=<true/false>\n--\n  *range: controller value from -8192 to 8191 that triggers command\n    > optional, default -8192:8191\n  *remap: remaps the range to given interval\n    > optional, default same as range\n  *float: boolean value defining if output is a floating point value\n    > optional, default false\n\n[Interval Format]\n  x:y   range from x to y\n  x     single value x\n  *     all possible values"
+#define MIM_FORMAT "-- [MIM FILE FORMAT] --\n\nDevice <name>\n  Command <type>\n    shell=<shell command>\n    <tag>=<value>\n    <tag>=<value>\n    ...\n  Command <type>\n    ...\n\nDevice <name>\n...\n\n--\n*name: string referring to client name of the device\n  > mandatory\n*type: type of the signal: note/controller/pitch/system/connect/disconnect\n  > mandatory\n*shell: shell command to be executed\n  > mandatory\n\nShell commands can be concatenated with \"\" or ''\nComments are written with // or # and end at end of line\nMultiple tags can be put on the same line by separating them with ;\nSee --command-tags for optional command tags"
+#define SHELL_FORMAT "-- [SHELL FORMAT] --\n\nShell command follows regular shell format\n\n-- [Environment] --\n\n[Note]\n  $id: id of the note\n  $channel: channel of the note\n  $velocity: velocity of the note\n\n[Controller]\n  $value: value of the controller (remapped)\n  $id: id of the controller\n  $channel: channel of the controller\n  $rawvalue: original value of the controller\n\n[Pitch]\n  $value: value of the bend (remapped)\n  $rawvalue: original value of the bend\n\n[System]\n  $code: hexadecimal code of the system signal"
+#define ZFD_FORMAT "-- [ZFD FILE FORMAT] --\n\nZFD format: http://zawz.net/doc/ztd/zfd.html\n\n[<device>,<device>]\n\n-- <device> format --\n  {\n    name=<name>\n    commands=[<command>,<command>]\n  }\n--\n*name: string referring to client name of the device\n\n<command> format\n  {\n    type=<type>\n    shell=<shell command>\n    <tag>=<value>\n    <tag>=<value>\n    ...\n  }\n--\n*type: type of the signal: note/controller/pitch/system/connect/disconnect\n  > mandatory\n*shell: shell command to be executed\n  > mandatory\n\nShell commands can be concatenated with \"\" or ''\nsee --command-tags for optional command tags"
+
 #endif //HELP_H

src/device.cpp

@@ -286,7 +286,7 @@ void Device::run_signal(char* buff)
       {
         std::string command="code=" + strval + ";";
         command += dequote(it.shell);
-        std::thread(ztd::sh, command, true).detach();
+        std::thread(ztd::shr, command).detach();
       }
     }
     else
@@ -363,7 +363,7 @@ void Device::run_signal(char* buff)
             + ";channel=" + std::to_string(channel)
             + ";velocity=" + std::to_string(value) + ";";
             command += dequote(it.shell);
-            std::thread(ztd::sh, command, true).detach();
+            std::thread(ztd::shr, command).detach();
           }
         }
       }
@@ -390,7 +390,7 @@ void Device::run_signal(char* buff)
             else
               command += std::to_string((long int) result);
             command += ";" + dequote(it.shell);
-            std::thread(ztd::sh, command, true).detach();
+            std::thread(ztd::shr, command).detach();
           }
         }
       }
@@ -416,7 +416,7 @@ void Device::run_signal(char* buff)
             else
               command += std::to_string((long int) result);
             command += ";" + dequote(it.shell);
-            std::thread(ztd::sh, command, true).detach();
+            std::thread(ztd::shr, command).detach();
           }
         }
       } // if type
@@ -438,7 +438,7 @@ void Device::loop(Device* dev)
 
   for( auto it : dev->connectCommands )
   {
-    std::thread(ztd::sh, dequote(it.shell), true).detach();
+    std::thread(ztd::shr, dequote(it.shell)).detach();
   }
 
   while (getline(&buff, &buff_size, stream) > 0)
@@ -448,7 +448,7 @@ void Device::loop(Device* dev)
 
   for( auto it : dev->disconnectCommands )
   {
-    std::thread(ztd::sh, dequote(it.shell), true).detach();
+    std::thread(ztd::shr, dequote(it.shell)).detach();
   }
 
   log("Device '" + dev->name + "' disconnected\n");

src/format.cpp

@@ -98,6 +98,29 @@ ztd::chunkdat mimtochk(std::string mim)
   return chk;
 }
 
+std::string chktomim(ztd::chunkdat const& chk, std::string const& aligner)
+{
+  std::string ret;
+  for(int i=0 ; i<chk.listSize() ; i++)
+  {
+    ztd::chunkdat& device=chk[i];
+    ret += "Device " + device.subChunkRef("name").str() + "\n\n";
+    for(int j=0 ; j < device["commands"].listSize() ; j++)
+    {
+      ztd::chunkdat command=device["commands"][j];
+      ret += aligner + "Command " + command["type"].str() + '\n';
+      command.erase("type");
+      for(auto it : command.getmap())
+      {
+        ret += aligner+aligner + it.first + '=' + it.second->str() + '\n';
+      }
+      ret += '\n';
+      // ret += command.str(2, aligner) + '\n';
+    }
+  }
+  return ret;
+}
+
 bool is_mim(const std::string& str)
 {
   unsigned int i=0;

src/main.cpp

@@ -75,11 +75,11 @@ void load_filedat(ztd::filedat& file, bool from_stdin, std::string const& path)
     file.setFilePath(path);
     std::string str=file_strimport(path);
 
-    if(options.find("zfd")->activated)
+    if(options["zfd"])
     {
       file.data() = str;
     }
-    else if(options.find("mim")->activated)
+    else if(options["mim"])
     {
       file.data() = mimtochk(str);
     }
@@ -100,11 +100,11 @@ void load_filedat(ztd::filedat& file, bool from_stdin, std::string const& path)
   {
     file.setFilePath(path);
     log("Loading map file '" + path + "'\n");
-    if(options.find("zfd")->activated)
+    if(options["zfd"])
     {
       file.import_file();
     }
-    else if(options.find("mim")->activated)
+    else if(options["mim"])
     {
       file.data() = mimtochk(file_strimport(path));
     }
@@ -143,29 +143,28 @@ int main(int argc, char* argv[])
   bool autoreload=true;
   bool from_stdin=false;
 
-  options.add(ztd::option("\r  [Help]"));
-  options.add(ztd::option('h',"help",         false, "Display this help message"));
-  options.add(ztd::option('v',"version",      false, "Display version"));
-  options.add(ztd::option("mim-format",       false, "Display mim file format help"));
-  options.add(ztd::option("zfd-format",       false, "Display zfd file format help"));
-  options.add(ztd::option("command-tags",     false, "Display for command tag help"));
-  options.add(ztd::option("shell-format",     false, "Display for shell format help"));
-
-  options.add(ztd::option("\r  [Format]"));
-  options.add(ztd::option("no-log",           false, "Disable console logging"));
-
-  options.add(ztd::option("\r  [Devices]"));
-  options.add(ztd::option('l',"list",         false, "List detected devices"));
-  options.add(ztd::option('L',"full-list",    false, "Print whole device list details"));
-  options.add(ztd::option('p',"port",         true,  "Connect to device and output to console", "device"));
-  options.add(ztd::option("\r  [Map file]"));
-  options.add(ztd::option('m',"mim",          false, "Read file in mim format"));
-  options.add(ztd::option('z',"zfd",          false, "Read file in zfd format"));
-  options.add(ztd::option('o',"output",       true, "Output the resulting zfd map to file. - for stdout", "file"));
-  options.add(ztd::option("aligner",          true,  "String to use for aligning output map format. Default \\t", "string"));
-  options.add(ztd::option("no-reload",        false, "Disable auto reloading when file changes are detected"));
-  options.add(ztd::option("\rIf no file format is specified, the program will try to guess the format"));
-  // options.add(ztd::option('i',"interactive", false, "Start in interactive mode"));
+  options.add(
+    ztd::option("\r  [Help]"),
+    ztd::option('h',"help",         false, "Display this help message"),
+    ztd::option('v',"version",      false, "Display version"),
+    ztd::option("mim-format",       false, "Display mim file format help"),
+    ztd::option("zfd-format",       false, "Display zfd file format help"),
+    ztd::option("command-tags",     false, "Display for command tag help"),
+    ztd::option("shell-format",     false, "Display for shell format help"),
+    ztd::option("\r  [Format]"),
+    ztd::option("no-log",           false, "Disable console logging"),
+    ztd::option("\r  [Devices]"),
+    ztd::option('l',"list",         false, "List detected devices"),
+    ztd::option('L',"full-list",    false, "Print whole device list details"),
+    ztd::option('p',"port",         true,  "Connect to device and output to console", "device"),
+    ztd::option("\r  [Map file]"),
+    ztd::option('m',"mim",          false, "Read file in mim format"),
+    ztd::option('z',"zfd",          false, "Read file in zfd format"),
+    ztd::option('o',"output",       true,  "Output the resulting map to file", "file"),
+    ztd::option("out-zfd",          false, "Output in zfd format"),
+    ztd::option("aligner",          true,  "String to use for aligning output map format. Default \\t", "string"),
+    ztd::option("no-reload",        false, "Disable auto reloading when file changes are detected")
+  );
 
   std::vector<std::string> arg;
   try
@@ -180,74 +179,72 @@ int main(int argc, char* argv[])
     stop(1);
   }
 
-  ztd::option* op=nullptr;
   //exit options
-  if( options.find('h')->activated )
+  if( options['h'] )
   {
     help();
     stop(0);
   }
-  if( options.find('v')->activated )
+  if( options['v'] )
   {
     version();
     stop(0);
   }
-  if( options.find("mim-format")->activated )
+  if( options["mim-format"] )
   {
     printf("%s\n", MIM_FORMAT);
     stop(0);
   }
-  if( options.find("zfd-format")->activated )
+  if( options["zfd-format"] )
   {
     printf("%s\n", ZFD_FORMAT);
     stop(0);
   }
-  if( options.find("command-tags")->activated )
+  if( options["command-tags"] )
   {
     printf("%s\n", COMMAND_TAGS);
     stop(0);
   }
-  if( options.find("shell-format")->activated )
+  if( options["shell-format"] )
   {
     printf("%s\n", SHELL_FORMAT);
     stop(0);
   }
-  if( options.find('L')->activated )
+  if( options['L'] )
   {
-    ztd::sh("aseqdump -l", true);
+    ztd::shr("aseqdump -l");
     stop(0);
   }
-  if( options.find('l')->activated )
+  if( options['l'] )
   {
-    ztd::sh(LIST_COMMAND, true);
+    ztd::shr(LIST_COMMAND);
     stop(0);
   }
 
-  op = options.find('p');
-  if( op->activated )
+  if( options['p'] )
   {
-    option_p(op->argument);
+    option_p(options['p']);
     stop(0);
   }
 
-  if (options.find('o')->activated)
+  if (options['o'])
   {
     log_on=false;
   }
 
   //behavioral options
-  if( options.find("no-reload")->activated )
+  if( options["no-reload"] )
   {
     autoreload=false;
   }
-  if( options.find("no-log")->activated )
+  if( options["no-log"] )
   {
     log_on=false;
   }
   std::string aligner="\t";
-  if(options.find("aligner")->activated)
+  if(options["aligner"])
   {
-    aligner=options.find("aligner")->argument;
+    aligner=options["aligner"].argument;
   }
 
   //no argument: display help
@@ -274,14 +271,24 @@ int main(int argc, char* argv[])
     //load
     load_filedat(file, from_stdin, filepath);
     //output
-    if(options.find('o')->activated)
+    if(options['o'])
     {
-      if(options.find('o')->argument == "-") {
-        std::cout << file.strval(aligner) << std::endl;
+      std::string ret;
+      if(options["out-zfd"])
+        ret=file.data().str(0, aligner);
+      else
+        ret=chktomim(file.data(), aligner);
+      if(options['o'].argument == "-") {
+        std::cout << ret << std::endl;
       }
       else {
-        file.setFilePath(options.find('o')->argument);
-        file.export_file();
+        std::ofstream output(options['o']);
+        if(!output)
+        {
+          std::cerr << "Cannot write to file '" + options['o'].argument + "'\n";
+          return 1;
+        }
+        output << ret << std::endl ;
       }
       return 0;
     }

src/system.cpp

@@ -96,9 +96,7 @@ void announce_loop()
       device_check();
   }
 
-  int ret = WEXITSTATUS(ztd::pclose2(stream, announce_thread_pid));
-  if( ret != 0 )
-    throw std::runtime_error("ALSA error");
+  ztd::pclose2(stream, announce_thread_pid);
 
   if(buff != NULL)
     free(buff);