Skip to content

vpkpp: GCF fix & minor cleanup #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2025
Merged

vpkpp: GCF fix & minor cleanup #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12b108c
vpkpp: clean up GCF a bit
craftablescience Jan 4, 2025
641be98
vpkpp: GCFs are case-sensitive apparently
craftablescience Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/vpkpp/format/GCF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ class GCF : public PackFileReadOnly {

[[nodiscard]] std::vector<std::string> verifyEntryChecksums() const override;

[[nodiscard]] constexpr bool isCaseSensitive() const override {
return true;
}

[[nodiscard]] std::optional<std::vector<std::byte>> readEntry(const std::string& path_) const override;

[[nodiscard]] Attribute getSupportedEntryAttributes() const override;
Expand Down
12 changes: 3 additions & 9 deletions src/vpkpp/format/GCF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ std::unique_ptr<PackFile> GCF::open(const std::string& path, const EntryCallback
return nullptr;
}

// Create the pack file
auto* gcf = new GCF{path};
auto packFile = std::unique_ptr<PackFile>(gcf);

// open file
FileStream reader(gcf->fullFilePath);
reader.seek_in(0);

// we read the main header here (not the block header)
// read the main header here (not the block header)
reader.read(gcf->header);

if (gcf->header.dummy1 != 1 && gcf->header.dummy2 != 1 && gcf->header.gcfversion != 6) {
/**
* This should NEVER occur when reading a "normal" gcf file.
Expand All @@ -39,8 +36,7 @@ std::unique_ptr<PackFile> GCF::open(const std::string& path, const EntryCallback
return nullptr;
}

uintmax_t real_size = std::filesystem::file_size(gcf->fullFilePath);
if (real_size != gcf->header.filesize) {
if (gcf->header.filesize != std::filesystem::file_size(gcf->fullFilePath)) {
// again, this should never occur with a valid gcf file
return nullptr;
}
Expand Down Expand Up @@ -103,14 +99,13 @@ std::unique_ptr<PackFile> GCF::open(const std::string& path, const EntryCallback
reader.read(gcf->dirheader);

uint64_t diroffset = reader.tell_in() + (gcf->dirheader.itemcount * 28);
uint64_t currentoffset;

std::vector<DirectoryEntry2> direntries{};

for (int i = 0; i < gcf->dirheader.itemcount; i++) {
DirectoryEntry2& entry = direntries.emplace_back();
reader.read(entry.entry_real);
currentoffset = reader.tell_in();
auto currentoffset = reader.tell_in();
reader.seek_in_u(diroffset + entry.entry_real.nameoffset);
reader.read(entry.filename);
if (entry.entry_real.dirtype != 0) { // if not directory
Expand Down Expand Up @@ -252,7 +247,6 @@ std::optional<std::vector<std::byte>> GCF::readEntry(const std::string& path_) c

FileStream stream{this->fullFilePath};
if (!stream) {
//printf("!stream\n");
return std::nullopt;
}

Expand Down
Loading