Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source 
Fix formatting and fix a typo in the return code check

Signed-off-by: Soup <43444191+Soup-64@users.noreply.github.com>
This commit is contained in:
Soup
2025-04-06 15:27:49 -04:00
committed by Soup of the tomato kind
parent b9a1fa3645
commit 0c90530f88
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/net/HttpMetaCache.cpp
View File

@ -166,9 +166,10 @@ auto HttpMetaCache::evictEntry(MetaEntryPtr entry) -> bool
return true; return true;
} }
bool HttpMetaCache::evictAll() //returns true on success, false otherwise
auto HttpMetaCache::evictAll() -> bool
{ {
bool ret; bool ret = true;
for (QString& base : m_entries.keys()) { for (QString& base : m_entries.keys()) {
EntryMap& map = m_entries[base]; EntryMap& map = m_entries[base];
qCDebug(taskHttpMetaCacheLogC) << "Evicting base" << base; qCDebug(taskHttpMetaCacheLogC) << "Evicting base" << base;
@ -177,7 +178,8 @@ bool HttpMetaCache::evictAll()
qCWarning(taskHttpMetaCacheLogC) << "Unexpected missing cache entry" << entry->m_basePath; qCWarning(taskHttpMetaCacheLogC) << "Unexpected missing cache entry" << entry->m_basePath;
} }
map.entry_list.clear(); map.entry_list.clear();
ret = FS::deletePath(map.base_path); //AND all return codes together so the result is true iff all runs of deletePath() are true
ret &= FS::deletePath(map.base_path);
} }
return ret; return ret;
} }

2
launcher/net/HttpMetaCache.h
View File

@ -113,7 +113,7 @@ class HttpMetaCache : public QObject {
// evict selected entry from cache // evict selected entry from cache
auto evictEntry(MetaEntryPtr entry) -> bool; auto evictEntry(MetaEntryPtr entry) -> bool;
bool evictAll(); auto evictAll() -> bool;
void addBase(QString base, QString base_root); void addBase(QString base, QString base_root);

9
launcher/ui/MainWindow.cpp
View File

@ -1318,8 +1318,13 @@ void MainWindow::on_actionReportBug_triggered()
void MainWindow::on_actionClearMetadata_triggered() void MainWindow::on_actionClearMetadata_triggered()
{ {
if(!APPLICATION->metacache()->evictAll()){ //This if contains side effects!
CustomMessageBox::selectable(this, tr("Error"), tr("Metadata cache clear Failed!\n To clear the metadata cache manually, press Folders -> View Launcher Root Folder, and after closing the launcher delete the folder named \"meta\"\n"), QMessageBox::Warning)->show(); if (!APPLICATION->metacache()->evictAll()) {
CustomMessageBox::selectable(this, tr("Error"),
tr("Metadata cache clear Failed!\nTo clear the metadata cache manually, press Folders -> View "
"Launcher Root Folder, and after closing the launcher delete the folder named \"meta\"\n"),
QMessageBox::Warning)
->show();
} }
APPLICATION->metacache()->SaveNow(); APPLICATION->metacache()->SaveNow();