source/common.h

@@ -4,20 +4,18 @@
 #include <QtGlobal>
 
 #include <QCoreApplication>
-#include <QDebug>
 
 #include <algorithm>
 #include <array>
 #include <filesystem>
 #include <fstream>
 #include <ios>
+#include <iostream>
 #include <istream>
 #include <iterator>
-#include <memory>
 #include <stdexcept>
 #include <string>
 #include <utility>
-#include <variant>
 
 static inline QString trMain(char const *sourceText,
                              char const *disambiguation = nullptr,
@@ -46,26 +44,33 @@ static inline std::array<char, N> readBytes(std::istream &st) {
 	return std::move(b);
 }
 
-static inline QDebug operator<<(QDebug debug, std::string const &t) {
+template<typename It>
-	debug << QString::fromStdString(t);
+static inline std::string escapeText(It begin, It end) {
-	return debug;
+	std::stringstream out;
+	out << std::hex << std::uppercase;
+	for(auto it = begin; it != end; ++it) {
+		unsigned char c = *it;
+		switch(c) {
+			case '"':  out << "\\\""; break;
+			case '\0': out << "\\0";  break;
+			case '\\': out << "\\\\"; break;
+			case '\a': out << "\\a";  break;
+			case '\b': out << "\\b";  break;
+			case '\f': out << "\\f";  break;
+			case '\n': out << "\\n";  break;
+			case '\r': out << "\\r";  break;
+			case '\t': out << "\\t";  break;
+			case '\v': out << "\\v";  break;
+			default:
+				if(c >= ' ' && c <= '~') {
+					out << c;
+				} else {
+					out << "\\x" << int(c);
 				}
-
+				break;
-template<typename T>
-static inline QDebug operator<<(QDebug debug, std::unique_ptr<T> const &t) {
-	debug << *t;
-	return debug;
 		}
-
-template<typename T0, typename... Ts>
-static inline QDebug operator <<(QDebug debug,
-                                 std::variant<T0, Ts...> const &t) {
-	std::visit([&](auto &&arg) {debug << arg;}, t);
-	return debug;
 	}
-
+	return out.str();
-static inline std::ifstream openReadBin(std::filesystem::path path) {
-	return std::ifstream{path, std::ios_base::in | std::ios_base::binary};
 }
 
 // EOF

source/quam/main.cc

@@ -42,17 +42,14 @@ 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);
+	readPakFile(st);
-	auto pak = readPak(st);
-
-	qDebug() << pak;
 
 	return 0;
 }
 
 int main(int argc, char *argv[]) {
-	if(argc <= 1) {
+	if(argc == 0) {
 		return modeGui(argc, argv);
 	} else {
 		return modeText(argc, argv);

source/quam/main_window.cc

@@ -2,53 +2,14 @@
 #include "quam/main_window.h"
 #include "quam/pak.h"
 
-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);
-	}
-}
-
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow{parent},
-	Ui::MainWindow{},
+	Ui::MainWindow{}
-	m_errors{}
 {
 	setupUi(this);
-
-	actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
-	actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
 }
 
-void MainWindow::fileOpen() {
+void MainWindow::openTest() {
-	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

source/quam/main_window.h

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

source/quam/main_window.ui

@@ -16,10 +16,17 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout_2">
     <item>
-     <widget class="QListWidget" name="listWidget"/>
+     <widget class="QPushButton" name="pushButton">
-    </item>
+      <property name="sizePolicy">
-    <item>
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-     <widget class="QPlainTextEdit" name="textEdit"/>
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="text">
+       <string>PushButton</string>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -32,61 +39,20 @@
      <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>actionOpen</sender>
+   <sender>pushButton</sender>
-   <signal>triggered()</signal>
+   <signal>clicked()</signal>
    <receiver>MainWindow</receiver>
-   <slot>fileOpen()</slot>
+   <slot>openTest()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>-1</x>
+     <x>59</x>
-     <y>-1</y>
+     <y>53</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>
@@ -96,6 +62,6 @@
   </connection>
  </connections>
  <slots>
-  <slot>fileOpen()</slot>
+  <slot>openTest()</slot>
  </slots>
 </ui>

source/quam/pak.cc

@@ -8,7 +8,7 @@ struct PakHeader {
 
 struct PakEntry {
 	std::string name;
-	PakFile     data;
+	QByteArray  data;
 };
 
 static constexpr quint32 sizeOfPakEntry = 64;
@@ -42,7 +42,7 @@ static PakEntry readPakEntry(std::istream &st) {
 
 	st.seekg(entOffset);
 
-	PakFile bytes;
+	QByteArray bytes;
 	bytes.resize(entSize);
 	st.read(bytes.data(), entSize);
 
@@ -50,44 +50,27 @@ static PakEntry readPakEntry(std::istream &st) {
 
 	auto zero = std::find(entName.cbegin(), entName.cend(), '\0');
 
-	std::string name;
+	std::string out;
-	std::copy(entName.cbegin(), zero, std::back_inserter(name));
+	std::copy(entName.cbegin(), zero, std::back_inserter(out));
-
-	if(name.front() == '/') {
-		throw std::runtime_error("empty root directory name");
-	}
 
 	PakEntry ent;
-	ent.name = std::move(name);
+	ent.name = std::move(out);
 	ent.data = std::move(bytes);
 	return ent;
 }
 
-void insertFile(PakDir &dir, std::string name, PakFile file) {
+PakFile readPakFile(std::istream &st) {
-	if(auto slash = name.find('/'); slash != std::string::npos) {
-		auto folder = name.substr(0, slash);
-		auto next   = name.substr(slash + 1);
-		dir[folder] = PakNode{PakDir{}};
-		insertFile(std::get<PakDir>(dir[folder]),
-		           std::move(next),
-		           std::move(file));
-	} else {
-		dir[name] = PakNode{std::move(file)};
-	}
-}
-
-PakDir readPak(std::istream &st) {
 	auto hdr = readPakHeader(st);
 	st.seekg(hdr.dirOffset);
 
-	PakDir root;
+	PakFile pak;
 
 	for(quint32 i = 0; i < hdr.dirNum; i++) {
 		auto ent = readPakEntry(st);
-		insertFile(root, std::move(ent.name), std::move(ent.data));
+		pak.emplace(std::move(ent.name), std::move(ent.data));
 	}
 
-	return root;
+	return pak;
 }
 
 // EOF

source/quam/pak.h

@@ -1,22 +1,8 @@
 #pragma once
 
-struct PakNode;
+class PakFile : public std::map<std::string, QByteArray> {
-
-struct PakDir : public std::map<std::string, PakNode> {
-	using std::map<std::string, PakNode>::map;
 };
-Q_DECLARE_METATYPE(PakDir)
 
-struct PakFile : public QByteArray {
+PakFile readPakFile(std::istream &st);
-	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);
 
 // EOF