Small code cleanup (#83)

## Summary

* Fix cppcheck low violations
* Remove teardown method on parsers, use destructor
* Code cleanup

lib/Epub/Epub.cpp

@@ -30,24 +30,22 @@ bool Epub::findContentOpfFile(std::string* contentOpfFile) const {
   // Stream read (reusing your existing stream logic)
   if (!readItemContentsToStream(containerPath, containerParser, 512)) {
     Serial.printf("[%lu] [EBP] Could not read META-INF/container.xml\n", millis());
-    containerParser.teardown();
     return false;
   }
 
   // Extract the result
   if (containerParser.fullPath.empty()) {
     Serial.printf("[%lu] [EBP] Could not find valid rootfile in container.xml\n", millis());
-    containerParser.teardown();
     return false;
   }
 
   *contentOpfFile = std::move(containerParser.fullPath);
-
-  containerParser.teardown();
   return true;
 }
 
 bool Epub::parseContentOpf(const std::string& contentOpfFilePath) {
+  Serial.printf("[%lu] [EBP] Parsing content.opf: %s\n", millis(), contentOpfFilePath.c_str());
+
   size_t contentOpfSize;
   if (!getItemSize(contentOpfFilePath, &contentOpfSize)) {
     Serial.printf("[%lu] [EBP] Could not get size of content.opf\n", millis());
@@ -63,7 +61,6 @@ bool Epub::parseContentOpf(const std::string& contentOpfFilePath) {
 
   if (!readItemContentsToStream(contentOpfFilePath, opfParser, 1024)) {
     Serial.printf("[%lu] [EBP] Could not read content.opf\n", millis());
-    opfParser.teardown();
     return false;
   }
 
@@ -84,8 +81,6 @@ bool Epub::parseContentOpf(const std::string& contentOpfFilePath) {
   }
 
   Serial.printf("[%lu] [EBP] Successfully parsed content.opf\n", millis());
-
-  opfParser.teardown();
   return true;
 }
 
@@ -96,6 +91,8 @@ bool Epub::parseTocNcxFile() {
     return false;
   }
 
+  Serial.printf("[%lu] [EBP] Parsing toc ncx file: %s\n", millis(), tocNcxItem.c_str());
+
   size_t tocSize;
   if (!getItemSize(tocNcxItem, &tocSize)) {
     Serial.printf("[%lu] [EBP] Could not get size of toc ncx\n", millis());
@@ -111,15 +108,12 @@ bool Epub::parseTocNcxFile() {
 
   if (!readItemContentsToStream(tocNcxItem, ncxParser, 1024)) {
     Serial.printf("[%lu] [EBP] Could not read toc ncx stream\n", millis());
-    ncxParser.teardown();
     return false;
   }
 
   this->toc = std::move(ncxParser.toc);
 
   Serial.printf("[%lu] [EBP] Parsed %d TOC items\n", millis(), this->toc.size());
-
-  ncxParser.teardown();
   return true;
 }
 

lib/Epub/Epub/Section.h

@@ -21,9 +21,10 @@ class Section {
   int currentPage = 0;
 
   explicit Section(const std::shared_ptr<Epub>& epub, const int spineIndex, GfxRenderer& renderer)
-      : epub(epub), spineIndex(spineIndex), renderer(renderer) {
-    cachePath = epub->getCachePath() + "/" + std::to_string(spineIndex);
-  }
+      : epub(epub),
+        spineIndex(spineIndex),
+        renderer(renderer),
+        cachePath(epub->getCachePath() + "/" + std::to_string(spineIndex)) {}
   ~Section() = default;
   bool loadCacheMetadata(int fontId, float lineCompression, int marginTop, int marginRight, int marginBottom,
                          int marginLeft, bool extraParagraphSpacing);

lib/Epub/Epub/parsers/ContainerParser.cpp

@@ -14,12 +14,11 @@ bool ContainerParser::setup() {
   return true;
 }
 
-bool ContainerParser::teardown() {
+ContainerParser::~ContainerParser() {
   if (parser) {
     XML_ParserFree(parser);
     parser = nullptr;
   }
-  return true;
 }
 
 size_t ContainerParser::write(const uint8_t data) { return write(&data, 1); }

lib/Epub/Epub/parsers/ContainerParser.h

@@ -23,9 +23,9 @@ class ContainerParser final : public Print {
   std::string fullPath;
 
   explicit ContainerParser(const size_t xmlSize) : remainingSize(xmlSize) {}
+  ~ContainerParser() override;
 
   bool setup();
-  bool teardown();
 
   size_t write(uint8_t) override;
   size_t write(const uint8_t* buffer, size_t size) override;

lib/Epub/Epub/parsers/ContentOpfParser.cpp

@@ -4,7 +4,7 @@
 #include <ZipFile.h>
 
 namespace {
-constexpr const char MEDIA_TYPE_NCX[] = "application/x-dtbncx+xml";
+constexpr char MEDIA_TYPE_NCX[] = "application/x-dtbncx+xml";
 }
 
 bool ContentOpfParser::setup() {
@@ -20,12 +20,11 @@ bool ContentOpfParser::setup() {
   return true;
 }
 
-bool ContentOpfParser::teardown() {
+ContentOpfParser::~ContentOpfParser() {
   if (parser) {
     XML_ParserFree(parser);
     parser = nullptr;
   }
-  return true;
 }
 
 size_t ContentOpfParser::write(const uint8_t data) { return write(&data, 1); }

lib/Epub/Epub/parsers/ContentOpfParser.h

@@ -34,9 +34,9 @@ class ContentOpfParser final : public Print {
 
   explicit ContentOpfParser(const std::string& baseContentPath, const size_t xmlSize)
       : baseContentPath(baseContentPath), remainingSize(xmlSize) {}
+  ~ContentOpfParser() override;
 
   bool setup();
-  bool teardown();
 
   size_t write(uint8_t) override;
   size_t write(const uint8_t* buffer, size_t size) override;

lib/Epub/Epub/parsers/TocNcxParser.cpp

@@ -1,5 +1,6 @@
 #include "TocNcxParser.h"
 
+#include <Esp.h>
 #include <HardwareSerial.h>
 
 bool TocNcxParser::setup() {
@@ -15,12 +16,11 @@ bool TocNcxParser::setup() {
   return true;
 }
 
-bool TocNcxParser::teardown() {
+TocNcxParser::~TocNcxParser() {
   if (parser) {
     XML_ParserFree(parser);
     parser = nullptr;
   }
-  return true;
 }
 
 size_t TocNcxParser::write(const uint8_t data) { return write(&data, 1); }

lib/Epub/Epub/parsers/TocNcxParser.h

@@ -28,9 +28,9 @@ class TocNcxParser final : public Print {
 
   explicit TocNcxParser(const std::string& baseContentPath, const size_t xmlSize)
       : baseContentPath(baseContentPath), remainingSize(xmlSize) {}
+  ~TocNcxParser() override;
 
   bool setup();
-  bool teardown();
 
   size_t write(uint8_t) override;
   size_t write(const uint8_t* buffer, size_t size) override;