Merge pull request #1086 from Losses/patch-1

Update the strategy of finding covers.
futurepress · Jul 1, 2020 · 32cb9cf · 32cb9cf
2 parents c417294 + 95608aa
commit 32cb9cf
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/packaging.js b/src/packaging.js
@@ -256,23 +256,23 @@ class Packaging {
 	findCoverPath(packageXml){
 		var pkg = qs(packageXml, "package");
 		var epubVersion = pkg.getAttribute("version");
-
-		if (epubVersion === "2.0") {
-			var metaCover = qsp(packageXml, "meta", {"name":"cover"});
-			if (metaCover) {
-				var coverId = metaCover.getAttribute("content");
-				// var cover = packageXml.querySelector("item[id='" + coverId + "']");
-				var cover = packageXml.getElementById(coverId);
-				return cover ? cover.getAttribute("href") : "";
-			}
-			else {
-				return false;
-			}
+
+		// Try parsing cover with epub 3.
+		// var node = packageXml.querySelector("item[properties='cover-image']");
+		var node = qsp(packageXml, "item", {"properties":"cover-image"});
+		if (node) return node.getAttribute("href");
+
+		// Fallback to epub 2.
+		var metaCover = qsp(packageXml, "meta", {"name":"cover"});
+
+		if (metaCover) {
+			var coverId = metaCover.getAttribute("content");
+			// var cover = packageXml.querySelector("item[id='" + coverId + "']");
+			var cover = packageXml.getElementById(coverId);
+			return cover ? cover.getAttribute("href") : "";
 		}
 		else {
-			// var node = packageXml.querySelector("item[properties='cover-image']");
-			var node = qsp(packageXml, "item", {"properties":"cover-image"});
-			return node ? node.getAttribute("href") : "";
+			return false;
 		}
 	}