Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-29 22:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix log sorting

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-04-28 10:28:57 +01:00
parent 111cdc240e
commit 20626e6606
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/minecraft/MinecraftInstance.cpp
View File

@ -1057,7 +1057,7 @@ MessageLevel::Enum MinecraftInstance::guessLevel(const QString& line, MessageLev
QStringList MinecraftInstance::getLogFileSearchPaths()
{
return { FS::PathCombine(gameRoot(), "logs"), FS::PathCombine(gameRoot(), "crash-reports"), gameRoot() };
return { FS::PathCombine(gameRoot(), "crash-reports"), FS::PathCombine(gameRoot(), "logs"), gameRoot() };
}
QString MinecraftInstance::getStatusbarDescription()

18
launcher/ui/pages/instance/OtherLogsPage.cpp
View File

@ -146,6 +146,7 @@ void OtherLogsPage::populateSelectLogBox()
ui->selectLogBox->setCurrentIndex(index);
ui->selectLogBox->blockSignals(false);
setControlsEnabled(true);
// don't refresh file
return;
} else {
setControlsEnabled(false);
@ -405,20 +406,17 @@ QStringList OtherLogsPage::getPaths()
QStringList result;
for (QString searchPath : m_logSearchPaths) {
QDirIterator iterator(searchPath, QDir::Files | QDir::Readable);
QDir searchDir(searchPath);
const bool isRoot = searchPath == m_basePath;
QStringList filters{ "*.log", "*.log.gz" };
while (iterator.hasNext()) {
const QString name = iterator.next();
if (searchPath != m_basePath)
filters.append("*.txt");
QString relativePath = baseDir.relativeFilePath(name);
QStringList entries = searchDir.entryList(filters, QDir::Files | QDir::Readable, QDir::SortFlag::Time);
if (!(name.endsWith(".log") || name.endsWith(".log.gz") || (!isRoot && name.endsWith(".txt"))))
continue;
result.append(relativePath);
}
for (const QString& name : entries)
result.append(baseDir.relativeFilePath(searchDir.filePath(name)));
}
return result;