alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

actually delete old theme caches

Browse Source 
Summary:
QStandardPaths doesn't do file search by wildcards,
that code was never actually functional

Test Plan: old kcache and rects cache files get correctly removed

Reviewers: #plasma, sitter

Reviewed By: sitter

Subscribers: davidedmundson, sitter, apol, plasma-devel, #frameworks

Tags: #plasma, #frameworks

Differential Revision: https://phabricator.kde.org/D4925
This commit is contained in:
Marco Martin 2017-03-07 13:52:23 +01:00
parent 94a6a168cf
commit bbcb217b48
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plasma/private/theme_p.cpp
View File

@ -27,6 +27,7 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QFontDatabase> #include <QFontDatabase>
#include <QDir>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kwindoweffects.h> #include <kwindoweffects.h>
@ -212,11 +213,15 @@ bool ThemePrivate::useCache()
} }
} }
// now we check for, and remove if necessary, old caches // now we check for, and remove if necessary, old caches
foreach (const QString &file, QStandardPaths::locateAll(QStandardPaths::GenericCacheLocation, cacheFileBase)) { QDir cacheDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
cacheDir.setNameFilters(QStringList({cacheFileBase}));
for (const QFileInfo &file : cacheDir.entryInfoList()) {
if (currentCacheFileName.isEmpty() || if (currentCacheFileName.isEmpty() ||
!file.endsWith(currentCacheFileName)) { !file.absoluteFilePath().endsWith(currentCacheFileName)) {
QFile::remove(file); QFile::remove(file.absoluteFilePath());
} }
} }
@ -259,9 +264,12 @@ bool ThemePrivate::useCache()
} }
// now we check for (and remove) old caches // now we check for (and remove) old caches
foreach (const QString &file, QStandardPaths::locateAll(QStandardPaths::GenericCacheLocation, svgElementsFileNameBase + QLatin1Char('*'))) { QDir cacheDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
if (cachesTooOld || !file.endsWith(svgElementsFileName)) { cacheDir.setNameFilters(QStringList({svgElementsFileNameBase + QLatin1Char('*')}));
QFile::remove(file);
for (const QFileInfo &file : cacheDir.entryInfoList()) {
if (!file.absoluteFilePath().endsWith(svgElementsFileName)) {
QFile::remove(file.absoluteFilePath());
} }
} }