2016-07-21 Fred Gleason <fredg@paravelsystems.com>

* Moved enforcement of user permissions to the
	'MainObject::DispatchCommand()' method in
	'utils/rdclilogedit/parser.cpp'.
This commit is contained in:
Fred Gleason
2016-07-21 15:12:41 -04:00
parent d8a6fb56e4
commit 985eb461f3
5 changed files with 590 additions and 539 deletions

View File

@@ -154,408 +154,6 @@ void MainObject::Print(const QString &str) const
}
void MainObject::DispatchCommand(QString cmd)
{
bool processed=false;
int line;
QTime time;
bool ok=false;
bool overwrite=!edit_modified;
QStringList cmds;
QString verb;
cmd=cmd.stripWhiteSpace();
if(cmd.right(1)=="!") {
overwrite=true;
cmd=cmd.left(cmd.length()-1).stripWhiteSpace();
}
cmds=cmds.split(" ",cmd);
verb=cmds[0].lower();
//
// No loaded log needed for these
//
if((verb=="exit")||(verb=="quit")||(verb=="bye")) {
if(overwrite) {
exit(0);
}
else {
OverwriteError(verb);
}
processed=true;
}
if((verb=="help")||(verb=="?")) {
Help(cmds);
processed=true;
}
if(verb=="listlogs") {
ListLogs();
processed=true;
}
if(verb=="load") {
if(overwrite) {
if(cmds.size()==2) {
Load(cmds[1]);
}
else {
fprintf(stderr,"load: invalid command arguments\n");
}
}
else {
OverwriteError("load");
}
processed=true;
}
//
// These need a log loaded
//
if((processed)||(edit_log_event!=NULL)) {
if(verb=="addcart") {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)) {
unsigned cartnum=cmds[2].toUInt(&ok);
if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) {
Addcart(line,cartnum);
}
else {
fprintf(stderr,"addcart: invalid cart number\n");
}
}
else {
fprintf(stderr,"addcart: invalid line number\n");
}
}
else {
fprintf(stderr,"addcart: invalid command arguments\n");
}
processed=true;
}
if(verb=="addchain") {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)) {
Addchain(line,cmds[2]);
}
else {
fprintf(stderr,"addchain: invalid line number\n");
}
}
else {
fprintf(stderr,"addchain: invalid command arguments\n");
}
processed=true;
}
if(verb=="addmarker") {
if(cmds.size()==2) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)) {
Addmarker(line);
}
else {
fprintf(stderr,"addmarker: invalid line number\n");
}
}
else {
fprintf(stderr,"addmarker: invalid command arguments\n");
}
processed=true;
}
if(verb=="addtrack") {
if(cmds.size()==2) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)) {
Addtrack(line);
}
else {
fprintf(stderr,"addtrack: invalid line number\n");
}
}
else {
fprintf(stderr,"addtrack: invalid command arguments\n");
}
processed=true;
}
if(verb=="list") {
List();
processed=true;
}
if(verb=="remove") {
if(cmds.size()==2) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
Remove(line);
}
else {
fprintf(stderr,"remove: invalid line number\n");
}
}
else {
fprintf(stderr,"remove: invalid command arguments\n");
}
processed=true;
}
if(verb=="save") {
Save();
processed=true;
}
if(verb=="saveas") {
if(cmds.size()==2) {
if(cmds[1].length()>64) {
fprintf(stderr,"saveas: log name too long\n");
}
Saveas(cmds[1]);
}
else {
fprintf(stderr,"saveas: invalid command arguments\n");
}
processed=true;
}
if(verb=="setcart") {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
unsigned cartnum=cmds[2].toUInt(&ok);
if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) {
Setcart(line,cartnum);
}
else {
fprintf(stderr,"setcart: invalid cart number\n");
}
}
else {
fprintf(stderr,"setcart: invalid line number\n");
}
}
else {
fprintf(stderr,"setcart: invalid command arguments\n");
}
processed=true;
}
if(verb=="setcomment") {
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
cmds.remove(cmds.begin());
cmds.remove(cmds.begin());
Setcomment(line,cmds.join(" "));
}
else {
fprintf(stderr,"setcomment: invalid line number\n");
}
}
else {
fprintf(stderr,"setcomment: invalid command arguments\n");
}
processed=true;
}
if(verb=="setlabel") {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
Setlabel(line,cmds[2]);
}
else {
fprintf(stderr,"setlabel: invalid line number\n");
}
}
else {
fprintf(stderr,"setlabel: invalid command arguments\n");
}
processed=true;
}
if(verb=="settime") {
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
RDLogLine::TimeType ttype=RDLogLine::NoTime;
if(cmds[2].lower()=="hard") {
ttype=RDLogLine::Hard;
}
if(cmds[2].lower()=="none") {
ttype=RDLogLine::Relative;
}
switch(ttype) {
case RDLogLine::Hard:
if(cmds.size()>=4) {
time=RDGetWebTime(cmds[3],&ok);
if(ok) {
Settime(line,ttype,time);
}
else {
fprintf(stderr,"settime: invalid time value\n");
}
}
else {
fprintf(stderr,"settime: missing time value\n");
}
break;
case RDLogLine::Relative:
Settime(line,ttype);
break;
case RDLogLine::NoTime:
fprintf(stderr,"settime: invalid time type\n");
break;
}
}
else {
fprintf(stderr,"settime: invalid line number\n");
}
}
else {
fprintf(stderr,"settime: invalid command arguments\n");
}
processed=true;
}
if(verb=="settrans") {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
RDLogLine::TransType trans=RDLogLine::NoTrans;
if(cmds[2].lower()=="play") {
trans=RDLogLine::Play;
}
if(cmds[2].lower()=="segue") {
trans=RDLogLine::Segue;
}
if(cmds[2].lower()=="stop") {
trans=RDLogLine::Stop;
}
if(trans!=RDLogLine::NoTrans) {
Settrans(line,trans);
}
else {
fprintf(stderr,"settrans: invalid transition type\n");
}
}
else {
fprintf(stderr,"settrans: invalid line number\n");
}
}
else {
fprintf(stderr,"settrans: invalid command arguments\n");
}
processed=true;
}
if(verb=="unload") {
if(overwrite) {
Unload();
}
else {
OverwriteError("unload");
}
processed=true;
}
}
else {
fprintf(stderr,"%s: no log loaded\n",(const char *)verb);
processed=true;
}
if(!processed) {
fprintf(stderr,"invalid command\n");
}
PrintPrompt();
}
QString MainObject::ListLine(RDLogEvent *evt,int line) const
{
QString ret="";
RDLogLine *logline=evt->logLine(line);
switch(logline->timeType()) {
case RDLogLine::Hard:
ret+=QString().
sprintf("T%s ",(const char *)logline->startTime(RDLogLine::Logged).
toString("hh:mm:ss"));
break;
case RDLogLine::Relative:
ret+=QString().
sprintf(" %s ",(const char *)evt->blockStartTime(line).
toString("hh:mm:ss"));
break;
case RDLogLine::NoTime:
ret+=" ";
break;
}
ret+=QString().sprintf("%-7s",
(const char *)RDLogLine::transText(logline->transType()));
switch(logline->type()) {
case RDLogLine::Cart:
case RDLogLine::Macro:
ret+=QString().sprintf("%06u ",logline->cartNumber());
ret+=QString().sprintf("%-12s",(const char *)logline->groupName());
ret+=QString().sprintf("%5s",
(const char *)RDGetTimeLength(logline->forcedLength(),false,false))+" ";
ret+=logline->title();
break;
case RDLogLine::Marker:
ret+="MARKER ";
ret+=" ";
ret+=" ";
ret+=logline->markerComment();
break;
case RDLogLine::Track:
ret+="TRACK ";
ret+=" ";
ret+=" ";
ret+=logline->markerComment();
break;
case RDLogLine::Chain:
ret+="LOG CHN ";
ret+=" ";
ret+=" ";
ret+=logline->markerLabel();
break;
case RDLogLine::MusicLink:
ret+="LINK ";
ret+=" ";
ret+=" ";
ret+="[music import]";
break;
case RDLogLine::TrafficLink:
ret+="LINK ";
ret+=" ";
ret+=" ";
ret+="[traffic import]";
break;
case RDLogLine::OpenBracket:
case RDLogLine::CloseBracket:
case RDLogLine::UnknownType:
break;
}
return ret;
}
void MainObject::PrintPrompt() const
{
if(edit_log==NULL) {