software/zeit
1
0
Fork 0
mirror of https://github.com/loimu/zeit.git synced 2025-09-15 12:58:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

crontablib: refactor a bit

Browse Source 
no need to call CommandLine::execute()
  when the file is already there

--HG--
branch : experimental
This commit is contained in:
blaze 2019-03-26 13:35:29 +03:00
parent 756fe6814f
commit 97678137b9
3 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crontablib/ctSystemCron.cpp
View File

@ -50,7 +50,7 @@ CTSystemCron::CTSystemCron(const QString& crontabBinary) :
// Don't set error if it can't be read, it means the user
// doesn't have a crontab.
if (readCommandLine.execute(false).exitCode == 0) {
if (readCommandLine.execute().exitCode == 0) {
this->parseFile(d->tmpFileName);
}

75
crontablib/ctcron.cpp
View File

@ -22,6 +22,10 @@
#ifdef BUILD_HELPER
#include <KAuthAction>
#include <KAuthExecuteJob>
#define ROOT_ACTIONS d->systemCron
#else
#define ROOT_ACTIONS false
#endif // BUILD_HELPER
#include "cttask.h"
@ -33,39 +37,22 @@
#include "logging.h"
CommandLineStatus CommandLine::execute(bool root) {
#ifdef BUILD_HELPER
if(root) {
QVariantMap args;
args.insert(QLatin1String("source"), parameters.at(0));
args.insert(QLatin1String("target"),standardOutputFile);
KAuth::Action saveAction(QLatin1String("local.zeit.crontab.save"));
saveAction.setHelperId(QLatin1String("local.zeit.crontab"));
saveAction.setArguments(args);
KAuth::ExecuteJob* job = saveAction.execute();
if(!job->exec())
qDebug() << "KAuth returned an error: "
<< job->error() << job->errorText();
}
#endif // BUILD_HELPER
CommandLineStatus CommandLine::execute() {
QProcess process;
if (standardOutputFile.isEmpty() == false)
if(!standardOutputFile.isEmpty())
process.setStandardOutputFile(standardOutputFile);
process.start(commandLine, parameters);
int exitCode;
if (!process.waitForStarted()) {
if(!process.waitForStarted()) {
exitCode = 127;
} else {
process.waitForFinished(-1);
exitCode = process.exitCode();
}
CommandLineStatus commandLineStatus;
commandLineStatus.commandLine = commandLine + QLatin1String(" ")
+ parameters.join(QLatin1String(" "));
if (standardOutputFile.isEmpty() == false)
if(!standardOutputFile.isEmpty())
commandLineStatus.commandLine += QLatin1String(" > ")
+ standardOutputFile;
commandLineStatus.standardOutput = QLatin1String(
@ -127,7 +114,7 @@ CTCron::CTCron(const QString& crontabBinary,
}
// Don't set error if it can't be read, it means the user doesn't have a crontab.
CommandLineStatus commandLineStatus = readCommandLine.execute(false);
CommandLineStatus commandLineStatus = readCommandLine.execute();
if (commandLineStatus.exitCode == 0) {
this->parseFile(d->tmpFileName);
}
@ -334,30 +321,38 @@ CTSaveStatus CTCron::save() {
tr("The file %1 could not be opened.").arg(d->tmpFileName));
}
CommandLineStatus commandLineStatus = d->writeCommandLine.execute(d->systemCron);
// install temp file into crontab
if (commandLineStatus.exitCode != 0) {
QFile::remove(d->tmpFileName);
return prepareSaveStatusError(commandLineStatus);
}
else {
//Remove the temp file
QFile::remove(d->tmpFileName);
}
#ifdef BUILD_HELPER
if(d->systemCron) {
QVariantMap args;
args.insert(QLatin1String("source"), d->tmpFileName);
args.insert(QLatin1String("target"),
d->writeCommandLine.standardOutputFile);
KAuth::Action saveAction(QLatin1String("local.zeit.crontab.save"));
saveAction.setHelperId(QLatin1String("local.zeit.crontab"));
saveAction.setArguments(args);
KAuth::ExecuteJob* job = saveAction.execute();
if(!job->exec())
qDebug() << "KAuth returned an error: "
<< job->error() << job->errorText();
QFile::remove(d->tmpFileName);
if(job->error() > 0)
return CTSaveStatus("KAuth::ExecuteJob Error", job->errorText());
}
#endif // BUILD_HELPER
if(!ROOT_ACTIONS) {
CommandLineStatus commandLineStatus = d->writeCommandLine.execute();
QFile::remove(d->tmpFileName);
if(commandLineStatus.exitCode != 0)
return prepareSaveStatusError(commandLineStatus);
}
//Mark as applied
for(CTTask* ctTask: d->task) {
for(CTTask* ctTask: d->task)
ctTask->apply();
}
for(CTVariable* ctVariable: d->variable) {
for(CTVariable* ctVariable: d->variable)
ctVariable->apply();
}
d->initialTaskCount = d->task.size();
d->initialVariableCount = d->variable.size();
return CTSaveStatus();
}

2
crontablib/ctcron.h
View File

@ -43,7 +43,7 @@ public:
QString standardOutputFile;
CommandLineStatus execute(bool);
CommandLineStatus execute();
};
class CTCronPrivate {