2022-03-19 11:46:56 +00:00
|
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
/*
|
|
|
|
* PolyMC - Minecraft Launcher
|
|
|
|
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
2017-05-31 08:17:45 +01:00
|
|
|
*
|
2022-03-19 11:46:56 +00:00
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, version 3.
|
2017-05-31 08:17:45 +01:00
|
|
|
*
|
2022-03-19 11:46:56 +00:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2017-05-31 08:17:45 +01:00
|
|
|
*
|
2022-03-19 11:46:56 +00:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
* This file incorporates work covered by the following copyright and
|
|
|
|
* permission notice:
|
|
|
|
*
|
|
|
|
* Copyright 2013-2021 MultiMC Contributors
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
2017-05-31 08:17:45 +01:00
|
|
|
*/
|
2022-01-25 11:53:33 +00:00
|
|
|
|
2022-01-24 21:55:57 +00:00
|
|
|
#include <quazip/quazip.h>
|
|
|
|
#include <quazip/quazipdir.h>
|
|
|
|
#include <quazip/quazipfile.h>
|
2015-04-12 21:50:52 +01:00
|
|
|
#include "MMCZip.h"
|
2015-10-05 00:47:27 +01:00
|
|
|
#include "FileSystem.h"
|
2015-04-12 21:50:52 +01:00
|
|
|
|
2022-12-01 18:15:15 +00:00
|
|
|
#include <QCoreApplication>
|
2015-04-12 21:50:52 +01:00
|
|
|
#include <QDebug>
|
|
|
|
|
2017-05-31 08:17:45 +01:00
|
|
|
// ours
|
2022-01-20 19:40:56 +00:00
|
|
|
bool MMCZip::mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained, const FilterFunction filter)
|
2015-04-12 21:50:52 +01:00
|
|
|
{
|
2018-07-15 13:51:05 +01:00
|
|
|
QuaZip modZip(from.filePath());
|
|
|
|
modZip.open(QuaZip::mdUnzip);
|
|
|
|
|
|
|
|
QuaZipFile fileInsideMod(&modZip);
|
|
|
|
QuaZipFile zipOutFile(into);
|
|
|
|
for (bool more = modZip.goToFirstFile(); more; more = modZip.goToNextFile())
|
|
|
|
{
|
|
|
|
QString filename = modZip.getCurrentFileName();
|
|
|
|
if (filter && !filter(filename))
|
|
|
|
{
|
|
|
|
qDebug() << "Skipping file " << filename << " from "
|
|
|
|
<< from.fileName() << " - filtered";
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (contained.contains(filename))
|
|
|
|
{
|
|
|
|
qDebug() << "Skipping already contained file " << filename << " from "
|
|
|
|
<< from.fileName();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
contained.insert(filename);
|
|
|
|
|
|
|
|
if (!fileInsideMod.open(QIODevice::ReadOnly))
|
|
|
|
{
|
|
|
|
qCritical() << "Failed to open " << filename << " from " << from.fileName();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
QuaZipNewInfo info_out(fileInsideMod.getActualFileName());
|
|
|
|
|
|
|
|
if (!zipOutFile.open(QIODevice::WriteOnly, info_out))
|
|
|
|
{
|
|
|
|
qCritical() << "Failed to open " << filename << " in the jar";
|
|
|
|
fileInsideMod.close();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!JlCompress::copyData(fileInsideMod, zipOutFile))
|
|
|
|
{
|
|
|
|
zipOutFile.close();
|
|
|
|
fileInsideMod.close();
|
|
|
|
qCritical() << "Failed to copy data of " << filename << " into the jar";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
zipOutFile.close();
|
|
|
|
fileInsideMod.close();
|
|
|
|
}
|
|
|
|
return true;
|
2015-04-12 21:50:52 +01:00
|
|
|
}
|
|
|
|
|
2022-01-28 12:26:59 +00:00
|
|
|
bool MMCZip::compressDirFiles(QuaZip *zip, QString dir, QFileInfoList files)
|
|
|
|
{
|
|
|
|
QDir directory(dir);
|
|
|
|
if (!directory.exists()) return false;
|
|
|
|
|
|
|
|
for (auto e : files) {
|
|
|
|
auto filePath = directory.relativeFilePath(e.absoluteFilePath());
|
|
|
|
if( !JlCompress::compressFile(zip, e.absoluteFilePath(), filePath)) return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool MMCZip::compressDirFiles(QString fileCompressed, QString dir, QFileInfoList files)
|
|
|
|
{
|
|
|
|
QuaZip zip(fileCompressed);
|
|
|
|
QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
|
|
|
|
if(!zip.open(QuaZip::mdCreate)) {
|
|
|
|
QFile::remove(fileCompressed);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto result = compressDirFiles(&zip, dir, files);
|
|
|
|
|
|
|
|
zip.close();
|
|
|
|
if(zip.getZipError()!=0) {
|
|
|
|
QFile::remove(fileCompressed);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2022-01-24 22:02:06 +00:00
|
|
|
// ours
|
2022-06-26 18:17:15 +01:00
|
|
|
bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod*>& mods)
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
|
|
|
QuaZip zipOut(targetJarPath);
|
|
|
|
if (!zipOut.open(QuaZip::mdCreate))
|
|
|
|
{
|
|
|
|
QFile::remove(targetJarPath);
|
|
|
|
qCritical() << "Failed to open the minecraft.jar for modding";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// Files already added to the jar.
|
|
|
|
// These files will be skipped.
|
|
|
|
QSet<QString> addedFiles;
|
|
|
|
|
|
|
|
// Modify the jar
|
2022-07-23 18:21:28 +01:00
|
|
|
// This needs to be done in reverse-order to ensure we respect the loading order of components
|
|
|
|
for (auto i = mods.crbegin(); i != mods.crend(); i++)
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
2022-07-23 18:21:28 +01:00
|
|
|
const auto* mod = *i;
|
2022-01-24 22:02:06 +00:00
|
|
|
// do not merge disabled mods.
|
2022-06-26 18:17:15 +01:00
|
|
|
if (!mod->enabled())
|
2022-01-24 22:02:06 +00:00
|
|
|
continue;
|
2022-08-09 05:53:50 +01:00
|
|
|
if (mod->type() == ResourceType::ZIPFILE)
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
2022-06-26 18:17:15 +01:00
|
|
|
if (!mergeZipFiles(&zipOut, mod->fileinfo(), addedFiles))
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(targetJarPath);
|
2022-06-26 18:17:15 +01:00
|
|
|
qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
|
2022-01-24 22:02:06 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2022-08-09 05:53:50 +01:00
|
|
|
else if (mod->type() == ResourceType::SINGLEFILE)
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
|
|
|
// FIXME: buggy - does not work with addedFiles
|
2022-06-26 18:17:15 +01:00
|
|
|
auto filename = mod->fileinfo();
|
2022-01-24 22:02:06 +00:00
|
|
|
if (!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName()))
|
|
|
|
{
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(targetJarPath);
|
2022-06-26 18:17:15 +01:00
|
|
|
qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
|
2022-01-24 22:02:06 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
addedFiles.insert(filename.fileName());
|
|
|
|
}
|
2022-08-09 05:53:50 +01:00
|
|
|
else if (mod->type() == ResourceType::FOLDER)
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
2022-01-28 12:26:59 +00:00
|
|
|
// untested, but seems to be unused / not possible to reach
|
2022-01-24 22:02:06 +00:00
|
|
|
// FIXME: buggy - does not work with addedFiles
|
2022-06-26 18:17:15 +01:00
|
|
|
auto filename = mod->fileinfo();
|
2022-01-24 22:02:06 +00:00
|
|
|
QString what_to_zip = filename.absoluteFilePath();
|
|
|
|
QDir dir(what_to_zip);
|
|
|
|
dir.cdUp();
|
|
|
|
QString parent_dir = dir.absolutePath();
|
2022-01-28 12:26:59 +00:00
|
|
|
auto files = QFileInfoList();
|
|
|
|
MMCZip::collectFileListRecursively(what_to_zip, nullptr, &files, nullptr);
|
|
|
|
|
|
|
|
for (auto e : files) {
|
|
|
|
if (addedFiles.contains(e.filePath()))
|
|
|
|
files.removeAll(e);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!MMCZip::compressDirFiles(&zipOut, parent_dir, files))
|
2022-01-24 22:02:06 +00:00
|
|
|
{
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(targetJarPath);
|
2022-06-26 18:17:15 +01:00
|
|
|
qCritical() << "Failed to add" << mod->fileinfo().fileName() << "to the jar.";
|
2022-01-24 22:02:06 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
qDebug() << "Adding folder " << filename.fileName() << " from "
|
|
|
|
<< filename.absoluteFilePath();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Make sure we do not continue launching when something is missing or undefined...
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(targetJarPath);
|
2022-06-26 18:17:15 +01:00
|
|
|
qCritical() << "Failed to add unknown mod type" << mod->fileinfo().fileName() << "to the jar.";
|
2022-01-24 22:02:06 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mergeZipFiles(&zipOut, QFileInfo(sourceJarPath), addedFiles, [](const QString key){return !key.contains("META-INF");}))
|
|
|
|
{
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(targetJarPath);
|
|
|
|
qCritical() << "Failed to insert minecraft.jar contents.";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Recompress the jar
|
|
|
|
zipOut.close();
|
|
|
|
if (zipOut.getZipError() != 0)
|
|
|
|
{
|
|
|
|
QFile::remove(targetJarPath);
|
|
|
|
qCritical() << "Failed to finalize minecraft.jar!";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-05-31 08:17:45 +01:00
|
|
|
// ours
|
2022-12-01 18:15:15 +00:00
|
|
|
QString MMCZip::findFolderOfFileInZip(QuaZip* zip, const QString& what, const QStringList& ignore_paths, const QString& root)
|
2015-09-13 03:21:26 +01:00
|
|
|
{
|
2018-07-15 13:51:05 +01:00
|
|
|
QuaZipDir rootDir(zip, root);
|
2022-12-01 18:15:15 +00:00
|
|
|
for (auto&& fileName : rootDir.entryList(QDir::Files)) {
|
|
|
|
if (fileName == what)
|
2018-07-15 13:51:05 +01:00
|
|
|
return root;
|
2022-12-01 18:15:15 +00:00
|
|
|
|
|
|
|
QCoreApplication::processEvents();
|
2018-07-15 13:51:05 +01:00
|
|
|
}
|
2022-12-01 18:15:15 +00:00
|
|
|
|
|
|
|
// Recurse the search to non-ignored subfolders
|
|
|
|
for (auto&& fileName : rootDir.entryList(QDir::Dirs)) {
|
|
|
|
if (ignore_paths.contains(fileName))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
QString result = findFolderOfFileInZip(zip, what, ignore_paths, root + fileName);
|
|
|
|
if (!result.isEmpty())
|
2018-07-15 13:51:05 +01:00
|
|
|
return result;
|
|
|
|
}
|
2022-12-01 18:15:15 +00:00
|
|
|
|
|
|
|
return {};
|
2015-09-13 03:21:26 +01:00
|
|
|
}
|
|
|
|
|
2017-05-31 08:17:45 +01:00
|
|
|
// ours
|
2015-09-13 03:21:26 +01:00
|
|
|
bool MMCZip::findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root)
|
|
|
|
{
|
2018-07-15 13:51:05 +01:00
|
|
|
QuaZipDir rootDir(zip, root);
|
|
|
|
for(auto fileName: rootDir.entryList(QDir::Files))
|
|
|
|
{
|
|
|
|
if(fileName == what)
|
|
|
|
{
|
|
|
|
result.append(root);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(auto fileName: rootDir.entryList(QDir::Dirs))
|
|
|
|
{
|
|
|
|
findFilesInZip(zip, what, result, root + fileName);
|
|
|
|
}
|
|
|
|
return !result.isEmpty();
|
2015-09-13 03:21:26 +01:00
|
|
|
}
|
|
|
|
|
2017-05-31 08:17:45 +01:00
|
|
|
|
|
|
|
// ours
|
2022-07-20 13:21:44 +01:00
|
|
|
std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & subdir, const QString &target)
|
2015-09-13 03:21:26 +01:00
|
|
|
{
|
2023-02-24 23:08:29 +00:00
|
|
|
auto target_top_dir = QUrl::fromLocalFile(target);
|
2023-02-10 08:17:48 +00:00
|
|
|
|
2018-07-15 13:51:05 +01:00
|
|
|
QStringList extracted;
|
2021-02-09 04:04:23 +00:00
|
|
|
|
2018-07-15 13:51:05 +01:00
|
|
|
qDebug() << "Extracting subdir" << subdir << "from" << zip->getZipName() << "to" << target;
|
2021-02-09 04:04:23 +00:00
|
|
|
auto numEntries = zip->getEntriesCount();
|
|
|
|
if(numEntries < 0) {
|
|
|
|
qWarning() << "Failed to enumerate files in archive";
|
2022-07-20 13:21:44 +01:00
|
|
|
return std::nullopt;
|
2021-02-09 04:04:23 +00:00
|
|
|
}
|
|
|
|
else if(numEntries == 0) {
|
|
|
|
qDebug() << "Extracting empty archives seems odd...";
|
|
|
|
return extracted;
|
|
|
|
}
|
|
|
|
else if (!zip->goToFirstFile())
|
2018-07-15 13:51:05 +01:00
|
|
|
{
|
|
|
|
qWarning() << "Failed to seek to first file in zip";
|
2022-07-20 13:21:44 +01:00
|
|
|
return std::nullopt;
|
2018-07-15 13:51:05 +01:00
|
|
|
}
|
2021-02-09 04:04:23 +00:00
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
do {
|
|
|
|
QString file_name = zip->getCurrentFileName();
|
|
|
|
if (!file_name.startsWith(subdir))
|
2018-07-15 13:51:05 +01:00
|
|
|
continue;
|
2022-05-16 14:50:46 +01:00
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
auto relative_file_name = QDir::fromNativeSeparators(file_name.remove(0, subdir.size()));
|
|
|
|
auto original_name = relative_file_name;
|
2022-05-16 14:50:46 +01:00
|
|
|
|
2023-02-10 09:46:21 +00:00
|
|
|
// Fix subdirs/files ending with a / getting transformed into absolute paths
|
2023-02-24 23:08:29 +00:00
|
|
|
if (relative_file_name.startsWith('/'))
|
|
|
|
relative_file_name = relative_file_name.mid(1);
|
2023-02-10 09:46:21 +00:00
|
|
|
|
2022-05-16 14:50:46 +01:00
|
|
|
// Fix weird "folders with a single file get squashed" thing
|
2023-02-24 23:08:29 +00:00
|
|
|
QString sub_path;
|
|
|
|
if (relative_file_name.contains('/') && !relative_file_name.endsWith('/')) {
|
|
|
|
sub_path = relative_file_name.section('/', 0, -2) + '/';
|
|
|
|
FS::ensureFolderPathExists(FS::PathCombine(target, sub_path));
|
2022-05-16 14:50:46 +01:00
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
relative_file_name = relative_file_name.split('/').last();
|
2022-05-16 14:50:46 +01:00
|
|
|
}
|
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
QString target_file_path;
|
|
|
|
if (relative_file_name.isEmpty()) {
|
|
|
|
target_file_path = target + '/';
|
|
|
|
} else {
|
2023-03-05 11:24:56 +00:00
|
|
|
target_file_path = FS::PathCombine(target_top_dir.toLocalFile(), sub_path, relative_file_name);
|
2023-02-24 23:08:29 +00:00
|
|
|
if (relative_file_name.endsWith('/') && !target_file_path.endsWith('/'))
|
|
|
|
target_file_path += '/';
|
2023-02-10 08:17:48 +00:00
|
|
|
}
|
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
if (!target_top_dir.isParentOf(QUrl::fromLocalFile(target_file_path))) {
|
|
|
|
qWarning() << "Extracting" << relative_file_name << "was cancelled, because it was effectively outside of the target path" << target;
|
2023-02-10 08:17:48 +00:00
|
|
|
return std::nullopt;
|
2022-05-16 14:50:46 +01:00
|
|
|
}
|
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
if (!JlCompress::extractFile(zip, "", target_file_path)) {
|
|
|
|
qWarning() << "Failed to extract file" << original_name << "to" << target_file_path;
|
2018-07-15 13:51:05 +01:00
|
|
|
JlCompress::removeFile(extracted);
|
2022-07-20 13:21:44 +01:00
|
|
|
return std::nullopt;
|
2018-07-15 13:51:05 +01:00
|
|
|
}
|
2022-05-16 14:50:46 +01:00
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
extracted.append(target_file_path);
|
|
|
|
QFile::setPermissions(target_file_path, QFileDevice::Permission::ReadUser | QFileDevice::Permission::WriteUser | QFileDevice::Permission::ExeUser);
|
2022-05-16 14:50:46 +01:00
|
|
|
|
2023-02-24 23:08:29 +00:00
|
|
|
qDebug() << "Extracted file" << relative_file_name << "to" << target_file_path;
|
2018-07-15 13:51:05 +01:00
|
|
|
} while (zip->goToNextFile());
|
2023-02-24 23:08:29 +00:00
|
|
|
|
2018-07-15 13:51:05 +01:00
|
|
|
return extracted;
|
2015-09-13 03:21:26 +01:00
|
|
|
}
|
2017-05-25 00:24:27 +01:00
|
|
|
|
2020-08-24 23:13:43 +01:00
|
|
|
// ours
|
|
|
|
bool MMCZip::extractRelFile(QuaZip *zip, const QString &file, const QString &target)
|
|
|
|
{
|
|
|
|
return JlCompress::extractFile(zip, file, target);
|
|
|
|
}
|
|
|
|
|
2017-05-31 08:17:45 +01:00
|
|
|
// ours
|
2022-07-20 13:21:44 +01:00
|
|
|
std::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString dir)
|
2017-05-25 00:24:27 +01:00
|
|
|
{
|
2018-07-15 13:51:05 +01:00
|
|
|
QuaZip zip(fileCompressed);
|
|
|
|
if (!zip.open(QuaZip::mdUnzip))
|
|
|
|
{
|
2021-02-09 04:04:23 +00:00
|
|
|
// check if this is a minimum size empty zip file...
|
|
|
|
QFileInfo fileInfo(fileCompressed);
|
|
|
|
if(fileInfo.size() == 22) {
|
|
|
|
return QStringList();
|
|
|
|
}
|
|
|
|
qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();;
|
2022-07-20 13:21:44 +01:00
|
|
|
return std::nullopt;
|
2018-07-15 13:51:05 +01:00
|
|
|
}
|
|
|
|
return MMCZip::extractSubDir(&zip, "", dir);
|
2017-05-25 00:24:27 +01:00
|
|
|
}
|
2020-08-24 23:13:43 +01:00
|
|
|
|
|
|
|
// ours
|
2022-07-20 13:21:44 +01:00
|
|
|
std::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString subdir, QString dir)
|
2020-08-24 23:13:43 +01:00
|
|
|
{
|
|
|
|
QuaZip zip(fileCompressed);
|
|
|
|
if (!zip.open(QuaZip::mdUnzip))
|
|
|
|
{
|
2021-02-09 04:04:23 +00:00
|
|
|
// check if this is a minimum size empty zip file...
|
|
|
|
QFileInfo fileInfo(fileCompressed);
|
|
|
|
if(fileInfo.size() == 22) {
|
|
|
|
return QStringList();
|
|
|
|
}
|
|
|
|
qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();;
|
2022-07-20 13:21:44 +01:00
|
|
|
return std::nullopt;
|
2020-08-24 23:13:43 +01:00
|
|
|
}
|
|
|
|
return MMCZip::extractSubDir(&zip, subdir, dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
// ours
|
|
|
|
bool MMCZip::extractFile(QString fileCompressed, QString file, QString target)
|
|
|
|
{
|
|
|
|
QuaZip zip(fileCompressed);
|
|
|
|
if (!zip.open(QuaZip::mdUnzip))
|
|
|
|
{
|
2021-02-09 04:04:23 +00:00
|
|
|
// check if this is a minimum size empty zip file...
|
|
|
|
QFileInfo fileInfo(fileCompressed);
|
|
|
|
if(fileInfo.size() == 22) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();
|
|
|
|
return false;
|
2020-08-24 23:13:43 +01:00
|
|
|
}
|
|
|
|
return MMCZip::extractRelFile(&zip, file, target);
|
|
|
|
}
|
2022-01-28 11:37:22 +00:00
|
|
|
|
|
|
|
bool MMCZip::collectFileListRecursively(const QString& rootDir, const QString& subDir, QFileInfoList *files,
|
|
|
|
MMCZip::FilterFunction excludeFilter) {
|
|
|
|
QDir rootDirectory(rootDir);
|
|
|
|
if (!rootDirectory.exists()) return false;
|
|
|
|
|
|
|
|
QDir directory;
|
|
|
|
if (subDir == nullptr)
|
|
|
|
directory = rootDirectory;
|
|
|
|
else
|
|
|
|
directory = QDir(subDir);
|
|
|
|
|
|
|
|
if (!directory.exists()) return false; // shouldn't ever happen
|
|
|
|
|
|
|
|
// recurse directories
|
|
|
|
QFileInfoList entries = directory.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Hidden);
|
|
|
|
for (const auto& e: entries) {
|
|
|
|
if (!collectFileListRecursively(rootDir, e.filePath(), files, excludeFilter))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// collect files
|
|
|
|
entries = directory.entryInfoList(QDir::Files);
|
|
|
|
for (const auto& e: entries) {
|
|
|
|
QString relativeFilePath = rootDirectory.relativeFilePath(e.absoluteFilePath());
|
|
|
|
if (excludeFilter && excludeFilter(relativeFilePath)) {
|
|
|
|
qDebug() << "Skipping file " << relativeFilePath;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2022-05-02 20:34:55 +01:00
|
|
|
files->append(e); // we want the original paths for MMCZip::compressDirFiles
|
2022-01-28 11:37:22 +00:00
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|