mirror of
				https://github.com/advplyr/audiobookshelf.git
				synced 2025-11-02 18:37:01 -05:00 
			
		
		
		
	Merge branch 'master' of https://github.com/advplyr/audiobookshelf
This commit is contained in:
		
						commit
						8330dabc46
					
				@ -2,7 +2,7 @@ const { parseNfoMetadata } = require('../utils/parsers/parseNfoMetadata')
 | 
				
			|||||||
const { readTextFile } = require('../utils/fileUtils')
 | 
					const { readTextFile } = require('../utils/fileUtils')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class NfoFileScanner {
 | 
					class NfoFileScanner {
 | 
				
			||||||
  constructor() { }
 | 
					  constructor() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /**
 | 
					  /**
 | 
				
			||||||
   * Parse metadata from .nfo file found in library scan and update bookMetadata
 | 
					   * Parse metadata from .nfo file found in library scan and update bookMetadata
 | 
				
			||||||
@ -15,11 +15,13 @@ class NfoFileScanner {
 | 
				
			|||||||
    const nfoMetadata = nfoText ? await parseNfoMetadata(nfoText) : null
 | 
					    const nfoMetadata = nfoText ? await parseNfoMetadata(nfoText) : null
 | 
				
			||||||
    if (nfoMetadata) {
 | 
					    if (nfoMetadata) {
 | 
				
			||||||
      for (const key in nfoMetadata) {
 | 
					      for (const key in nfoMetadata) {
 | 
				
			||||||
        if (key === 'tags') { // Add tags only if tags are empty
 | 
					        if (key === 'tags') {
 | 
				
			||||||
 | 
					          // Add tags only if tags are empty
 | 
				
			||||||
          if (nfoMetadata.tags.length) {
 | 
					          if (nfoMetadata.tags.length) {
 | 
				
			||||||
            bookMetadata.tags = nfoMetadata.tags
 | 
					            bookMetadata.tags = nfoMetadata.tags
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        } else if (key === 'genres') { // Add genres only if genres are empty
 | 
					        } else if (key === 'genres') {
 | 
				
			||||||
 | 
					          // Add genres only if genres are empty
 | 
				
			||||||
          if (nfoMetadata.genres.length) {
 | 
					          if (nfoMetadata.genres.length) {
 | 
				
			||||||
            bookMetadata.genres = nfoMetadata.genres
 | 
					            bookMetadata.genres = nfoMetadata.genres
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
@ -33,10 +35,12 @@ class NfoFileScanner {
 | 
				
			|||||||
          }
 | 
					          }
 | 
				
			||||||
        } else if (key === 'series') {
 | 
					        } else if (key === 'series') {
 | 
				
			||||||
          if (nfoMetadata.series) {
 | 
					          if (nfoMetadata.series) {
 | 
				
			||||||
            bookMetadata.series = [{
 | 
					            bookMetadata.series = [
 | 
				
			||||||
 | 
					              {
 | 
				
			||||||
                name: nfoMetadata.series,
 | 
					                name: nfoMetadata.series,
 | 
				
			||||||
                sequence: nfoMetadata.sequence || null
 | 
					                sequence: nfoMetadata.sequence || null
 | 
				
			||||||
            }]
 | 
					              }
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        } else if (nfoMetadata[key] && key !== 'sequence') {
 | 
					        } else if (nfoMetadata[key] && key !== 'sequence') {
 | 
				
			||||||
          bookMetadata[key] = nfoMetadata[key]
 | 
					          bookMetadata[key] = nfoMetadata[key]
 | 
				
			||||||
 | 
				
			|||||||
@ -81,6 +81,10 @@ function parseNfoMetadata(nfoText) {
 | 
				
			|||||||
        case 'isbn-13':
 | 
					        case 'isbn-13':
 | 
				
			||||||
          metadata.isbn = value
 | 
					          metadata.isbn = value
 | 
				
			||||||
          break
 | 
					          break
 | 
				
			||||||
 | 
					        case 'language':
 | 
				
			||||||
 | 
					        case 'lang':
 | 
				
			||||||
 | 
					          metadata.language = value
 | 
				
			||||||
 | 
					          break
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  })
 | 
					  })
 | 
				
			||||||
 | 
				
			|||||||
@ -103,6 +103,16 @@ describe('parseNfoMetadata', () => {
 | 
				
			|||||||
    expect(result.asin).to.equal('B08X5JZJLH')
 | 
					    expect(result.asin).to.equal('B08X5JZJLH')
 | 
				
			||||||
  })
 | 
					  })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  it('parses language', () => {
 | 
				
			||||||
 | 
					    const nfoText = 'Language: eng'
 | 
				
			||||||
 | 
					    const result = parseNfoMetadata(nfoText)
 | 
				
			||||||
 | 
					    expect(result.language).to.equal('eng')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const nfoText2 = 'lang: deu'
 | 
				
			||||||
 | 
					    const result2 = parseNfoMetadata(nfoText2)
 | 
				
			||||||
 | 
					    expect(result2.language).to.equal('deu')
 | 
				
			||||||
 | 
					  })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  it('parses description', () => {
 | 
					  it('parses description', () => {
 | 
				
			||||||
    const nfoText = 'Book Description\n=========\nThis is a book.\n It\'s good'
 | 
					    const nfoText = 'Book Description\n=========\nThis is a book.\n It\'s good'
 | 
				
			||||||
    const result = parseNfoMetadata(nfoText)
 | 
					    const result = parseNfoMetadata(nfoText)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user