From e94edd5eec6ee6fb81dd3e8e63c55ad371a38a73 Mon Sep 17 00:00:00 2001 From: Dave Allie Date: Sun, 21 Dec 2025 14:34:22 +1100 Subject: [PATCH] Move ZipFile constructor to .cpp file --- lib/ZipFile/ZipFile.cpp | 9 +++++++++ lib/ZipFile/ZipFile.h | 12 +----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/ZipFile/ZipFile.cpp b/lib/ZipFile/ZipFile.cpp index 6096168..1f99dc7 100644 --- a/lib/ZipFile/ZipFile.cpp +++ b/lib/ZipFile/ZipFile.cpp @@ -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; diff --git a/lib/ZipFile/ZipFile.h b/lib/ZipFile/ZipFile.h index 494d4c7..58e3ab9 100644 --- a/lib/ZipFile/ZipFile.h +++ b/lib/ZipFile/ZipFile.h @@ -1,9 +1,6 @@ #pragma once -#include #include -#include -#include #include #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;