diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-09-04 08:17:25 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-09-04 08:17:25 +0200 |
| commit | d80382180ef14d814eb9f6d7f2bf5db362f25cc2 (patch) | |
| tree | 824dae31e08a961be3b1f0bf0129419ccbbef9b2 /api/logic/MMCZip.cpp | |
| parent | b8adbb9b73751b022b42180dcc213dc99be9765b (diff) | |
| download | MultiMC-d80382180ef14d814eb9f6d7f2bf5db362f25cc2.tar MultiMC-d80382180ef14d814eb9f6d7f2bf5db362f25cc2.tar.gz MultiMC-d80382180ef14d814eb9f6d7f2bf5db362f25cc2.tar.lz MultiMC-d80382180ef14d814eb9f6d7f2bf5db362f25cc2.tar.xz MultiMC-d80382180ef14d814eb9f6d7f2bf5db362f25cc2.zip | |
NOISSUE refactor pack import (extraction and paths)
It now:
* Doesn't extract until it knows the content format is good.
* Extracts in a predictable location, not requiring to use a second path for the actual pack root.
Diffstat (limited to 'api/logic/MMCZip.cpp')
| -rw-r--r-- | api/logic/MMCZip.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/MMCZip.cpp b/api/logic/MMCZip.cpp index 3badbbd1..fa42436f 100644 --- a/api/logic/MMCZip.cpp +++ b/api/logic/MMCZip.cpp @@ -168,7 +168,7 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const } // ours -QString MMCZip::findFileInZip(QuaZip * zip, const QString & what, const QString &root) +QString MMCZip::findFolderOfFileInZip(QuaZip * zip, const QString & what, const QString &root) { QuaZipDir rootDir(zip, root); for(auto fileName: rootDir.entryList(QDir::Files)) @@ -178,7 +178,7 @@ QString MMCZip::findFileInZip(QuaZip * zip, const QString & what, const QString } for(auto fileName: rootDir.entryList(QDir::Dirs)) { - QString result = findFileInZip(zip, what, root + fileName); + QString result = findFolderOfFileInZip(zip, what, root + fileName); if(!result.isEmpty()) { return result; |