marrub
/
quake-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finish pak opening support

master
an 2019-09-28 04:17:55 -04:00
parent e5cf9ec68c
commit 62253abab0
7 changed files with 120 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/common.h
View File

@ -64,4 +64,8 @@ static inline QDebug operator <<(QDebug debug,
return debug;
}
static inline std::ifstream openReadBin(std::filesystem::path path) {
return std::ifstream{path, std::ios_base::in | std::ios_base::binary};
}
// EOF

7
source/quam/main.cc
View File

@ -42,14 +42,17 @@ static int modeText(int argc, char *argv[]) {
par.process(appl);
auto fileName = par.value(fileNameOpt).toStdString();
std::ifstream st{fileName, std::ios_base::in | std::ios_base::binary};
auto st = openReadBin(fileName);
auto pak = readPak(st);
qDebug() << pak;
return 0;
}
int main(int argc, char *argv[]) {
if(argc == 0) {
if(argc <= 1) {
return modeGui(argc, argv);
} else {
return modeText(argc, argv);

51
source/quam/main_window.cc
View File

@ -2,14 +2,53 @@
#include "quam/main_window.h"
#include "quam/pak.h"
MainWindow::MainWindow(QWidget *parent) :
QMainWindow{parent},
Ui::MainWindow{}
{
setupUi(this);
static void setListToDir(QListWidget &list, PakDir const &dir) {
list.clear();
for(auto const &kv : dir) {
auto const &name = kv.first;
auto const &node = kv.second;
auto var = QVariant::fromValue(node);
auto item = new QListWidgetItem{&list};
item->setText(QString::fromStdString(name));
item->setData(Qt::UserRole, var);
if(std::holds_alternative<PakDir>(node)) {
item->setIcon(QIcon::fromTheme("folder"));
} else {
item->setIcon(QIcon::fromTheme("text-x-generic"));
}
list.addItem(item);
}
}
void MainWindow::openTest() {
MainWindow::MainWindow(QWidget *parent) :
QMainWindow{parent},
Ui::MainWindow{},
m_errors{}
{
setupUi(this);
actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
}
void MainWindow::fileOpen() {
auto fileName =
QFileDialog::getOpenFileName(
this,
tr("Open Archive"),
QString{},
tr("Quake PACK file (*.pak);;"
"All files (*)"));
if(!fileName.isEmpty()) {
try {
auto st = openReadBin(fileName.toStdString());
auto pak = readPak(st);
setListToDir(*listWidget, pak);
} catch(std::exception const &exc) {
m_errors.showMessage(tr(exc.what()));
}
}
}
// EOF

7
source/quam/main_window.h
View File

@ -2,6 +2,8 @@
#include "quam/ui_main_window.h"
#include <QErrorMessage>
#include <QFileDialog>
#include <QMainWindow>
#include <QWidget>
@ -12,7 +14,10 @@ public:
explicit MainWindow(QWidget *parent = nullptr);
public slots:
void openTest();
void fileOpen();
private:
QErrorMessage m_errors;
};
// EOF

68
source/quam/main_window.ui
View File

@ -16,17 +16,10 @@
<widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
<widget class="QListWidget" name="listWidget"/>
</item>
<item>
<widget class="QPlainTextEdit" name="textEdit"/>
</item>
</layout>
</widget>
@ -39,20 +32,61 @@
<height>29</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>&amp;File</string>
</property>
<addaction name="actionOpen"/>
<addaction name="separator"/>
<addaction name="actionQuit"/>
</widget>
<addaction name="menuFile"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<action name="actionOpen">
<property name="icon">
<iconset theme="document-open"/>
</property>
<property name="text">
<string>&amp;Open</string>
</property>
</action>
<action name="actionQuit">
<property name="icon">
<iconset theme="application-exit"/>
</property>
<property name="text">
<string>&amp;Quit</string>
</property>
</action>
</widget>
<resources/>
<connections>
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<sender>actionOpen</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openTest()</slot>
<slot>fileOpen()</slot>
<hints>
<hint type="sourcelabel">
<x>59</x>
<y>53</y>
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
<y>239</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionQuit</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>319</x>
@ -62,6 +96,6 @@
</connection>
</connections>
<slots>
<slot>openTest()</slot>
<slot>fileOpen()</slot>
</slots>
</ui>

8
source/quam/pak.cc
View File

@ -54,7 +54,7 @@ static PakEntry readPakEntry(std::istream &st) {
std::copy(entName.cbegin(), zero, std::back_inserter(name));
if(name.front() == '/') {
name.erase(0, 1);
throw std::runtime_error("empty root directory name");
}
PakEntry ent;
@ -67,12 +67,12 @@ void insertFile(PakDir &dir, std::string name, PakFile file) {
if(auto slash = name.find('/'); slash != std::string::npos) {
auto folder = name.substr(0, slash);
auto next = name.substr(slash + 1);
dir[folder] = std::make_unique<PakNode>(PakDir{});
insertFile(std::get<PakDir>(*dir[folder]),
dir[folder] = PakNode{PakDir{}};
insertFile(std::get<PakDir>(dir[folder]),
std::move(next),
std::move(file));
} else {
dir[name] = std::make_unique<PakNode>(std::move(file));
dir[name] = PakNode{std::move(file)};
}
}

7
source/quam/pak.h
View File

@ -2,17 +2,20 @@
struct PakNode;
struct PakDir : public std::map<std::string, std::unique_ptr<PakNode>> {
using std::map<std::string, std::unique_ptr<PakNode>>::map;
struct PakDir : public std::map<std::string, PakNode> {
using std::map<std::string, PakNode>::map;
};
Q_DECLARE_METATYPE(PakDir)
struct PakFile : public QByteArray {
using QByteArray::QByteArray;
};
Q_DECLARE_METATYPE(PakFile)
struct PakNode : public std::variant<PakDir, PakFile> {
using std::variant<PakDir, PakFile>::variant;
};
Q_DECLARE_METATYPE(PakNode)
PakDir readPak(std::istream &st);