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

forward port the cache file versioning so it drops properly in all cases

Browse Source
This commit is contained in:
Aaron Seigo 2013-06-05 15:58:51 +02:00
parent a1fec8dba8
commit 57fc52b385
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,16 +124,36 @@ bool ThemePrivate::useCache()
ThemeConfig config; ThemeConfig config;
cacheSize = config.themeCacheKb(); cacheSize = config.themeCacheKb();
} }
pixmapCache = new KImageCache("plasma_theme_" + themeName, cacheSize * 1024); const bool isRegularTheme = themeName != systemColorsTheme;
if (themeName != systemColorsTheme) { QString cacheFile = "plasma_theme_" + themeName;
//check for expired cache
if (isRegularTheme) {
const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "desktoptheme/" + themeName + "/metadata.desktop");
const KPluginInfo pluginInfo(path);
// now we check for, and remove if necessary, old caches
QString cacheFileBase = cacheFile + "*.kcache";
cacheFile += "_v" + pluginInfo.version();
const QString currentCacheFileName = cacheFile + ".kcache";
foreach (const QString &file, QStandardPaths::locateAll(QStandardPaths::CacheLocation, cacheFileBase)) {
if (!file.endsWith(currentCacheFileName)) {
QFile::remove(file);
}
}
}
pixmapCache = new KImageCache(cacheFile, cacheSize * 1024);
// now we do a sanity check: if the metadata.desktop file is newer than the cache, drop
// the cache
if (isRegularTheme) {
// FIXME: when using the system colors, if they change while the application is not running // FIXME: when using the system colors, if they change while the application is not running
// the cache should be dropped; we need a way to detect system color change when the // the cache should be dropped; we need a way to detect system color change when the
// application is not running. // application is not running.
QFile f(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "desktoptheme/" + themeName + "/metadata.desktop")); const QFile f(cacheFile);
QFileInfo info(f); const QFileInfo fileInfo(f);
if (info.lastModified().toTime_t() > uint(pixmapCache->lastModifiedTime())) { if (fileInfo.lastModified().toTime_t() > uint(pixmapCache->lastModifiedTime())) {
pixmapCache->clear(); discardCache(PixmapCache | SvgElementsCache);
} }
} }
} }