arcanis/queued
1
0
Fork 0
mirror of https://github.com/arcan1s/queued.git synced 2025-07-16 07:09:56 +00:00
Code Issues Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Evgenii Alekseev
2017-09-14 23:21:44 +03:00
parent cdb05844ae
commit 49299af761
35 changed files with 131 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/queuedctl/src/QueuedctlCommon.cpp
View File

@ -210,7 +210,7 @@ QueuedctlCommon::process(QCommandLineParser &_parser, const QString &_cache,
qCDebug(LOG_APP) << "Process command with args"
<< "using auth" << _cache << _user;
QueuedctlResult result;
auto result = QueuedctlResult();
QStringList args = _parser.positionalArguments();
QString command = args.isEmpty() ? QString() : args.first();
@ -316,10 +316,10 @@ QueuedctlCommon::process(QCommandLineParser &_parser, const QString &_cache,
case QueuedctlArgument::TaskAdd: {
QString token = QueuedctlAuth::getToken(_cache, _user);
auto definitions = QueuedctlTask::getDefinitions(_parser, false);
long long id = QueuedctlTask::addTask(definitions, token);
result.status = (id > 0);
long long taskId = QueuedctlTask::addTask(definitions, token);
result.status = (taskId > 0);
if (result.status)
result.output = QString("Task %1 added").arg(id);
result.output = QString("Task %1 added").arg(taskId);
else
result.output = QString("Could not add task");
break;
@ -360,10 +360,10 @@ QueuedctlCommon::process(QCommandLineParser &_parser, const QString &_cache,
case QueuedctlArgument::UserAdd: {
QString token = QueuedctlAuth::getToken(_cache, _user);
auto definitions = QueuedctlUser::getDefinitions(_parser, false);
long long id = QueuedctlUser::addUser(definitions, token);
result.status = (id > 0);
long long userId = QueuedctlUser::addUser(definitions, token);
result.status = (userId > 0);
if (result.status)
result.output = QString("User %1 added").arg(id);
result.output = QString("User %1 added").arg(userId);
else
result.output = QString("Could not add user");
break;

15
sources/queuedctl/src/QueuedctlPermissions.cpp
View File

@ -27,11 +27,8 @@ bool QueuedctlPermissions::addPermission(const long long _id,
auto permission = QueuedEnums::stringToPermission(_permission);
if (permission != QueuedEnums::Permission::Invalid)
return QueuedCoreAdaptor::sendUserPermissionAdd(_id, permission,
_token);
else
return false;
return (permission != QueuedEnums::Permission::Invalid)
&& QueuedCoreAdaptor::sendUserPermissionAdd(_id, permission, _token);
}
@ -43,11 +40,9 @@ bool QueuedctlPermissions::removePermission(const long long _id,
auto permission = QueuedEnums::stringToPermission(_permission);
if (permission != QueuedEnums::Permission::Invalid)
return QueuedCoreAdaptor::sendUserPermissionRemove(_id, permission,
_token);
else
return false;
return (permission != QueuedEnums::Permission::Invalid)
&& QueuedCoreAdaptor::sendUserPermissionRemove(_id, permission,
_token);
}

2
sources/queuedctl/src/QueuedctlTask.cpp
View File

@ -20,8 +20,6 @@
#include <queued/Queued.h>
#include "QueuedctlUser.h"
extern "C" {
#include <unistd.h>
}

2
sources/queuedctl/src/QueuedctlUser.cpp
View File

@ -93,7 +93,7 @@ QueuedctlUser::getDefinitions(const QCommandLineParser &_parser,
QString QueuedctlUser::getPassword()
{
// do not show input characters
struct termios tty;
auto tty = termios();
::tcgetattr(STDIN_FILENO, &tty);
tty.c_lflag &= ~ECHO;
tcsetattr(STDIN_FILENO, TCSANOW, &tty);

1
sources/queuedctl/src/main.cpp
View File

@ -15,7 +15,6 @@
#include <QCommandLineParser>
#include <QCoreApplication>
#include <queued/Queued.h>