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

Updater now keeps "portable" settings throughout the update.

Browse source
This commit is contained in:
Martin Rotter 2014-04-13 11:30:38 +02:00
parent 1e548e9460
commit c904fb568e
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/updater/main.cpp
View file

@ -29,7 +29,9 @@
#include <limits> #include <limits>
bool removeDir(const QString & dirName, const QStringList &exception_file_list = QStringList()) { bool removeDir(const QString & dirName,
const QStringList &exception_file_list = QStringList(),
const QStringList &exception_folder_list = QStringList()) {
bool result = true; bool result = true;
QDir dir(dirName); QDir dir(dirName);
@ -37,8 +39,10 @@ bool removeDir(const QString & dirName, const QStringList &exception_file_list =
foreach (QFileInfo info, foreach (QFileInfo info,
dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst)) { dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst)) {
if (info.isDir()) { if (info.isDir()) {
if (!exception_folder_list.contains(info.fileName())) {
result &= removeDir(info.absoluteFilePath(), exception_file_list); result &= removeDir(info.absoluteFilePath(), exception_file_list);
} }
}
else if (!exception_file_list.contains(info.fileName())) { else if (!exception_file_list.contains(info.fileName())) {
result &= QFile::remove(info.absoluteFilePath()); result &= QFile::remove(info.absoluteFilePath());
} }
@ -166,7 +170,9 @@ int main(int argc, char *argv[]) {
qDebug("Old temporary files removed."); qDebug("Old temporary files removed.");
if (!removeDir(rssguard_path, QStringList() << extractor)) { if (!removeDir(rssguard_path,
QStringList() << extractor,
QStringList() << "data")) {
qDebug("Full cleanup of actual RSS Guard installation failed."); qDebug("Full cleanup of actual RSS Guard installation failed.");
qDebug("Some files from old installation may persist."); qDebug("Some files from old installation may persist.");
} }