Skip to content

Commit 848b634

Browse files
gui: bump sourcepp to fix vulnerability, add APK support and some other things
1 parent 0865ee0 commit 848b634

11 files changed

Lines changed: 259 additions & 370 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ macOS (arm64), and has been packaged for multiple Linux distributions.
3333
| Format | Description | Create | Read | Write |
3434
|----------|---------------------------------------------------|:------:|:----:|:-----:|
3535
| 007 | Asset pack (007 - Nightfire) | ❌ | ✅ | ❌ |
36+
| APK | Axiom PacK file (Fairy Tale Busters) | ✅ | ✅ | ✅ |
3637
| BEE_PACK | BEE2.4 Package | ✅ | ✅ | ✅ |
3738
| BMZ | Bonus Map Zip (Source Engine) | ✅ | ✅ | ✅ |
3839
| BSP | Source 1 Map | N/A | ✅ | ✅ |

‎ext/shared/sourcepp‎

Submodule sourcepp updated 142 files

‎src/cli/Main.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ namespace {
8686
/// Right now, just used for getting a decryption key
8787
[[nodiscard]] PackFile::OpenPropertyRequest getOpenPropertyRequestor(const argparse::ArgumentParser& cli) {
8888
return [&cli](PackFile* packFile, PackFile::OpenProperty property) -> std::vector<std::byte> {
89-
if (packFile->getGUID() == GCF::GUID && property == PackFile::OpenProperty::DECRYPTION_KEY) {
89+
if (const auto* gcf = dynamic_cast<GCF*>(packFile); gcf && property == PackFile::OpenProperty::DECRYPTION_KEY) {
9090
std::string hex;
9191
if (cli.is_used(ARG_L(DECRYPTION_KEY))) {
9292
hex = cli.get(ARG_L(DECRYPTION_KEY));
9393
} else {
94-
std::cout << "Decryption key for depot ID " << dynamic_cast<GCF*>(packFile)->getAppID() << ": ";
94+
std::cout << "Decryption key for depot ID " << gcf->getAppID() << ": ";
9595
std::getline(std::cin, hex);
9696
}
9797
auto bytes = sourcepp::crypto::decodeHexString(hex);
@@ -386,7 +386,9 @@ void pack(const argparse::ArgumentParser& cli, std::string inputPath) {
386386
}
387387

388388
std::unique_ptr<PackFile> packFile;
389-
if (type == "bmz" || type == "zip") {
389+
if (type == "apk") {
390+
packFile = APK::create(outputPath);
391+
} else if (type == "bmz" || type == "zip") {
390392
packFile = ZIP::create(outputPath);
391393
} else if (type == "fgp") {
392394
packFile = FGP::create(outputPath);
@@ -528,7 +530,7 @@ int main(int argc, const char* const* argv) {
528530
cli.add_argument(ARG_P(TYPE))
529531
.help("(Pack) The type of the output pack file.")
530532
.default_value("vpk")
531-
.choices("bmz", "fgp", "fpx", "pak", "pck", "vpk_vtmb", "vpk", "wad3", "zip")
533+
.choices("apk", "bmz", "fgp", "fpx", "pak", "pck", "vpk_vtmb", "vpk", "wad3", "zip")
532534
.nargs(1);
533535

534536
cli.add_argument(ARG_L(NO_PROGRESS))

‎src/gui/Window.cpp‎

Lines changed: 94 additions & 293 deletions
Large diffs are not rendered by default.

‎src/gui/Window.h‎

Lines changed: 119 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,152 @@
33
#include <functional>
44
#include <vector>
55

6-
#include <QDir>
6+
#include <QFileDialog>
7+
#include <QLabel>
78
#include <QMainWindow>
9+
#include <QProgressBar>
10+
#include <QStatusBar>
11+
#include <QThread>
812
#include <vpkpp/vpkpp.h>
913

1014
#include "dialogs/PackFileOptionsDialog.h"
1115
#include "plugins/previews/IVPKEditPreviewPlugin.h"
1216

1317
class QAction;
1418
class QJsonObject;
15-
class QLabel;
1619
class QLineEdit;
1720
class QMenu;
1821
class QNetworkAccessManager;
1922
class QNetworkReply;
20-
class QProgressBar;
2123
class QSettings;
22-
class QThread;
2324

2425
struct EntryContextMenuData;
2526
class EntryTree;
2627
class FileViewer;
2728

28-
class Window : public QMainWindow {
29+
class IndeterminateProgressWorker : public QObject {
2930
Q_OBJECT;
3031

31-
friend class SavePackFileWorker;
32-
friend class ExtractPackFileWorker;
33-
3432
public:
35-
explicit Window(QWidget* parent = nullptr);
36-
37-
void newPackFile(std::string_view typeGUID, bool fromDirectory, const QString& startPath, const QString& name, const QString& extension);
38-
39-
void newBMZ(bool fromDirectory, const QString& startPath = QString());
40-
41-
void newFGP(bool fromDirectory, const QString& startPath = QString());
42-
43-
void newFPX(bool fromDirectory, const QString& startPath = QString());
33+
IndeterminateProgressWorker() = default;
4434

45-
void newPAK(bool fromDirectory, const QString& startPath = QString());
35+
void run(const std::function<void()>& fn);
4636

47-
void newPCK(bool fromDirectory, const QString& startPath = QString());
37+
signals:
38+
void taskFinished();
39+
};
4840

49-
void newVPK(bool fromDirectory, const QString& startPath = QString());
41+
class Window : public QMainWindow {
42+
Q_OBJECT;
5043

51-
void newVPK_VTMB(bool fromDirectory, const QString& startPath = QString());
44+
friend class SavePackFileWorker;
45+
friend class ExtractPackFileWorker;
5246

53-
void newWAD3(bool fromDirectory, const QString& startPath = QString());
47+
public:
48+
explicit Window(QWidget* parent = nullptr);
5449

55-
void newZIP(bool fromDirectory, const QString& startPath = QString());
50+
template<typename T>
51+
requires requires { {T::create("")} -> std::same_as<std::unique_ptr<vpkpp::PackFile>>; }
52+
void newPackFile(bool fromDirectory, const QString& startPath, const QString& name, std::string_view extension, PackFileOptionsShowForTypeFlags flags = PackFileOptionsShowForTypeFlags::ORDINARY) {
53+
if (this->isWindowModified() && this->promptUserToKeepModifications()) {
54+
return;
55+
}
56+
57+
auto options = PackFileOptionsDialog::getForNew(flags, fromDirectory, this);
58+
if (!options) {
59+
return;
60+
}
61+
62+
auto dirPath = fromDirectory ? QFileDialog::getExistingDirectory(this, QObject::tr("Use This Folder"), startPath) : "";
63+
if (fromDirectory && dirPath.isEmpty()) {
64+
return;
65+
}
66+
67+
QString saveFilePath;
68+
if (fromDirectory) {
69+
saveFilePath = std::filesystem::path{dirPath.toLocal8Bit().constData()}.parent_path().string().c_str();
70+
saveFilePath += QDir::separator();
71+
if constexpr (std::same_as<T, vpkpp::FPX> || std::same_as<T, vpkpp::VPK>) {
72+
saveFilePath += std::filesystem::path{dirPath.toLocal8Bit().constData()}.stem().string().c_str() + ((options->vpk_saveSingleFile || dirPath.endsWith("_dir") ? "" : "_dir") + extension);
73+
} else {
74+
saveFilePath += std::filesystem::path{dirPath.toLocal8Bit().constData()}.stem().string().c_str() + extension;
75+
}
76+
}
77+
auto packFilePath = QFileDialog::getSaveFileName(this, QObject::tr("Save New Pack File"), fromDirectory ? saveFilePath : startPath, name + " (*" + extension.data() + ")");
78+
if (packFilePath.isEmpty()) {
79+
return;
80+
}
81+
82+
std::unique_ptr<vpkpp::PackFile> out;
83+
if constexpr (std::same_as<T, vpkpp::VPK_VTMB>) {
84+
const auto basePath = std::filesystem::path{packFilePath.toLocal8Bit().constData()};
85+
const auto packFilePathStr = basePath.parent_path().string() + "/pack000" + std::string{vpkpp::VPK_VTMB_EXTENSION};
86+
packFilePath = packFilePathStr.c_str();
87+
}
88+
out = T::create(packFilePath.toLocal8Bit().constData());
89+
90+
if constexpr (std::same_as<T, vpkpp::FPX> || std::same_as<T, vpkpp::VPK>) {
91+
if (auto* vpk = dynamic_cast<vpkpp::VPK*>(out.get())) {
92+
vpk->setChunkSize(options->vpk_chunkSize);
93+
}
94+
}
95+
96+
if (!fromDirectory) {
97+
this->loadPackFile(packFilePath, std::move(out));
98+
return;
99+
}
100+
101+
// Set up progress bar
102+
this->statusText->hide();
103+
this->statusProgressBar->show();
104+
this->statusBar()->show();
105+
106+
// Show progress bar is busy
107+
this->statusProgressBar->setValue(0);
108+
this->statusProgressBar->setRange(0, 0);
109+
110+
this->freezeActions(true);
111+
112+
// Set up thread
113+
this->createPackFileFromDirWorkerThread = new QThread(this);
114+
auto* worker = new IndeterminateProgressWorker();
115+
worker->moveToThread(this->createPackFileFromDirWorkerThread);
116+
QObject::connect(this->createPackFileFromDirWorkerThread, &QThread::started, worker, [worker, packFilePath, dirPath, options_=*options] {
117+
worker->run([packFilePath, dirPath, options_] {
118+
if (const auto packFile = vpkpp::PackFile::open(packFilePath.toLocal8Bit().constData())) {
119+
if constexpr (std::same_as<T, vpkpp::FPX> || std::same_as<T, vpkpp::VPK>) {
120+
if (auto* vpk = dynamic_cast<vpkpp::VPK*>(packFile.get())) {
121+
vpk->setChunkSize(options_.vpk_chunkSize);
122+
}
123+
}
124+
packFile->addDirectory("", dirPath.toLocal8Bit().constData(), {
125+
.zip_compressionType = vpkpp::EntryCompressionType::NO_COMPRESS,
126+
.zip_compressionStrength = 0,
127+
.vpk_preloadBytes = 0,
128+
.vpk_saveToDirectory = options_.vpk_saveSingleFile,
129+
});
130+
packFile->bake("", {}, nullptr);
131+
}
132+
});
133+
});
134+
QObject::connect(worker, &IndeterminateProgressWorker::taskFinished, this, [this, packFilePath, options_=*options] {
135+
// Kill thread
136+
this->createPackFileFromDirWorkerThread->quit();
137+
this->createPackFileFromDirWorkerThread->wait();
138+
delete this->createPackFileFromDirWorkerThread;
139+
this->createPackFileFromDirWorkerThread = nullptr;
140+
141+
// loadPackFile freezes them right away again
142+
// this->freezeActions(false);
143+
this->loadPackFile(packFilePath);
144+
if constexpr (std::same_as<T, vpkpp::FPX> || std::same_as<T, vpkpp::VPK>) {
145+
if (auto* vpk = dynamic_cast<vpkpp::VPK*>(packFile.get())) {
146+
vpk->setChunkSize(options_.vpk_chunkSize);
147+
}
148+
}
149+
});
150+
this->createPackFileFromDirWorkerThread->start();
151+
}
56152

57153
void openDir(const QString& startPath = QString(), const QString& dirPath = QString());
58154

@@ -206,18 +302,6 @@ class Window : public QMainWindow {
206302
void resetStatusBar();
207303
};
208304

209-
class IndeterminateProgressWorker : public QObject {
210-
Q_OBJECT;
211-
212-
public:
213-
IndeterminateProgressWorker() = default;
214-
215-
void run(const std::function<void()>& fn);
216-
217-
signals:
218-
void taskFinished();
219-
};
220-
221305
class SavePackFileWorker : public QObject {
222306
Q_OBJECT;
223307

‎src/gui/dialogs/EntryOptionsDialog.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ EntryCompressionType comboIndexToCompressionType(int index) {
4040
case 1: return EntryCompressionType::LZMA;
4141
case 4: return EntryCompressionType::ZSTD;
4242
case 5: return EntryCompressionType::XZ;
43+
default: break;
4344
}
4445
return EntryCompressionType::NO_COMPRESS;
4546
}
4647

4748
} // namespace
4849

49-
EntryOptionsDialog::EntryOptionsDialog(bool edit, bool isDir, const QString& prefilledPath, std::string_view typeGUID, EntryOptions options, QWidget* parent)
50+
EntryOptionsDialog::EntryOptionsDialog(bool edit, bool isDir, const QString& prefilledPath, PackFileOptionsShowForTypeFlags flags, EntryOptions options, QWidget* parent)
5051
: QDialog(parent) {
5152
const bool advancedFileProps = Options::get<bool>(OPT_ADVANCED_FILE_PROPS);
5253

@@ -102,11 +103,11 @@ EntryOptionsDialog::EntryOptionsDialog(bool edit, bool isDir, const QString& pre
102103
this->useArchiveVPK = nullptr;
103104
this->preloadBytes = nullptr;
104105
if (advancedFileProps) {
105-
if (typeGUID == bsppp::PakLump::GUID || typeGUID == ZIP::GUID) {
106+
if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::BSP) || static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::ZIP)) {
106107
this->compressionType = new QComboBox(this);
107108
this->compressionType->addItem(tr("None"));
108109
this->compressionType->addItem("LZMA");
109-
if (typeGUID == ZIP::GUID) {
110+
if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::ZIP)) {
110111
this->compressionType->addItem("DEFLATE");
111112
this->compressionType->addItem("BZIP2");
112113
this->compressionType->addItem("ZSTD");
@@ -119,7 +120,7 @@ EntryOptionsDialog::EntryOptionsDialog(bool edit, bool isDir, const QString& pre
119120
this->compressionStrength->setMaximum(9);
120121
this->compressionStrength->setValue(options.zip_compressionStrength);
121122
layout->addRow(tr("Compression Strength Override:"), this->compressionStrength);
122-
} else if (typeGUID == FPX::GUID || typeGUID == VPK::GUID) {
123+
} else if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::FPX) || static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::VPK)) {
123124
auto* useArchiveVPKLabel = new QLabel(isDir ?
124125
tr("Save each file to a new numbered archive\ninstead of the directory:") :
125126
tr("Save the file to a new numbered archive\ninstead of the directory:"), this);
@@ -154,9 +155,9 @@ EntryOptions EntryOptionsDialog::getEntryOptions() const {
154155
};
155156
}
156157

157-
std::optional<std::tuple<QString, EntryOptions>> EntryOptionsDialog::getEntryOptions(bool edit, bool isDir, const QString& prefilledPath, std::string_view typeGUID, EntryOptions options, QWidget* parent) {
158-
auto* dialog = new EntryOptionsDialog(edit, isDir, prefilledPath, typeGUID, options, parent);
159-
int ret = dialog->exec();
158+
std::optional<std::tuple<QString, EntryOptions>> EntryOptionsDialog::getEntryOptions(bool edit, bool isDir, const QString& prefilledPath, PackFileOptionsShowForTypeFlags flags, EntryOptions options, QWidget* parent) {
159+
auto* dialog = new EntryOptionsDialog(edit, isDir, prefilledPath, flags, options, parent);
160+
const int ret = dialog->exec();
160161
dialog->deleteLater();
161162
if (ret != QDialog::Accepted) {
162163
return std::nullopt;

‎src/gui/dialogs/EntryOptionsDialog.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include <QDialog>
99
#include <vpkpp/Options.h>
1010

11+
#include "PackFileOptionsDialog.h"
12+
1113
class QCheckBox;
1214
class QComboBox;
1315
class QLineEdit;
@@ -17,11 +19,11 @@ class EntryOptionsDialog : public QDialog {
1719
Q_OBJECT;
1820

1921
public:
20-
explicit EntryOptionsDialog(bool edit, bool isDir, const QString& prefilledPath, std::string_view typeGUID, vpkpp::EntryOptions options, QWidget* parent = nullptr);
22+
explicit EntryOptionsDialog(bool edit, bool isDir, const QString& prefilledPath, PackFileOptionsShowForTypeFlags flags, vpkpp::EntryOptions options, QWidget* parent = nullptr);
2123

2224
[[nodiscard]] vpkpp::EntryOptions getEntryOptions() const;
2325

24-
static std::optional<std::tuple<QString, vpkpp::EntryOptions>> getEntryOptions(bool edit, bool isDir, const QString& prefilledPath, std::string_view typeGUID, vpkpp::EntryOptions options, QWidget* parent = nullptr);
26+
static std::optional<std::tuple<QString, vpkpp::EntryOptions>> getEntryOptions(bool edit, bool isDir, const QString& prefilledPath, PackFileOptionsShowForTypeFlags flags, vpkpp::EntryOptions options, QWidget* parent = nullptr);
2527

2628
private:
2729
QLineEdit* path;

‎src/gui/dialogs/PackFileOptionsDialog.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
using namespace vpkpp;
1616

17-
PackFileOptionsDialog::PackFileOptionsDialog(std::string_view typeGUID, bool editing, bool createFromDir, PackFileOptions options, QWidget* parent)
17+
PackFileOptionsDialog::PackFileOptionsDialog(PackFileOptionsShowForTypeFlags flags, bool editing, bool createFromDir, PackFileOptions options, QWidget* parent)
1818
: QDialog(parent) {
1919
this->setModal(true);
2020
this->setWindowTitle(tr("Pack File Properties"));
@@ -23,12 +23,12 @@ PackFileOptionsDialog::PackFileOptionsDialog(std::string_view typeGUID, bool edi
2323

2424
this->compressionType = nullptr;
2525
this->compressionStrength = nullptr;
26-
if (typeGUID == bsppp::PakLump::GUID || typeGUID == ZIP::GUID) {
26+
if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::BSP) || static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::ZIP)) {
2727
this->compressionType = new QComboBox(this);
2828
this->compressionType->addItem(tr("None"), static_cast<int>(EntryCompressionType::NO_COMPRESS));
2929
this->compressionType->addItem(tr("Per-entry"), static_cast<int>(EntryCompressionType::NO_OVERRIDE));
3030
this->compressionType->addItem("LZMA", static_cast<int>(EntryCompressionType::LZMA));
31-
if (typeGUID == ZIP::GUID) {
31+
if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::ZIP)) {
3232
this->compressionType->addItem("DEFLATE", static_cast<int>(EntryCompressionType::DEFLATE));
3333
this->compressionType->addItem("BZIP2", static_cast<int>(EntryCompressionType::BZIP2));
3434
this->compressionType->addItem("ZSTD", static_cast<int>(EntryCompressionType::ZSTD));
@@ -47,7 +47,7 @@ PackFileOptionsDialog::PackFileOptionsDialog(std::string_view typeGUID, bool edi
4747
}
4848

4949
this->version = nullptr;
50-
if (typeGUID == VPK::GUID) {
50+
if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::VPK)) {
5151
this->version = new QComboBox(this);
5252
this->version->addItem("v0");
5353
this->version->addItem("v1");
@@ -60,7 +60,7 @@ PackFileOptionsDialog::PackFileOptionsDialog(std::string_view typeGUID, bool edi
6060

6161
this->singleFile = nullptr;
6262
this->preferredChunkSize = nullptr;
63-
if (typeGUID == FPX::GUID || typeGUID == VPK::GUID) {
63+
if (static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::FPX) || static_cast<bool>(flags & PackFileOptionsShowForTypeFlags::VPK)) {
6464
if (!editing && createFromDir) {
6565
this->singleFile = new QCheckBox(this);
6666
this->singleFile->setChecked(options.vpk_saveSingleFile);
@@ -91,28 +91,28 @@ PackFileOptions PackFileOptionsDialog::getPackFileOptions() const {
9191
};
9292
}
9393

94-
std::optional<PackFileOptions> PackFileOptionsDialog::getForNew(std::string_view typeGUID, bool createFromDir, QWidget* parent) {
95-
if (typeGUID != bsppp::PakLump::GUID && typeGUID != FPX::GUID && typeGUID != VPK::GUID && typeGUID != ZIP::GUID) {
94+
std::optional<PackFileOptions> PackFileOptionsDialog::getForNew(PackFileOptionsShowForTypeFlags flags, bool createFromDir, QWidget* parent) {
95+
if (flags == PackFileOptionsShowForTypeFlags::ORDINARY) {
9696
return PackFileOptions{};
9797
}
9898

99-
auto* dialog = new PackFileOptionsDialog(typeGUID, false, createFromDir, {}, parent);
100-
int ret = dialog->exec();
99+
auto* dialog = new PackFileOptionsDialog(flags, false, createFromDir, {}, parent);
100+
const int ret = dialog->exec();
101101
dialog->deleteLater();
102102
if (ret != QDialog::Accepted) {
103103
return std::nullopt;
104104
}
105105
return dialog->getPackFileOptions();
106106
}
107107

108-
std::optional<PackFileOptions> PackFileOptionsDialog::getForEdit(std::string_view typeGUID, PackFileOptions options, QWidget* parent) {
109-
if (typeGUID != bsppp::PakLump::GUID && typeGUID != FPX::GUID && typeGUID != VPK::GUID && typeGUID != ZIP::GUID) {
108+
std::optional<PackFileOptions> PackFileOptionsDialog::getForEdit(PackFileOptionsShowForTypeFlags flags, PackFileOptions options, QWidget* parent) {
109+
if (flags == PackFileOptionsShowForTypeFlags::ORDINARY) {
110110
QMessageBox::information(parent, tr("Pack File Properties"), tr("No properties available for this file type."));
111111
return std::nullopt;
112112
}
113113

114-
auto* dialog = new PackFileOptionsDialog(typeGUID, false, false, options, parent);
115-
int ret = dialog->exec();
114+
auto* dialog = new PackFileOptionsDialog(flags, false, false, options, parent);
115+
const int ret = dialog->exec();
116116
dialog->deleteLater();
117117
if (ret != QDialog::Accepted) {
118118
return std::nullopt;

0 commit comments

Comments
 (0)