arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-07 02:45:51 +00:00
Code Issues Projects Releases Wiki Activity

fix #60

Browse Source 
some hash improvements
This commit is contained in:
arcan1s
2015-08-06 01:23:43 +03:00
parent e38863ebc2
commit 08cb7d9abe
13 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/awesomewidgets/extscript.cpp
View File

@ -44,7 +44,7 @@ ExtScript::ExtScript(QWidget *parent, const QString scriptName,
ui->setupUi(this);
translate();
value[QString("value")] = QString("");
value[tag(QString("custom"))] = QString("");
process = new QProcess(this);
connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(updateValue()));
@ -295,15 +295,14 @@ void ExtScript::readJsonFilters()
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
if (debug) qDebug() << PDEBUG << ":" << "Json parse error" << error.errorString();
if (error.error != QJsonParseError::NoError)
return;
if (error.error != QJsonParseError::NoError) return;
jsonFilters = jsonDoc.toVariant().toMap();
if (debug) qDebug() << PDEBUG << ":" << "Filters" << jsonFilters;
}
QVariantMap ExtScript::run()
QVariantHash ExtScript::run()
{
if (debug) qDebug() << PDEBUG;
if (!isActive()) return value;
@ -391,6 +390,7 @@ void ExtScript::updateValue()
QString qdebug = QTextCodec::codecForMib(106)->toUnicode(process->readAllStandardError()).trimmed();
if (debug) qDebug() << PDEBUG << ":" << "Error" << qdebug;
QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process->readAllStandardOutput()).trimmed();
QString strValue;
switch (m_redirect) {
case stdout2stderr:
@ -398,17 +398,17 @@ void ExtScript::updateValue()
if (debug) qDebug() << PDEBUG << ":" << "Output" << qoutput;
break;
case stderr2stdout:
value[QString("value")] = QString("%1\n%2").arg(qdebug).arg(qoutput);
strValue = QString("%1\n%2").arg(qdebug).arg(qoutput);
break;
case nothing:
default:
if (debug) qDebug() << PDEBUG << ":" << "Debug" << qdebug;
value[QString("value")] = qoutput;
strValue = qoutput;
break;
}
// filters
value[QString("value")] = applyFilters(value[QString("value")].toString());
value[tag(QString("custom"))] = applyFilters(strValue);
}