From be1b5bad2185eb9171447c24506a6a3ddb523735 Mon Sep 17 00:00:00 2001
From: Dave Allie <dave@daveallie.com>
Date: Tue, 30 Dec 2025 21:15:44 +1000
Subject: [PATCH] Parse the author name from content.opf file (#165)

## Summary

* Parse the author name from content.opf file
  * Listed in the dc:creator tag within the metadata section
---
 lib/Epub/Epub.cpp                          | 12 ++++++++++--
 lib/Epub/Epub.h                            |  1 +
 lib/Epub/Epub/parsers/ContentOpfParser.cpp | 15 +++++++++++++++
 lib/Epub/Epub/parsers/ContentOpfParser.h   |  2 ++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/Epub/Epub.cpp b/lib/Epub/Epub.cpp
index f4a2bfa1..ec3106b2 100644
--- a/lib/Epub/Epub.cpp
+++ b/lib/Epub/Epub.cpp
@@ -72,8 +72,7 @@ bool Epub::parseContentOpf(BookMetadataCache::BookMetadata& bookMetadata) {
 
   // Grab data from opfParser into epub
   bookMetadata.title = opfParser.title;
-  // TODO: Parse author
-  bookMetadata.author = "";
+  bookMetadata.author = opfParser.author;
   bookMetadata.coverItemHref = opfParser.coverItemHref;
 
   if (!opfParser.tocNcxPath.empty()) {
@@ -253,6 +252,15 @@ const std::string& Epub::getTitle() const {
   return bookMetadataCache->coreMetadata.title;
 }
 
+const std::string& Epub::getAuthor() const {
+  static std::string blank;
+  if (!bookMetadataCache || !bookMetadataCache->isLoaded()) {
+    return blank;
+  }
+
+  return bookMetadataCache->coreMetadata.author;
+}
+
 std::string Epub::getCoverBmpPath() const { return cachePath + "/cover.bmp"; }
 
 bool Epub::generateCoverBmp() const {
diff --git a/lib/Epub/Epub.h b/lib/Epub/Epub.h
index 8ce18432..b68aac70 100644
--- a/lib/Epub/Epub.h
+++ b/lib/Epub/Epub.h
@@ -40,6 +40,7 @@ class Epub {
   const std::string& getCachePath() const;
   const std::string& getPath() const;
   const std::string& getTitle() const;
+  const std::string& getAuthor() const;
   std::string getCoverBmpPath() const;
   bool generateCoverBmp() const;
   uint8_t* readItemContentsToBytes(const std::string& itemHref, size_t* size = nullptr,
diff --git a/lib/Epub/Epub/parsers/ContentOpfParser.cpp b/lib/Epub/Epub/parsers/ContentOpfParser.cpp
index ae964ce5..721dc871 100644
--- a/lib/Epub/Epub/parsers/ContentOpfParser.cpp
+++ b/lib/Epub/Epub/parsers/ContentOpfParser.cpp
@@ -102,6 +102,11 @@ void XMLCALL ContentOpfParser::startElement(void* userData, const XML_Char* name
     return;
   }
 
+  if (self->state == IN_METADATA && strcmp(name, "dc:creator") == 0) {
+    self->state = IN_BOOK_AUTHOR;
+    return;
+  }
+
   if (self->state == IN_PACKAGE && (strcmp(name, "manifest") == 0 || strcmp(name, "opf:manifest") == 0)) {
     self->state = IN_MANIFEST;
     if (!SdMan.openFileForWrite("COF", self->cachePath + itemCacheFile, self->tempItemStore)) {
@@ -209,6 +214,11 @@ void XMLCALL ContentOpfParser::characterData(void* userData, const XML_Char* s,
     self->title.append(s, len);
     return;
   }
+
+  if (self->state == IN_BOOK_AUTHOR) {
+    self->author.append(s, len);
+    return;
+  }
 }
 
 void XMLCALL ContentOpfParser::endElement(void* userData, const XML_Char* name) {
@@ -232,6 +242,11 @@ void XMLCALL ContentOpfParser::endElement(void* userData, const XML_Char* name)
     return;
   }
 
+  if (self->state == IN_BOOK_AUTHOR && strcmp(name, "dc:creator") == 0) {
+    self->state = IN_METADATA;
+    return;
+  }
+
   if (self->state == IN_METADATA && (strcmp(name, "metadata") == 0 || strcmp(name, "opf:metadata") == 0)) {
     self->state = IN_PACKAGE;
     return;
diff --git a/lib/Epub/Epub/parsers/ContentOpfParser.h b/lib/Epub/Epub/parsers/ContentOpfParser.h
index 2a7dd487..ad1f2957 100644
--- a/lib/Epub/Epub/parsers/ContentOpfParser.h
+++ b/lib/Epub/Epub/parsers/ContentOpfParser.h
@@ -12,6 +12,7 @@ class ContentOpfParser final : public Print {
     IN_PACKAGE,
     IN_METADATA,
     IN_BOOK_TITLE,
+    IN_BOOK_AUTHOR,
     IN_MANIFEST,
     IN_SPINE,
   };
@@ -31,6 +32,7 @@ class ContentOpfParser final : public Print {
 
  public:
   std::string title;
+  std::string author;
   std::string tocNcxPath;
   std::string coverItemHref;