diff --git a/server/scanner/OpfFileScanner.js b/server/scanner/OpfFileScanner.js
index abc2540ac..87c4f5659 100644
--- a/server/scanner/OpfFileScanner.js
+++ b/server/scanner/OpfFileScanner.js
@@ -32,11 +32,8 @@ class OpfFileScanner {
bookMetadata.narrators = opfMetadata.narrators
}
} else if (key === 'series') {
- if (opfMetadata.series) {
- bookMetadata.series = [{
- name: opfMetadata.series,
- sequence: opfMetadata.sequence || null
- }]
+ if (opfMetadata.series?.length) {
+ bookMetadata.series = opfMetadata.series
}
} else if (opfMetadata[key] && key !== 'sequence') {
bookMetadata[key] = opfMetadata[key]
diff --git a/server/utils/parsers/parseOpfMetadata.js b/server/utils/parsers/parseOpfMetadata.js
index d5fb4651c..4c057197a 100644
--- a/server/utils/parsers/parseOpfMetadata.js
+++ b/server/utils/parsers/parseOpfMetadata.js
@@ -100,13 +100,20 @@ function fetchLanguage(metadata) {
}
function fetchSeries(metadataMeta) {
- if (!metadataMeta) return null
- return fetchTagString(metadataMeta, "calibre:series")
-}
-
-function fetchVolumeNumber(metadataMeta) {
- if (!metadataMeta) return null
- return fetchTagString(metadataMeta, "calibre:series_index")
+ if (!metadataMeta) return []
+ const result = []
+ for (let i = 0; i < metadataMeta.length; i++) {
+ if (metadataMeta[i].$.name === "calibre:series") {
+ const name = metadataMeta[i].$.content
+ let sequence = null
+ if (i + 1 < metadataMeta.length &&
+ metadataMeta[i + 1].$.name === "calibre:series_index" && metadataMeta[i + 1].$.content) {
+ sequence = metadataMeta[i + 1].$.content
+ }
+ result.push({ name, sequence })
+ }
+ }
+ return result
}
function fetchNarrators(creators, metadata) {
@@ -173,8 +180,7 @@ module.exports.parseOpfMetadataXML = async (xml) => {
description: fetchDescription(metadata),
genres: fetchGenres(metadata),
language: fetchLanguage(metadata),
- series: fetchSeries(metadata.meta),
- sequence: fetchVolumeNumber(metadata.meta),
+ series: fetchSeries(metadataMeta),
tags: fetchTags(metadata)
}
return data
diff --git a/test/server/utils/parsers/parseOpfMetadata.test.js b/test/server/utils/parsers/parseOpfMetadata.test.js
new file mode 100644
index 000000000..c07322733
--- /dev/null
+++ b/test/server/utils/parsers/parseOpfMetadata.test.js
@@ -0,0 +1,85 @@
+const chai = require('chai')
+const expect = chai.expect
+const { parseOpfMetadataXML } = require('../../../../server/utils/parsers/parseOpfMetadata')
+
+
+describe('parseOpfMetadata - test series', async () => {
+ it('test one serie', async() => {
+ const opf = `
+
+
+
+
+
+
+
+ `
+ const parsedOpf = await parseOpfMetadataXML(opf)
+ expect(parsedOpf.series).to.deep.equal([{"name": "Serie","sequence": "1"}])
+ })
+
+ it('test more then 1 serie - in correct order', async() => {
+ const opf = `
+
+
+
+
+
+
+
+
+
+
+
+ `
+ const parsedOpf = await parseOpfMetadataXML(opf)
+ expect(parsedOpf.series).to.deep.equal([
+ {"name": "Serie 1","sequence": "1"},
+ {"name": "Serie 2","sequence": "2"},
+ {"name": "Serie 3","sequence": "3"},
+ ])
+ })
+
+ it('test messed order of series content and index', async() => {
+ const opf = `
+
+
+
+
+
+
+
+
+
+
+ `
+ const parsedOpf = await parseOpfMetadataXML(opf)
+ expect(parsedOpf.series).to.deep.equal([
+ {"name": "Serie 1","sequence": "1"},
+ {"name": "Serie 3","sequence": null},
+ ])
+ })
+
+ it('test different values of series content and index', async() => {
+ const opf = `
+
+
+
+
+
+
+
+
+
+
+
+ `
+ const parsedOpf = await parseOpfMetadataXML(opf)
+ // console.log(JSON.stringify(parsedOpf, null, 4))
+ expect(parsedOpf.series).to.deep.equal([
+ {"name": "Serie 1", "sequence": null},
+ {"name": "Serie 2", "sequence": "abc"},
+ {"name": "Serie 3", "sequence": null},
+ ])
+ })
+})