Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear case sensitive cache as well on vpath cache flush

Browse Source
This commit is contained in:
oldmud0 2021-06-08 23:11:28 -05:00
parent 2cb7ca7895
commit 2f50cd5528
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aoapplication.h
View File

@ -554,6 +554,8 @@ private:
QVector<server_type> server_list; QVector<server_type> server_list;
QVector<server_type> favorite_list; QVector<server_type> favorite_list;
QHash<uint, QString> asset_lookup_cache; QHash<uint, QString> asset_lookup_cache;
QHash<uint, QString> dir_listing_cache;
QSet<uint> dir_listing_exist_cache;
private slots: private slots:
void ms_connect_finished(bool connected, bool will_retry); void ms_connect_finished(bool connected, bool will_retry);

12
src/path_functions.cpp
View File

@ -206,17 +206,15 @@ QString AOApplication::get_case_sensitive_path(QString p_file)
return file_parent_dir + "/" + file_basename; return file_parent_dir + "/" + file_basename;
// last resort, dirlist parent dir and find case insensitive match // last resort, dirlist parent dir and find case insensitive match
static QHash<uint, QString> listing_cache;
static QHash<uint, bool> listing_exist_cache;
if (!listing_exist_cache.contains(qHash(file_parent_dir))) { if (!dir_listing_exist_cache.contains(qHash(file_parent_dir))) {
QStringList files = QDir(file_parent_dir).entryList(); QStringList files = QDir(file_parent_dir).entryList();
for (const QString &file : files) { for (const QString &file : files) {
listing_cache.insert(qHash(file_parent_dir % QChar('/') % file.toLower()), file); dir_listing_cache.insert(qHash(file_parent_dir % QChar('/') % file.toLower()), file);
} }
listing_exist_cache.insert(qHash(file_parent_dir), true); dir_listing_exist_cache.insert(qHash(file_parent_dir));
} }
QString found_file = listing_cache.value( QString found_file = dir_listing_cache.value(
qHash(file_parent_dir % QChar('/') % file_basename.toLower())); qHash(file_parent_dir % QChar('/') % file_basename.toLower()));
if (!found_file.isEmpty()) { if (!found_file.isEmpty()) {
@ -295,4 +293,6 @@ QString AOApplication::get_real_suffixed_path(const VPath &vpath,
void AOApplication::invalidate_lookup_cache() { void AOApplication::invalidate_lookup_cache() {
asset_lookup_cache.clear(); asset_lookup_cache.clear();
dir_listing_cache.clear();
dir_listing_exist_cache.clear();
} }