Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-04-07 01:15:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove old scanner setting from ServerSettings

Browse Source
This commit is contained in:
advplyr 2023-01-02 12:07:26 -06:00
parent 86bf6bfc62
commit 5410aae8fc
2 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/objects/settings/ServerSettings.js
View File

@ -16,7 +16,6 @@ class ServerSettings {
this.scannerPreferMatchedMetadata = false this.scannerPreferMatchedMetadata = false
this.scannerDisableWatcher = false this.scannerDisableWatcher = false
this.scannerPreferOverdriveMediaMarker = false this.scannerPreferOverdriveMediaMarker = false
this.scannerUseSingleThreadedProber = true
this.scannerUseTone = false this.scannerUseTone = false
// Metadata - choose to store inside users library item folder // Metadata - choose to store inside users library item folder
@ -73,10 +72,6 @@ class ServerSettings {
this.scannerPreferMatchedMetadata = !!settings.scannerPreferMatchedMetadata this.scannerPreferMatchedMetadata = !!settings.scannerPreferMatchedMetadata
this.scannerDisableWatcher = !!settings.scannerDisableWatcher this.scannerDisableWatcher = !!settings.scannerDisableWatcher
this.scannerPreferOverdriveMediaMarker = !!settings.scannerPreferOverdriveMediaMarker this.scannerPreferOverdriveMediaMarker = !!settings.scannerPreferOverdriveMediaMarker
this.scannerUseSingleThreadedProber = !!settings.scannerUseSingleThreadedProber
if (settings.scannerUseSingleThreadedProber === undefined) { // Default to original scanner
this.scannerUseSingleThreadedProber = true
}
this.scannerUseTone = !!settings.scannerUseTone this.scannerUseTone = !!settings.scannerUseTone
this.storeCoverWithItem = !!settings.storeCoverWithItem this.storeCoverWithItem = !!settings.storeCoverWithItem
@ -133,7 +128,6 @@ class ServerSettings {
scannerPreferMatchedMetadata: this.scannerPreferMatchedMetadata, scannerPreferMatchedMetadata: this.scannerPreferMatchedMetadata,
scannerDisableWatcher: this.scannerDisableWatcher, scannerDisableWatcher: this.scannerDisableWatcher,
scannerPreferOverdriveMediaMarker: this.scannerPreferOverdriveMediaMarker, scannerPreferOverdriveMediaMarker: this.scannerPreferOverdriveMediaMarker,
scannerUseSingleThreadedProber: this.scannerUseSingleThreadedProber,
scannerUseTone: this.scannerUseTone, scannerUseTone: this.scannerUseTone,
storeCoverWithItem: this.storeCoverWithItem, storeCoverWithItem: this.storeCoverWithItem,
storeMetadataWithItem: this.storeMetadataWithItem, storeMetadataWithItem: this.storeMetadataWithItem,

60
server/scanner/Scanner.js
View File

@ -210,23 +210,19 @@ class Scanner {
checkRes.libraryItem = libraryItem checkRes.libraryItem = libraryItem
checkRes.scanData = dataFound checkRes.scanData = dataFound
if (global.ServerSettings.scannerUseSingleThreadedProber) { // If this item will go over max size then push current chunk
// If this item will go over max size then push current chunk if (libraryItem.audioFileTotalSize + itemDataToRescanSize > MaxSizePerChunk && itemDataToRescan.length > 0) {
if (libraryItem.audioFileTotalSize + itemDataToRescanSize > MaxSizePerChunk && itemDataToRescan.length > 0) { itemDataToRescanChunks.push(itemDataToRescan)
itemDataToRescanChunks.push(itemDataToRescan) itemDataToRescanSize = 0
itemDataToRescanSize = 0 itemDataToRescan = []
itemDataToRescan = [] }
}
itemDataToRescan.push(checkRes) itemDataToRescan.push(checkRes)
itemDataToRescanSize += libraryItem.audioFileTotalSize itemDataToRescanSize += libraryItem.audioFileTotalSize
if (itemDataToRescanSize >= MaxSizePerChunk) { if (itemDataToRescanSize >= MaxSizePerChunk) {
itemDataToRescanChunks.push(itemDataToRescan) itemDataToRescanChunks.push(itemDataToRescan)
itemDataToRescanSize = 0 itemDataToRescanSize = 0
itemDataToRescan = [] itemDataToRescan = []
}
} else {
itemDataToRescan.push(checkRes)
} }
} else if (libraryScan.findCovers && libraryItem.media.shouldSearchForCover) { // Search cover } else if (libraryScan.findCovers && libraryItem.media.shouldSearchForCover) { // Search cover
@ -250,26 +246,22 @@ class Scanner {
if (!hasMediaFile) { if (!hasMediaFile) {
libraryScan.addLog(LogLevel.WARN, `Item found "${libraryItemDataFound.path}" has no media files`) libraryScan.addLog(LogLevel.WARN, `Item found "${libraryItemDataFound.path}" has no media files`)
} else { } else {
if (global.ServerSettings.scannerUseSingleThreadedProber) { // If this item will go over max size then push current chunk
// If this item will go over max size then push current chunk let mediaFileSize = 0
let mediaFileSize = 0 dataFound.libraryFiles.filter(lf => lf.fileType === 'audio' || lf.fileType === 'video').forEach(lf => mediaFileSize += lf.metadata.size)
dataFound.libraryFiles.filter(lf => lf.fileType === 'audio' || lf.fileType === 'video').forEach(lf => mediaFileSize += lf.metadata.size) if (mediaFileSize + newItemDataToScanSize > MaxSizePerChunk && newItemDataToScan.length > 0) {
if (mediaFileSize + newItemDataToScanSize > MaxSizePerChunk && newItemDataToScan.length > 0) { newItemDataToScanChunks.push(newItemDataToScan)
newItemDataToScanChunks.push(newItemDataToScan) newItemDataToScanSize = 0
newItemDataToScanSize = 0 newItemDataToScan = []
newItemDataToScan = [] }
}
newItemDataToScan.push(dataFound) newItemDataToScan.push(dataFound)
newItemDataToScanSize += mediaFileSize newItemDataToScanSize += mediaFileSize
if (newItemDataToScanSize >= MaxSizePerChunk) { if (newItemDataToScanSize >= MaxSizePerChunk) {
newItemDataToScanChunks.push(newItemDataToScan) newItemDataToScanChunks.push(newItemDataToScan)
newItemDataToScanSize = 0 newItemDataToScanSize = 0
newItemDataToScan = [] newItemDataToScan = []
}
} else { // Chunking is not necessary for new scanner
newItemDataToScan.push(dataFound)
} }
} }
} }