zawz/zmidimap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: zawz:master
Branches Tags
zawz:master
zawz:v1.4
zawz:v1.3
zawz:v1.2.1
zawz:v1.2
zawz:v1.1
zawz:v1.0
..
compare: zawz:v1.2.1
Branches Tags
zawz:master
zawz:v1.4
zawz:v1.3
zawz:v1.2.1
zawz:v1.2
zawz:v1.1
zawz:v1.0

No commits in common. "master" and "v1.2.1" have entirely different histories.
master ... v1.2.1

20 changed files with 196 additions and 354 deletions
Show stats Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,3 +0,0 @@
zmidimap
obj
Zmakefile

2
Makefile
View file

@ -11,8 +11,6 @@ CC=g++
CXXFLAGS= -I$(IDIR) -Wall -pedantic -std=c++17
ifeq ($(DEBUG),true)
CXXFLAGS += -g
else
CXXFLAGS += -O2
endif
ifeq ($(STATIC),true)
LDFLAGS += -l:libztd.a

6
README.md
View file

@ -2,7 +2,7 @@
Map midi signals coming from ALSA midi devices to shell commands
Dependencies: alsa-utils
Dependencies: alsa-utils , [ztd](https://github.com/zawwz/ztd)
## Installing
@ -14,12 +14,10 @@ Download the .deb package then run: `sudo dpkg -i zmidimap.deb ; sudo apt -f ins
### Standalone
Download ``zmidimap.tar.gz`` for a standalone executable
Download ``zmidimap-static.tar.gz`` for a standalone executable without library dependency
### From source
Depends on: [ztd](https://github.com/zawwz/ztd)
``make -j6`` for a shared build
``STATIC=true make -j6`` for a static build

28
example.mim
View file

@ -1,43 +1,49 @@
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 -100:100 for knob 41 on channel 0
//display value 0:127 for knob 41 from any channel
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 41 on channel 1 (first half)
//display value 0:1:0 for knob 42 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 41 on channel 1 (second half)
//display value 0:1:0 for knob 42 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"

26
example.zfd
View file

@ -10,38 +10,46 @@
//displays value 0:127 for knobs 21-28
type=controller
id=21:28
shell='echo "Knob #$id ch$channel:$value"'
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"
},
{
//KNOB L2
//displays value -100:100 for knob 41 on channel 0
//displays value -100:100 for knob 42 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 41 on channel 1 (first half)
//displays value 0:1:0 for knob 42 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 41 on channel 1 (second half)
//displays value 0:1:0 for knob 42 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"
}
]
}
@ -53,13 +61,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"
}
]
}

39
gen_help_format.sh
View file

@ -1,38 +1,11 @@
FORMAT_FOLDER=help_format
IDIR=include
SLASHSCRIPT='s|\\|\\\\|g;s|\"|\\\"|g'
NEWLINESCRIPT=':a;N;$!ba;s/\n/\\n/g;'
cp $FORMAT_FOLDER/help_template_head $IDIR/help.h
filetocstr()
{
sed -e $SLASHSCRIPT "$1" | sed $NEWLINESCRIPT
}
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
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"
cat $FORMAT_FOLDER/help_template_tail >> $IDIR/help.h

0
help_format/command_tags → help_format/command-tags
View file

2
help_format/help_template_head Normal file
View file

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

1
help_format/help_template_tail Normal file
View file

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

7
help_format/mim_format → help_format/mim-format
View file

@ -20,7 +20,6 @@ Device <name>
*shell: shell command to be executed
> mandatory
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
Shell command can be concatenated with \"\" or ''
Comments are written by starting a line with //
see --command-tags for optional command tags

0
help_format/shell_format → help_format/shell-format
View file

4
help_format/zfd_format → help_format/zfd-format
View file

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

7
include/device.hpp
View file

@ -8,6 +8,8 @@
#include "command.hpp"
#include <ztd/filedat.hpp>
void sh(std::string const& string);
class Device
{
public:
@ -17,7 +19,7 @@ public:
bool start_loop();
void run_signal(char* buff);
bool import_chunk(const ztd::chunkdat& ch);
bool import_chunk(ztd::chunkdat const& ch);
ztd::chunkdat export_chunk();
std::string name;
@ -32,6 +34,7 @@ public:
std::vector<ConnectCommand> connectCommands;
std::vector<DisconnectCommand> disconnectCommands;
std::thread thread;
pid_t thread_pid;
private:
static void loop(Device* dev);
@ -39,6 +42,4 @@ private:
extern std::vector<Device*> device_list;
void clean_devices();
#endif //DEVICE_HPP

4
include/format.hpp
View file

@ -3,9 +3,7 @@
#include <ztd/filedat.hpp>
ztd::chunkdat mimtochk(std::string mim);
std::string chktomim(ztd::chunkdat const& chk, std::string const& aligner);
ztd::chunkdat mimtochk(const std::string& mim);
std::string file_strimport(const std::string& path);

12
include/help.h
View file

@ -1,9 +1,7 @@
#ifndef HELP_H
#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"
#define HELP_H
#define ZFD_FORMAT "zmidimap\n-- [ZFD FILE FORMAT] --\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\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 ''\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"
#endif //HELP_H

6
include/system.hpp
View file

@ -5,16 +5,10 @@
#define LIST_COMMAND "aseqdump -l | tail -n +2 | cut -c10-42 | tr -s ' '"
#define LIST_EXTENDED_COMMAND "aseqdump -l | tail -n +2 | cut -c-42"
#include <string>
extern int announce_thread_pid;
void kill_all();
void device_check();
void announce_loop();
void filetime_loop(std::string const& filepath);
#endif //SYSTEM_HPP

78
src/device.cpp
View file

@ -5,7 +5,6 @@
#include <string.h>
#include <signal.h>
#include <iostream>
#include <ztd/shell.hpp>
#include "log.hpp"
@ -36,11 +35,16 @@ static std::string dequote(const std::string& in)
return ret;
}
static bool _isNum(const char& a)
static bool _isNum(char a)
{
return (a>='0' && a<='9');
}
void sh(std::string const& string)
{
system(string.c_str());
}
Device::Device()
{
busy=false;
@ -59,16 +63,17 @@ bool Device::start_loop()
if(this->busy)
return false;
this->busy = true;
std::thread(Device::loop, this).detach();
this->thread = std::thread(Device::loop, this);
this->thread.detach();
return true;
}
std::pair<int32_t,int32_t> importRange(const ztd::chunkdat& ch, const std::string& tag, int32_t low, int32_t high)
std::pair<int32_t,int32_t> importRange(ztd::chunkdat const& ch, std::string const& tag, int32_t low, int32_t high)
{
ztd::chunkdat* pch=ch.subChunkPtr(tag);
if(pch != nullptr)
{
std::string str=*pch;
std::string str=pch->strval();
auto tpos=str.find(':');
if (str=="*") //whole range
{
@ -76,25 +81,25 @@ std::pair<int32_t,int32_t> importRange(const ztd::chunkdat& ch, const std::strin
}
else if(tpos == std::string::npos) //single value
{
low=std::stoi(str);
low=stoi(str);
high=low;
}
else //range
{
low=std::stoi(str.substr(0,tpos));
low=stoi(str.substr(0,tpos));
tpos++;
high=std::stoi(str.substr(tpos, str.size()-tpos));
high=stoi(str.substr(tpos, str.size()-tpos));
}
}
return std::make_pair(low, high);
}
std::pair<float,float> importRangeFloat(const ztd::chunkdat& ch, const std::string& tag, float low, float high)
std::pair<float,float> importRangeFloat(ztd::chunkdat const& ch, std::string const& tag, float low, float high)
{
ztd::chunkdat* pch=ch.subChunkPtr(tag);
if(pch != nullptr)
{
std::string str=*pch;
std::string str=pch->strval();
auto tpos=str.find(':');
if(tpos == std::string::npos)
{
@ -113,12 +118,12 @@ std::pair<float,float> importRangeFloat(const ztd::chunkdat& ch, const std::stri
return std::make_pair(low, high);
}
bool importBool(const ztd::chunkdat& ch, const std::string& tag, const bool& defbool)
bool importBool(ztd::chunkdat const& ch, std::string const& tag, bool defbool)
{
ztd::chunkdat* pch=ch.subChunkPtr(tag);
if(pch != nullptr)
{
std::string str=*pch;
std::string str=pch->strval();
if( str == "true" )
return true;
else if( str == "false" )
@ -127,30 +132,30 @@ bool importBool(const ztd::chunkdat& ch, const std::string& tag, const bool& def
return defbool;
}
bool Device::import_chunk(const ztd::chunkdat& ch)
bool Device::import_chunk(ztd::chunkdat const& ch)
{
ztd::chunkdat& cch = ch["commands"];
this->name=dequote(ch["name"]);
this->name=dequote(ch["name"].strval());
for(int i=0 ; i<cch.listSize() ; i++)
{
ztd::chunkdat& tch=cch[i];
std::string tstr=tch["type"];
std::string tstr=tch["type"].strval();
if(tstr == "system") //type system
{
std::string shell;
shell=tch["shell"];
shell=tch["shell"].strval();
this->sysCommands.push_back(SystemCommand(shell));
}
else if (tstr == "connect")
{
std::string shell;
shell=tch["shell"];
shell=tch["shell"].strval();
this->connectCommands.push_back(ConnectCommand(shell));
}
else if (tstr == "disconnect")
{
std::string shell;
shell=tch["shell"];
shell=tch["shell"].strval();
this->disconnectCommands.push_back(DisconnectCommand(shell));
}
else
@ -162,13 +167,13 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
std::pair<float,float> floatpair;
//channel
if(tch.subChunkPtr("channel") == nullptr || tch["channel"] == "*")
if(tch.subChunkPtr("channel") == nullptr || tch["channel"].strval()=="*")
channel=-1;
else
channel=std::stoi(tch["channel"]);
channel=stoi(tch["channel"].strval());
//shell
shell=tch["shell"];
shell=tch["shell"].strval();
//type
if(tstr == "note") //type note
@ -177,11 +182,13 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
uint8_t id_high=127;
uint8_t low=1;
uint8_t high=127;
std::string tt;
//id
intpair=importRange(tch, "id", id_low, id_high);
id_low=intpair.first;
id_high=intpair.second;
// id=stoi(tch["id"].strval());
//trigger
intpair = importRange(tch, "trigger", low, high);
@ -192,6 +199,7 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
{
this->noteCommands[i].push_back(NoteCommand(channel,low,high,shell));
}
this->nb_command++;
}
else if(tstr == "controller") //type controller
{
@ -225,6 +233,7 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
{
this->ctrlCommands[i].push_back(ControllerCommand(channel,min,max,mapMin,mapMax,floating,shell));
}
this->nb_command++;
}
else if(tstr == "pitch") //type pitch bend
{
@ -248,6 +257,7 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
floating = importBool(tch, "float", floating);
this->pitchCommands.push_back(PitchCommand(channel,min,max,mapMin,mapMax,floating,shell));
this->nb_command++;
}
else
{
@ -255,7 +265,6 @@ bool Device::import_chunk(const ztd::chunkdat& ch)
return false;
}
}
this->nb_command++;
}
return true;
}
@ -286,7 +295,7 @@ void Device::run_signal(char* buff)
{
std::string command="code=" + strval + ";";
command += dequote(it.shell);
std::thread(ztd::shr, command).detach();
std::thread(sh, command).detach();
}
}
else
@ -294,7 +303,7 @@ void Device::run_signal(char* buff)
int t;
char type;
int8_t channel;
int8_t ctid=-1;
int ctid;
int16_t value;
char* pos=NULL;
bool note_off=false;
@ -313,7 +322,7 @@ void Device::run_signal(char* buff)
else
{
// throw std::runtime_error("Unknown MIDI signal:\n" + std::string(buff));
std::cerr << "Unsupported signal, ignoring\n" ;
printf("Unsupported signal, ignoring\n");
return;
}
@ -363,7 +372,7 @@ void Device::run_signal(char* buff)
+ ";channel=" + std::to_string(channel)
+ ";velocity=" + std::to_string(value) + ";";
command += dequote(it.shell);
std::thread(ztd::shr, command).detach();
std::thread(sh, command).detach();
}
}
}
@ -390,7 +399,7 @@ void Device::run_signal(char* buff)
else
command += std::to_string((long int) result);
command += ";" + dequote(it.shell);
std::thread(ztd::shr, command).detach();
std::thread(sh, command).detach();
}
}
}
@ -416,7 +425,7 @@ void Device::run_signal(char* buff)
else
command += std::to_string((long int) result);
command += ";" + dequote(it.shell);
std::thread(ztd::shr, command).detach();
std::thread(sh, command).detach();
}
}
} // if type
@ -438,7 +447,7 @@ void Device::loop(Device* dev)
for( auto it : dev->connectCommands )
{
std::thread(ztd::shr, dequote(it.shell)).detach();
std::thread(sh, dequote(it.shell)).detach();
}
while (getline(&buff, &buff_size, stream) > 0)
@ -448,7 +457,7 @@ void Device::loop(Device* dev)
for( auto it : dev->disconnectCommands )
{
std::thread(ztd::shr, dequote(it.shell)).detach();
std::thread(sh, dequote(it.shell)).detach();
}
log("Device '" + dev->name + "' disconnected\n");
@ -457,12 +466,3 @@ void Device::loop(Device* dev)
dev->thread_pid=-1;
free(buff);
}
void clean_devices()
{
for(auto it : device_list)
{
delete it;
}
device_list.clear();
}

26
src/format.cpp
View file

@ -71,9 +71,8 @@ ztd::chunkdat mimtochk_commands(const std::string& mim)
return chk;
}
ztd::chunkdat mimtochk(std::string mim)
ztd::chunkdat mimtochk(const std::string& mim)
{
mim = ztd::filedat::removeComments(mim);
ztd::chunkdat chk;
unsigned int i=0,j=0;
_find_next(mim,i, "Device ");
@ -98,29 +97,6 @@ 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;

379
src/main.cpp
View file

@ -14,7 +14,7 @@
#include <ztd/options.hpp>
#include <ztd/shell.hpp>
#define VERSION_STRING "v1.3.1a"
#define VERSION_STRING "v1.2"
ztd::option_set options;
@ -23,6 +23,7 @@ void help()
printf("zmidimap [options] <file>\n\nOptions:\n");
options.print_help(4, 25);
printf("\n");
printf("If piped, the map file will be read from standard input\n");
printf("See --mim-format --zfd-format --command-tags --shell-format options for details on map file format\n");
}
@ -58,7 +59,8 @@ void cleanup()
void stop(int ret)
{
kill_all();
if(announce_thread_pid>0)
kill(announce_thread_pid, SIGINT);
exit(ret);
}
@ -67,50 +69,155 @@ void inthandler(int dummy)
stop(0);
}
void load_filedat(ztd::filedat& file, bool from_stdin, std::string const& path)
int main(int argc, char* argv[])
{
if(from_stdin)
signal(SIGINT, inthandler);
signal(SIGCHLD, SIG_IGN); //not expecting returns from child processes
bool piped=false;
if (!isatty(fileno(stdin)))
piped = true;
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("\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"));
std::vector<std::string> arg;
try
{
arg = options.process(argc, argv);
}
catch(ztd::option_error& err)
{
printf("%s\n", err.what());
stop(1);
}
ztd::option* op=nullptr;
//exit options
if( options.find('h')->activated )
{
help();
stop(0);
}
if( options.find('v')->activated )
{
version();
stop(0);
}
if( options.find("mim-format")->activated )
{
printf("%s\n", MIM_FORMAT);
stop(0);
}
if( options.find("zfd-format")->activated )
{
printf("%s\n", ZFD_FORMAT);
stop(0);
}
if( options.find("command-tags")->activated )
{
printf("%s\n", COMMAND_TAGS);
stop(0);
}
if( options.find("shell-format")->activated )
{
printf("%s\n", SHELL_FORMAT);
stop(0);
}
if( options.find('L')->activated )
{
sh("aseqdump -l");
stop(0);
}
if( options.find('l')->activated )
{
sh(LIST_COMMAND);
stop(0);
}
op = options.find('p');
if( op->activated )
{
option_p(op->argument);
stop(0);
}
if (options.find('o')->activated)
{
log_on=false;
}
//behavioral options
if( options.find("no-log")->activated )
{
log_on=false;
}
std::string aligner="\t";
if(options.find("aligner")->activated)
{
aligner=options.find("aligner")->argument;
}
//no argument: display help
ztd::filedat file;
bool no_arg=false;
if (arg.size() <= 0 || arg[0] == "")
{
no_arg=true;
if(!piped)
{
help();
stop(0);
}
}
else
{
file.setFilePath(arg[0]);
}
//main processing
try
{
if(no_arg)
{
log("Loading map from stdin\n");
file.setFilePath(path);
std::string str=file_strimport(path);
if(options["zfd"])
{
file.data() = str;
}
else if(options["mim"])
{
file.data() = mimtochk(str);
file.import_stdin();
}
else
{
if(is_mim(str))
{
file.data() = mimtochk(str);
}
else
{
file.data() = str;
}
}
}
else
{
file.setFilePath(path);
log("Loading map file '" + path + "'\n");
if(options["zfd"])
log("Loading map file '" + arg[0] + "'\n");
if(options.find("zfd")->activated)
{
file.import_file();
}
else if(options["mim"])
else if(options.find("mim")->activated)
{
file.data() = mimtochk(file_strimport(path));
file.data() = mimtochk(file_strimport(arg[0]));
}
else
{
std::string filestr=file_strimport(path);
std::string filestr=file_strimport(arg[0]);
if(is_mim(filestr))
{
file.data() = mimtochk(filestr);
@ -121,209 +228,29 @@ void load_filedat(ztd::filedat& file, bool from_stdin, std::string const& path)
}
}
}
}
void load_commands(ztd::chunkdat const& data)
{
clean_devices();
for(int i=0 ; i<data.listSize() ; i++)
if(options.find('o')->activated)
{
Device *newDevice = new Device;
newDevice->import_chunk(data[i]);
device_list.push_back(newDevice);
log("Loaded "+std::to_string(newDevice->nb_command)+" commands for device '"+newDevice->name+"'\n");
}
}
int main(int argc, char* argv[])
{
signal(SIGINT, inthandler);
signal(SIGCHLD, SIG_IGN); //not expecting returns from child processes
bool autoreload=true;
bool from_stdin=false;
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
{
arg = options.process(argc, argv);
}
catch(ztd::option_error& err)
{
printf("%s\n", err.what());
if(err.type() == ztd::option_error::unknown_option)
help();
stop(1);
}
//exit options
if( options['h'] )
{
help();
stop(0);
}
if( options['v'] )
{
version();
stop(0);
}
if( options["mim-format"] )
{
printf("%s\n", MIM_FORMAT);
stop(0);
}
if( options["zfd-format"] )
{
printf("%s\n", ZFD_FORMAT);
stop(0);
}
if( options["command-tags"] )
{
printf("%s\n", COMMAND_TAGS);
stop(0);
}
if( options["shell-format"] )
{
printf("%s\n", SHELL_FORMAT);
stop(0);
}
if( options['L'] )
{
ztd::shr("aseqdump -l");
stop(0);
}
if( options['l'] )
{
ztd::shr(LIST_COMMAND);
stop(0);
}
if( options['p'] )
{
option_p(options['p']);
stop(0);
}
if (options['o'])
{
log_on=false;
}
//behavioral options
if( options["no-reload"] )
{
autoreload=false;
}
if( options["no-log"] )
{
log_on=false;
}
std::string aligner="\t";
if(options["aligner"])
{
aligner=options["aligner"].argument;
}
//no argument: display help
ztd::filedat file;
std::string filepath;
if (arg.size() <= 0 || arg[0] == "")
{
help();
stop(0);
}
else
{
filepath=arg[0];
}
if(filepath == "-")
{
filepath = "/dev/stdin";
from_stdin = true;
}
//main processing
try
{
//load
load_filedat(file, from_stdin, filepath);
//output
if(options['o'])
{
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;
if(options.find('o')->argument == "-") {
std::cout << file.strval(aligner) << std::endl;
}
else {
std::ofstream output(options['o']);
if(!output)
{
std::cerr << "Cannot write to file '" + options['o'].argument + "'\n";
return 1;
}
output << ret << std::endl ;
file.setFilePath(options.find('o')->argument);
file.export_file();
}
return 0;
}
//create commands
load_commands(file.data());
for(int i=0 ; i<file.data().listSize() ; i++)
{
Device *newDevice = new Device;
newDevice->import_chunk(file[i]);
device_list.push_back(newDevice);
log("Loaded "+std::to_string(newDevice->nb_command)+" commands for device '"+newDevice->name+"'\n");
}
//main loop
log("Starting scan for devices\n");
if(autoreload)
std::thread(filetime_loop, filepath).detach(); // start the killer thread
announce_loop(); // loop until killed
ztd::chunkdat bak_data = file.data();
while(autoreload)
{
log("Reloading file\n");
try
{
load_filedat(file, from_stdin, filepath);
load_commands(file.data());
bak_data = file.data();
}
catch (ztd::format_error& e)
{
ztd::printFormatException(e);
log("Reloading old config\n");
load_commands(bak_data);
}
catch (std::exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
log("Reloading old config\n");
load_commands(bak_data);
}
announce_loop(); // loop until killed
}
announce_loop();
}
catch (ztd::format_error& e)
{

32
src/system.cpp
View file

@ -3,10 +3,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <sys/stat.h>
#include <signal.h>
#include <string>
#include <vector>
@ -17,17 +13,6 @@
int announce_thread_pid = 0;
void kill_all()
{
if(announce_thread_pid>0)
kill(announce_thread_pid, SIGINT);
for(auto it : device_list)
{
if(it->thread_pid>0)
kill(it->thread_pid, SIGINT);
}
}
void device_check()
{
char* buff = NULL;
@ -101,20 +86,3 @@ void announce_loop()
if(buff != NULL)
free(buff);
}
void filetime_loop(std::string const& filepath)
{
struct stat attrib;
stat(filepath.c_str(), &attrib);
time_t last_time=attrib.st_ctime;
while(true)
{
stat(filepath.c_str(), &attrib);
if(attrib.st_ctime > last_time)
{
kill_all();
last_time = attrib.st_ctime;
}
sleep(1);
}
}