liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5343 from Beep6581/thumbcache

Browse Source 
Change thumbnail cache eviction strategy
This commit is contained in:
Ingo Weyrich
2019-06-04 17:54:12 +02:00
committed by GitHub
parent 3c0b0ffd33 df65774667
commit 4ff41f7a2c
1 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
rtgui/cachemanager.cc
View File

@@ -16,18 +16,20 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "cachemanager.h"
#include <memory> #include <memory>
#include <iostream> #include <iostream>
#include <glib/gstdio.h> #include <dirent.h>
#include <giomm.h> #include <giomm.h>
#include <glib/gstdio.h>
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#include "cachemanager.h"
#include "guiutils.h" #include "guiutils.h"
#include "options.h" #include "options.h"
#include "procparamchangers.h" #include "procparamchangers.h"
@@ -340,66 +342,69 @@ Glib::ustring CacheManager::getCacheFileName (const Glib::ustring& subDir,
void CacheManager::applyCacheSizeLimitation () const void CacheManager::applyCacheSizeLimitation () const
{ {
// first count files without fetching file name and timestamp. // first count files without fetching file name and timestamp.
auto cachedir = opendir(Glib::build_filename(baseDir, "data").c_str());
if (!cachedir) {
return;
}
std::size_t numFiles = 0; std::size_t numFiles = 0;
try { while (readdir(cachedir)) {
++numFiles;
}
const auto dirName = Glib::build_filename (baseDir, "data"); closedir(cachedir);
const auto dir = Gio::File::create_for_path (dirName); if (numFiles > 2) {
numFiles -= 2; // because . and .. are counted
auto enumerator = dir->enumerate_children (""); }
while (numFiles <= options.maxCacheEntries && enumerator->next_file ()) {
++numFiles;
}
} catch (Glib::Exception&) {}
if (numFiles <= options.maxCacheEntries) { if (numFiles <= options.maxCacheEntries) {
return; return;
} }
using FNameMTime = std::pair<Glib::ustring, Glib::TimeVal>; using FNameMTime = std::pair<Glib::ustring, Glib::TimeVal>;
std::vector<FNameMTime> files; std::vector<FNameMTime> files;
files.reserve(numFiles);
constexpr std::size_t md5_size = 32;
// get filenames and timestamps
try { try {
const auto dir = Gio::File::create_for_path(Glib::build_filename(baseDir, "data"));
const auto enumerator = dir->enumerate_children("standard::name,time::modified");
const auto dirName = Glib::build_filename (baseDir, "data"); while (const auto file = enumerator->next_file()) {
const auto dir = Gio::File::create_for_path (dirName); const auto name = file->get_name();
if (name.size() >= md5_size + 5) {
auto enumerator = dir->enumerate_children ("standard::name,time::modified"); files.emplace_back(name, file->modification_time());
}
while (auto file = enumerator->next_file ()) {
files.emplace_back (file->get_name (), file->modification_time ());
} }
} catch (Glib::Exception&) {} } catch (Glib::Exception&) {}
if (files.size () <= options.maxCacheEntries) { if (files.size() <= options.maxCacheEntries) {
// limit not reached
return; return;
} }
std::sort (files.begin (), files.end (), [] (const FNameMTime& lhs, const FNameMTime& rhs) const std::size_t toDelete = files.size() - options.maxCacheEntries + options.maxCacheEntries * 5 / 100; // reserve 5% free cache space
{
return lhs.second < rhs.second;
});
auto cacheEntries = files.size (); std::nth_element(
files.begin(),
for (auto entry = files.begin (); cacheEntries-- > options.maxCacheEntries; ++entry) { files.begin() + toDelete,
files.end(),
const auto& name = entry->first; [](const FNameMTime& lhs, const FNameMTime& rhs) -> bool
{
constexpr auto md5_size = 32; return lhs.second < rhs.second;
const auto name_size = name.size();
if (name_size < md5_size + 5) {
continue;
} }
);
const auto fname = name.substr (0, name_size - md5_size - 5); for (std::vector<FNameMTime>::const_iterator entry = files.begin(), end = files.begin() + toDelete; entry != end; ++entry) {
const auto md5 = name.substr (name_size - md5_size - 4, md5_size); const auto& name = entry->first;
const auto name_size = name.size() - md5_size;
const auto fname = name.substr(0, name_size - 5);
const auto md5 = name.substr(name_size - 4, md5_size);
deleteFiles (fname, md5, true, false); deleteFiles(fname, md5, true, false);
} }
} }