mirror/advplyr.audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-08-02 01:05:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Change: Using posix file paths, Change: njodb version bump, Change: Ignore directories and files starting with . #169

Browse source
This commit is contained in:
advplyr 2021-11-06 17:26:44 -05:00
parent 36d7c04d21
commit 28ccd4e568
13 changed files with 201 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

70
server/Db.js
View file

@ -201,11 +201,6 @@ class Db {
return true
}).catch((error) => {
Logger.error(`[DB] Update entity ${entityName} Failed: ${error}`)
if (error && error.code === 'ENOENT') {
this.attemptDataRecovery(entityName)
}
return false
})
}
@ -223,71 +218,6 @@ class Db {
})
}
async attemptDataRecovery(entityName) {
var dbDirName = this.getEntityArrayKey(entityName)
var dbdir = Path.join(this.ConfigPath, dbDirName)
console.log('Attempting data recovery for:', dbdir)
var exists = await fs.pathExists(dbdir)
if (!exists) {
console.error('Db dir does not exist', dbdir)
return
}
try {
var dbdatadir = Path.join(dbdir, 'data')
var dbtmpdir = Path.join(dbdir, 'tmp')
var datafiles = await fs.readdir(dbdatadir)
var tempfiles = await fs.readdir(dbtmpdir)
var orphanOld = datafiles.find(df => df.endsWith('.old'))
if (orphanOld) {
// Get data file num
var dbnum = orphanOld.split('.')[1]
console.log('Found orphan json.old', orphanOld, `Num: ${dbnum}`)
var dbDataFilename = `data.${dbnum}.json`
// make sure data.#.json does not already exist
if (datafiles.includes(dbDataFilename)) {
console.warn(`${dbDataFilename} already exists, not recovering`)
return
}
// find temp file that was supposed to be renamed
var matchingTmp = tempfiles.find(tmp => tmp.startsWith(`data.${dbnum}`))
if (matchingTmp) {
console.log('found matching tmp file', matchingTmp)
var tmpfileFullPath = Path.join(dbtmpdir, matchingTmp)
var renameToPath = Path.join(dbdatadir, dbDataFilename)
console.log(`Renamining "${tmpfileFullPath}" => "${renameToPath}"`)
await fs.rename(tmpfileFullPath, renameToPath)
console.log('Data recovery successful -- unlinking old')
var orphanOldPath = Path.join(dbdatadir, orphanOld)
await fs.unlink(orphanOldPath)
console.log('Removed .old file')
// Removing lock dir throws error in proper-lockfile
// var lockdirpath = Path.join(dbdatadir, `data.${dbnum}.json.lock`)
// var lockdirexists = await fs.pathExists(lockdirpath)
// if (lockdirexists) {
// await fs.rmdir(lockdirpath)
// console.log('Removed lock dir')
// } else {
// console.log('No lock dir found', lockdirpath)
// }
}
}
} catch (error) {
console.error('Data recovery failed', error)
}
}
recreateAudiobookDb() {
return this.audiobooksDb.drop().then((results) => {
Logger.info(`[DB] Dropped audiobook db`, results)