mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2025-01-08 00:08:14 +01:00
Remove old audio file scanner
This commit is contained in:
advplyr
parent
3c5bf376b5
commit
d11f9608b4
@ -111,7 +111,7 @@ class AudioFile {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// New scanner creates AudioFile from AudioFileScanner
|
// New scanner creates AudioFile from MediaFileScanner
|
||||||
setDataFromProbe(libraryFile, probeData) {
|
setDataFromProbe(libraryFile, probeData) {
|
||||||
this.ino = libraryFile.ino || null
|
this.ino = libraryFile.ino || null
|
||||||
|
|
||||||
|
|||||||
@ -1,249 +0,0 @@
|
|||||||
const Path = require('path')
|
|
||||||
|
|
||||||
const AudioFile = require('../objects/files/AudioFile')
|
|
||||||
|
|
||||||
const prober = require('../utils/prober')
|
|
||||||
const Logger = require('../Logger')
|
|
||||||
const { LogLevel } = require('../utils/constants')
|
|
||||||
|
|
||||||
class AudioFileScanner {
|
|
||||||
constructor() { }
|
|
||||||
|
|
||||||
getTrackAndDiscNumberFromFilename(mediaMetadataFromScan, audioLibraryFile) {
|
|
||||||
const { title, author, series, publishedYear } = mediaMetadataFromScan
|
|
||||||
const { filename, path } = audioLibraryFile.metadata
|
|
||||||
var partbasename = Path.basename(filename, Path.extname(filename))
|
|
||||||
|
|
||||||
// Remove title, author, series, and publishedYear from filename if there
|
|
||||||
if (title) partbasename = partbasename.replace(title, '')
|
|
||||||
if (author) partbasename = partbasename.replace(author, '')
|
|
||||||
if (series) partbasename = partbasename.replace(series, '')
|
|
||||||
if (publishedYear) partbasename = partbasename.replace(publishedYear)
|
|
||||||
|
|
||||||
// Look for disc number
|
|
||||||
var discNumber = null
|
|
||||||
var discMatch = partbasename.match(/\b(disc|cd) ?(\d\d?)\b/i)
|
|
||||||
if (discMatch && discMatch.length > 2 && discMatch[2]) {
|
|
||||||
if (!isNaN(discMatch[2])) {
|
|
||||||
discNumber = Number(discMatch[2])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove disc number from filename
|
|
||||||
partbasename = partbasename.replace(/\b(disc|cd) ?(\d\d?)\b/i, '')
|
|
||||||
}
|
|
||||||
|
|
||||||
// Look for disc number in folder path e.g. /Book Title/CD01/audiofile.mp3
|
|
||||||
var pathdir = Path.dirname(path).split('/').pop()
|
|
||||||
if (pathdir && /^cd\d{1,3}$/i.test(pathdir)) {
|
|
||||||
var discFromFolder = Number(pathdir.replace(/cd/i, ''))
|
|
||||||
if (!isNaN(discFromFolder) && discFromFolder !== null) discNumber = discFromFolder
|
|
||||||
}
|
|
||||||
|
|
||||||
var numbersinpath = partbasename.match(/\d{1,4}/g)
|
|
||||||
var trackNumber = numbersinpath && numbersinpath.length ? parseInt(numbersinpath[0]) : null
|
|
||||||
return {
|
|
||||||
trackNumber,
|
|
||||||
discNumber
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getAverageScanDurationMs(results) {
|
|
||||||
if (!results.length) return 0
|
|
||||||
var total = 0
|
|
||||||
for (let i = 0; i < results.length; i++) total += results[i].elapsed
|
|
||||||
return Math.floor(total / results.length)
|
|
||||||
}
|
|
||||||
|
|
||||||
async scan(mediaType, audioLibraryFile, mediaMetadataFromScan, verbose = false) {
|
|
||||||
var probeStart = Date.now()
|
|
||||||
var probeData = await prober.probe(audioLibraryFile.metadata.path, verbose)
|
|
||||||
if (probeData.error) {
|
|
||||||
Logger.error(`[AudioFileScanner] ${probeData.error} : "${audioLibraryFile.metadata.path}"`)
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
var audioFile = new AudioFile()
|
|
||||||
audioFile.trackNumFromMeta = probeData.trackNumber
|
|
||||||
audioFile.discNumFromMeta = probeData.discNumber
|
|
||||||
if (mediaType === 'book') {
|
|
||||||
const { trackNumber, discNumber } = this.getTrackAndDiscNumberFromFilename(mediaMetadataFromScan, audioLibraryFile)
|
|
||||||
audioFile.trackNumFromFilename = trackNumber
|
|
||||||
audioFile.discNumFromFilename = discNumber
|
|
||||||
}
|
|
||||||
audioFile.setDataFromProbe(audioLibraryFile, probeData)
|
|
||||||
|
|
||||||
return {
|
|
||||||
audioFile,
|
|
||||||
elapsed: Date.now() - probeStart
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns array of { AudioFile, elapsed, averageScanDuration } from audio file scan objects
|
|
||||||
async executeAudioFileScans(mediaType, audioLibraryFiles, scanData) {
|
|
||||||
var mediaMetadataFromScan = scanData.media.metadata || null
|
|
||||||
var proms = []
|
|
||||||
for (let i = 0; i < audioLibraryFiles.length; i++) {
|
|
||||||
proms.push(this.scan(mediaType, audioLibraryFiles[i], mediaMetadataFromScan))
|
|
||||||
}
|
|
||||||
var scanStart = Date.now()
|
|
||||||
var results = await Promise.all(proms).then((scanResults) => scanResults.filter(sr => sr))
|
|
||||||
return {
|
|
||||||
audioFiles: results.map(r => r.audioFile),
|
|
||||||
elapsed: Date.now() - scanStart,
|
|
||||||
averageScanDuration: this.getAverageScanDurationMs(results)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isSequential(nums) {
|
|
||||||
if (!nums || !nums.length) return false
|
|
||||||
if (nums.length === 1) return true
|
|
||||||
var prev = nums[0]
|
|
||||||
for (let i = 1; i < nums.length; i++) {
|
|
||||||
if (nums[i] - prev > 1) return false
|
|
||||||
prev = nums[i]
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
removeDupes(nums) {
|
|
||||||
if (!nums || !nums.length) return []
|
|
||||||
if (nums.length === 1) return nums
|
|
||||||
|
|
||||||
var nodupes = [nums[0]]
|
|
||||||
nums.forEach((num) => {
|
|
||||||
if (num > nodupes[nodupes.length - 1]) nodupes.push(num)
|
|
||||||
})
|
|
||||||
return nodupes
|
|
||||||
}
|
|
||||||
|
|
||||||
runSmartTrackOrder(libraryItem, audioFiles) {
|
|
||||||
var discsFromFilename = []
|
|
||||||
var tracksFromFilename = []
|
|
||||||
var discsFromMeta = []
|
|
||||||
var tracksFromMeta = []
|
|
||||||
|
|
||||||
audioFiles.forEach((af) => {
|
|
||||||
if (af.discNumFromFilename !== null) discsFromFilename.push(af.discNumFromFilename)
|
|
||||||
if (af.discNumFromMeta !== null) discsFromMeta.push(af.discNumFromMeta)
|
|
||||||
if (af.trackNumFromFilename !== null) tracksFromFilename.push(af.trackNumFromFilename)
|
|
||||||
if (af.trackNumFromMeta !== null) tracksFromMeta.push(af.trackNumFromMeta)
|
|
||||||
af.validateTrackIndex() // Sets error if no valid track number
|
|
||||||
})
|
|
||||||
discsFromFilename.sort((a, b) => a - b)
|
|
||||||
discsFromMeta.sort((a, b) => a - b)
|
|
||||||
tracksFromFilename.sort((a, b) => a - b)
|
|
||||||
tracksFromMeta.sort((a, b) => a - b)
|
|
||||||
|
|
||||||
var discKey = null
|
|
||||||
if (discsFromMeta.length === audioFiles.length && this.isSequential(discsFromMeta)) {
|
|
||||||
discKey = 'discNumFromMeta'
|
|
||||||
} else if (discsFromFilename.length === audioFiles.length && this.isSequential(discsFromFilename)) {
|
|
||||||
discKey = 'discNumFromFilename'
|
|
||||||
}
|
|
||||||
|
|
||||||
var trackKey = null
|
|
||||||
tracksFromFilename = this.removeDupes(tracksFromFilename)
|
|
||||||
tracksFromMeta = this.removeDupes(tracksFromMeta)
|
|
||||||
if (tracksFromFilename.length > tracksFromMeta.length) {
|
|
||||||
trackKey = 'trackNumFromFilename'
|
|
||||||
} else {
|
|
||||||
trackKey = 'trackNumFromMeta'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (discKey !== null) {
|
|
||||||
Logger.debug(`[AudioFileScanner] Smart track order for "${libraryItem.media.metadata.title}" using disc key ${discKey} and track key ${trackKey}`)
|
|
||||||
audioFiles.sort((a, b) => {
|
|
||||||
let Dx = a[discKey] - b[discKey]
|
|
||||||
if (Dx === 0) Dx = a[trackKey] - b[trackKey]
|
|
||||||
return Dx
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
Logger.debug(`[AudioFileScanner] Smart track order for "${libraryItem.media.metadata.title}" using track key ${trackKey}`)
|
|
||||||
audioFiles.sort((a, b) => a[trackKey] - b[trackKey])
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i = 0; i < audioFiles.length; i++) {
|
|
||||||
audioFiles[i].index = i + 1
|
|
||||||
var existingAF = libraryItem.media.findFileWithInode(audioFiles[i].ino)
|
|
||||||
if (existingAF) {
|
|
||||||
if (existingAF.updateFromScan) existingAF.updateFromScan(audioFiles[i])
|
|
||||||
} else {
|
|
||||||
libraryItem.media.addAudioFile(audioFiles[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async scanAudioFiles(audioLibraryFiles, scanData, libraryItem, preferAudioMetadata, libraryScan = null) {
|
|
||||||
var hasUpdated = false
|
|
||||||
|
|
||||||
var audioScanResult = await this.executeAudioFileScans(libraryItem.mediaType, audioLibraryFiles, scanData)
|
|
||||||
if (audioScanResult.audioFiles.length) {
|
|
||||||
if (libraryScan) {
|
|
||||||
libraryScan.addLog(LogLevel.DEBUG, `Library Item "${scanData.path}" Audio file scan took ${audioScanResult.elapsed}ms for ${audioScanResult.audioFiles.length} with average time of ${audioScanResult.averageScanDuration}ms`)
|
|
||||||
}
|
|
||||||
|
|
||||||
var totalAudioFilesToInclude = audioScanResult.audioFiles.length
|
|
||||||
var newAudioFiles = audioScanResult.audioFiles.filter(af => {
|
|
||||||
return !libraryItem.media.findFileWithInode(af.ino)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Book: Adding audio files to book media
|
|
||||||
if (libraryItem.mediaType === 'book') {
|
|
||||||
if (newAudioFiles.length) {
|
|
||||||
// Single Track Audiobooks
|
|
||||||
if (totalAudioFilesToInclude === 1) {
|
|
||||||
var af = audioScanResult.audioFiles[0]
|
|
||||||
af.index = 1
|
|
||||||
libraryItem.media.addAudioFile(af)
|
|
||||||
hasUpdated = true
|
|
||||||
} else {
|
|
||||||
this.runSmartTrackOrder(libraryItem, audioScanResult.audioFiles)
|
|
||||||
hasUpdated = true
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Only update metadata not index
|
|
||||||
audioScanResult.audioFiles.forEach((af) => {
|
|
||||||
var existingAF = libraryItem.media.findFileWithInode(af.ino)
|
|
||||||
if (existingAF) {
|
|
||||||
af.index = existingAF.index
|
|
||||||
if (existingAF.updateFromScan && existingAF.updateFromScan(af)) {
|
|
||||||
hasUpdated = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set book details from audio file ID3 tags, optional prefer
|
|
||||||
if (libraryItem.media.setMetadataFromAudioFile(preferAudioMetadata)) {
|
|
||||||
hasUpdated = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasUpdated) {
|
|
||||||
libraryItem.media.rebuildTracks()
|
|
||||||
}
|
|
||||||
} else { // Podcast Media Type
|
|
||||||
var existingAudioFiles = audioScanResult.audioFiles.filter(af => libraryItem.media.findFileWithInode(af.ino))
|
|
||||||
|
|
||||||
if (newAudioFiles.length) {
|
|
||||||
var newIndex = libraryItem.media.episodes.length + 1
|
|
||||||
newAudioFiles.forEach((newAudioFile) => {
|
|
||||||
libraryItem.media.addNewEpisodeFromAudioFile(newAudioFile, newIndex++)
|
|
||||||
})
|
|
||||||
libraryItem.media.reorderEpisodes()
|
|
||||||
hasUpdated = true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update audio file metadata for audio files already there
|
|
||||||
existingAudioFiles.forEach((af) => {
|
|
||||||
var peAudioFile = libraryItem.media.findFileWithInode(af.ino)
|
|
||||||
if (peAudioFile.updateFromScan && peAudioFile.updateFromScan(af)) {
|
|
||||||
hasUpdated = true
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasUpdated
|
|
||||||
}
|
|
||||||
}
|
|
||||||
module.exports = new AudioFileScanner()
|
|
||||||
@ -173,14 +173,14 @@ class MediaFileScanner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (discKey !== null) {
|
if (discKey !== null) {
|
||||||
Logger.debug(`[AudioFileScanner] Smart track order for "${libraryItem.media.metadata.title}" using disc key ${discKey} and track key ${trackKey}`)
|
Logger.debug(`[MediaFileScanner] Smart track order for "${libraryItem.media.metadata.title}" using disc key ${discKey} and track key ${trackKey}`)
|
||||||
audioFiles.sort((a, b) => {
|
audioFiles.sort((a, b) => {
|
||||||
let Dx = a[discKey] - b[discKey]
|
let Dx = a[discKey] - b[discKey]
|
||||||
if (Dx === 0) Dx = a[trackKey] - b[trackKey]
|
if (Dx === 0) Dx = a[trackKey] - b[trackKey]
|
||||||
return Dx
|
return Dx
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
Logger.debug(`[AudioFileScanner] Smart track order for "${libraryItem.media.metadata.title}" using track key ${trackKey}`)
|
Logger.debug(`[MediaFileScanner] Smart track order for "${libraryItem.media.metadata.title}" using track key ${trackKey}`)
|
||||||
audioFiles.sort((a, b) => a[trackKey] - b[trackKey])
|
audioFiles.sort((a, b) => a[trackKey] - b[trackKey])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user