finish pak loader

This commit is contained in:
alison wright 2019-09-28 02:09:51 -04:00
parent 0df35fc0c9
commit e5cf9ec68c
4 changed files with 59 additions and 40 deletions

View File

@ -4,18 +4,20 @@
#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,
@ -44,33 +46,22 @@ static inline std::array<char, N> readBytes(std::istream &st) {
return std::move(b);
}
template<typename It>
static inline std::string escapeText(It begin, It end) {
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;
}
}
return out.str();
static inline QDebug operator<<(QDebug debug, std::string const &t) {
debug << QString::fromStdString(t);
return debug;
}
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;
}
// EOF

View File

@ -43,7 +43,7 @@ static int modeText(int argc, char *argv[]) {
auto fileName = par.value(fileNameOpt).toStdString();
std::ifstream st{fileName, std::ios_base::in | std::ios_base::binary};
readPakFile(st);
auto pak = readPak(st);
return 0;
}

View File

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

View File

@ -1,8 +1,19 @@
#pragma once
class PakFile : public std::map<std::string, QByteArray> {
struct PakNode;
struct PakDir : public std::map<std::string, std::unique_ptr<PakNode>> {
using std::map<std::string, std::unique_ptr<PakNode>>::map;
};
PakFile readPakFile(std::istream &st);
struct PakFile : public QByteArray {
using QByteArray::QByteArray;
};
struct PakNode : public std::variant<PakDir, PakFile> {
using std::variant<PakDir, PakFile>::variant;
};
PakDir readPak(std::istream &st);
// EOF