squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-03 14:12:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sort languages combobox by language code

Browse Source 
* Avoid creating redundant file lists
* Sort languages combobox by language code

PR #20365.
This commit is contained in:
Chocobo1
2024-02-05 13:44:18 +08:00
committed by GitHub
parent 88a4990435
commit f87ea1b5d3
10 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/bittorrent/bencoderesumedatastorage.cpp
View File

@@ -105,7 +105,7 @@ BitTorrent::BencodeResumeDataStorage::BencodeResumeDataStorage(const Path &path,
}
const QRegularExpression filenamePattern {u"^([A-Fa-f0-9]{40})\\.fastresume$"_s};
const QStringList filenames = QDir(path.data()).entryList(QStringList(u"*.fastresume"_s), QDir::Files, QDir::Unsorted);
const QStringList filenames = QDir(path.data()).entryList({u"*.fastresume"_s}, QDir::Files);
m_registeredTorrents.reserve(filenames.size());
for (const QString &filename : filenames)

10
src/base/bittorrent/torrentcreator.cpp
View File

@@ -124,8 +124,8 @@ void TorrentCreator::run()
QDirIterator dirIter {m_params.inputPath.data(), (QDir::AllDirs | QDir::NoDotAndDotDot), QDirIterator::Subdirectories};
while (dirIter.hasNext())
{
dirIter.next();
dirs.append(dirIter.filePath());
const QString filePath = dirIter.next();
dirs.append(filePath);
}
std::sort(dirs.begin(), dirs.end(), naturalLessThan);
@@ -139,11 +139,11 @@ void TorrentCreator::run()
QDirIterator fileIter {dir, QDir::Files};
while (fileIter.hasNext())
{
fileIter.next();
const QFileInfo fileInfo = fileIter.nextFileInfo();
const auto relFilePath = parentPath.relativePathOf(Path(fileIter.filePath()));
const Path relFilePath = parentPath.relativePathOf(Path(fileInfo.filePath()));
tmpNames.append(relFilePath.toString());
fileSizeMap[tmpNames.last()] = fileIter.fileInfo().size();
fileSizeMap[tmpNames.last()] = fileInfo.size();
}
std::sort(tmpNames.begin(), tmpNames.end(), naturalLessThan);