cottongin/crosspoint-reader
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Move ZipFile constructor to .cpp file

Browse Source
This commit is contained in:
Dave Allie 2025-12-21 14:34:22 +11:00
parent b54b12e518
commit e94edd5eec
No known key found for this signature in database
GPG Key ID: F2FDDB3AD8D0276F
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ZipFile/ZipFile.cpp
View File

@ -27,6 +27,15 @@ bool inflateOneShot(const uint8_t* inputBuf, const size_t deflatedSize, uint8_t*
return true;
}
ZipFile::ZipFile(std::string filePath) : filePath(std::move(filePath)) {
const bool status = mz_zip_reader_init_file(&zipArchive, this->filePath.c_str(), 0);
if (!status) {
Serial.printf("[%lu] [ZIP] mz_zip_reader_init_file() failed for %s! Error: %s\n", millis(), this->filePath.c_str(),
mz_zip_get_error_string(zipArchive.m_last_error));
}
}
bool ZipFile::loadFileStat(const char* filename, mz_zip_archive_file_stat* fileStat) const {
// find the file
mz_uint32 fileIndex = 0;

12
lib/ZipFile/ZipFile.h
View File

@ -1,9 +1,6 @@
#pragma once
#include <HardwareSerial.h>
#include <Print.h>
#include <cstddef>
#include <functional>
#include <string>
#include "miniz.h"
@ -15,14 +12,7 @@ class ZipFile {
long getDataOffset(const mz_zip_archive_file_stat& fileStat) const;
public:
explicit ZipFile(std::string filePath) : filePath(std::move(filePath)) {
const bool status = mz_zip_reader_init_file(&zipArchive, this->filePath.c_str(), 0);
if (!status) {
Serial.printf("[%lu] [ZIP] mz_zip_reader_init_file() failed for %s! Error: %s\n", millis(),
this->filePath.c_str(), mz_zip_get_error_string(zipArchive.m_last_error));
}
}
explicit ZipFile(std::string filePath);
~ZipFile() { mz_zip_reader_end(&zipArchive); }
bool getInflatedFileSize(const char* filename, size_t* size) const;
uint8_t* readFileToMemory(const char* filename, size_t* size = nullptr, bool trailingNullByte = false) const;