GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

save for weekend

Browse Source
This commit is contained in:
Gerhard Hoffmann
2025-01-10 14:19:43 +01:00
parent 8f822c5383
commit f1aad81a0c
4 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
UpdatePTUDevCtrl/utils.cpp
View File

@@ -1,12 +1,14 @@
#include "utils.h"
#include "message_handler.h"
#include "git/git_client.h"
#include "worker.h"
#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
#include "unistd.h"
#endif
#include <QObject>
#include <QFile>
#include <QTextStream>
#include <QDebug>
@@ -23,7 +25,7 @@
#include <fstream>
QVector<QPair<QString, QString>> Utils::installedJsonFiles(QDir const &customerDir) {
QVector<QPair<QString, QString>> Utils::installedJsonFiles(Worker const *worker, QDir const &customerDir) {
QVector<QPair<QString, QString>> vec;
QStringList fileList;
@@ -47,12 +49,26 @@ QVector<QPair<QString, QString>> Utils::installedJsonFiles(QDir const &customerD
for (int i = 0; i < fileList.size(); ++i) {
QProcess p;
// connect(&p, SIGNAL(finished(int,QProcess::ExitStatus)), , SLOT(finished(int,QProcess::ExitStatus)));
QStringList params;
params << "-c" << "git log -n 1 --pretty=format:%H -- " << fileList[i];
//QObject::connect(&p, SIGNAL(readyReadStandardOutput()),
// worker, SLOT(Worker::readyReadStandardOutput()), Qt::DirectConnection);
p.start("bash", params);
p.waitForReadyRead();
p.write("exit");
p.waitForFinished();
QString r = p.readAllStandardOutput().left(8);
QString r = p.readAll().left(8);
//QObject::disconnect(&p, SIGNAL(readyReadStandardOutput()), worker, SLOT(Worker::readyReadStandardError()));
qCritical() << QDir::current().absolutePath()
<< "JS git log -n 1 --pretty=format:%H -- " << fileList[i] << r;
vec.push_back(QPair<QString, QString>(QFileInfo(fileList[i]).fileName(), r));
}
@@ -66,7 +82,7 @@ QVector<QPair<QString, QString>> Utils::installedJsonFiles(QDir const &customerD
return vec;
}
QVector<QPair<QString, QString>> Utils::installedTariffFiles(QDir const &customerDir) {
QVector<QPair<QString, QString>> Utils::installedTariffFiles(Worker const *worker, QDir const &customerDir) {
QVector<QPair<QString, QString>> vec;
QStringList fileList;
@@ -93,11 +109,19 @@ QVector<QPair<QString, QString>> Utils::installedTariffFiles(QDir const &custome
QStringList params;
params << "-c" << "git log -n 1 --pretty=format:%H -- " << fileList[i];
qCritical() << current << "git log -n 1 --pretty=format:%H -- " << fileList[i];
//QObject::connect(&p, SIGNAL(readyReadStandardOutput()),
// worker, SLOT(Worker::readyReadStandardOutput()), Qt::DirectConnection);
p.start("bash", params);
p.waitForReadyRead();
p.write("exit");
p.waitForFinished();
QString r = p.readAllStandardOutput().left(8);
QString r = p.readAll().left(8);
// QObject::disconnect(&p, SIGNAL(readyReadStandardOutput()), worker, SLOT(Worker::readyReadStandardError()));
qCritical() << QDir::current().absolutePath()
<< "git log -n 1 --pretty=format:%H -- " << fileList[i] << r;
vec.push_back(QPair<QString, QString>(QFileInfo(fileList[i]).fileName(), r));
}
@@ -113,7 +137,7 @@ QVector<QPair<QString, QString>> Utils::installedTariffFiles(QDir const &custome
QVector<QPair<QString, QString>> Utils::installedPackages() {
QVector<QPair<QString, QString>> vec;
if (QFile::exists("/usr/bin/ptuPackageVersions")) {
if (QFile::exists("/usr/bin/")) {
QProcess p;
QStringList params;
params << "-c" << R"(/usr/bin/ptuPackageVersions -i -o json)";