mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Eliminate a pointless multimap in the cache cleaner

Browse source
This commit is contained in:
Thomas Goyne 2014-07-17 15:46:27 -07:00
parent 51b92390b6
commit 77ecff1cba
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/utils.cpp
View file

@ -165,10 +165,11 @@ void CleanCache(agi::fs::path const& directory, std::string const& file_type, ui
queue->Async([=]{ queue->Async([=]{
LOG_D("utils/clean_cache") << "cleaning " << directory/file_type; LOG_D("utils/clean_cache") << "cleaning " << directory/file_type;
uint64_t total_size = 0; uint64_t total_size = 0;
std::multimap<int64_t, agi::fs::path> cachefiles; using cache_item = std::pair<int64_t, agi::fs::path>;
std::vector<cache_item> cachefiles;
for (auto const& file : agi::fs::DirectoryIterator(directory, file_type)) { for (auto const& file : agi::fs::DirectoryIterator(directory, file_type)) {
agi::fs::path path = directory/file; agi::fs::path path = directory/file;
cachefiles.insert({agi::fs::ModifiedTime(path), path}); cachefiles.push_back({agi::fs::ModifiedTime(path), path});
total_size += agi::fs::Size(path); total_size += agi::fs::Size(path);
} }
@ -178,6 +179,10 @@ void CleanCache(agi::fs::path const& directory, std::string const& file_type, ui
return; return;
} }
sort(begin(cachefiles), end(cachefiles), [](cache_item const& a, cache_item const& b) {
return a.first < b.first;
});
int deleted = 0; int deleted = 0;
for (auto const& i : cachefiles) { for (auto const& i : cachefiles) {
// stop cleaning? // stop cleaning?