pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix problem with copying of new adblock js

Browse source
This commit is contained in:
Martin Rotter 2021-12-22 14:21:21 +01:00
parent 0a42d50e54
commit b743c72a04
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/librssguard/miscellaneous/iofactory.cpp
View file

@ -93,13 +93,18 @@ bool IOFactory::startProcessDetached(const QString& program, const QStringList&
return process.startDetached(nullptr); return process.startDetached(nullptr);
} }
QString IOFactory::startProcessGetOutput(const QString& executable, const QStringList& arguments) { QString IOFactory::startProcessGetOutput(const QString& executable,
const QStringList& arguments,
const QProcessEnvironment& pe) {
QProcess proc; QProcess proc;
proc.setProgram(executable); proc.setProgram(executable);
proc.setArguments(arguments); proc.setArguments(arguments);
proc.setProcessEnvironment(QProcessEnvironment::systemEnvironment());
QProcessEnvironment system_pe = QProcessEnvironment::systemEnvironment();
system_pe.insert(pe);
proc.setProcessEnvironment(system_pe);
proc.start(); proc.start();
if (proc.waitForFinished() && if (proc.waitForFinished() &&
@ -142,6 +147,14 @@ void IOFactory::writeFile(const QString& file_path, const QByteArray& data) {
bool IOFactory::copyFile(const QString& source, const QString& destination) { bool IOFactory::copyFile(const QString& source, const QString& destination) {
if (QFile::exists(destination)) { if (QFile::exists(destination)) {
QFile file(destination);
file.setPermissions(file.permissions() |
QFileDevice::WriteOwner |
QFileDevice::WriteUser |
QFileDevice::WriteGroup |
QFileDevice::WriteOther);
if (!QFile::remove(destination)) { if (!QFile::remove(destination)) {
return false; return false;
} }

5
src/librssguard/miscellaneous/iofactory.h
View file

@ -7,6 +7,7 @@
#include "definitions/definitions.h" #include "definitions/definitions.h"
#include <QProcessEnvironment>
#include <QStandardPaths> #include <QStandardPaths>
class IOFactory { class IOFactory {
@ -31,7 +32,9 @@ class IOFactory {
const QStringList& arguments, const QStringList& arguments,
const QString& native_arguments = {}, const QString& native_arguments = {},
const QString& working_directory = {}); const QString& working_directory = {});
static QString startProcessGetOutput(const QString& executable, const QStringList& arguments = {}); static QString startProcessGetOutput(const QString& executable,
const QStringList& arguments = {},
const QProcessEnvironment& pe = {});
// Returns contents of a file. // Returns contents of a file.
// Throws exception when no such file exists. // Throws exception when no such file exists.