Scanner now scans one album at a time
This commit is contained in:
parent
fe370003c4
commit
d72a65be53
|
@ -2,7 +2,7 @@ export default function scanAll({ driver, scanUser }) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let session = driver.session()
|
let session = driver.session()
|
||||||
|
|
||||||
let allUserScans = []
|
let usersToScan = []
|
||||||
|
|
||||||
session.run('MATCH (u:User) return u').subscribe({
|
session.run('MATCH (u:User) return u').subscribe({
|
||||||
onNext: record => {
|
onNext: record => {
|
||||||
|
@ -13,21 +13,21 @@ export default function scanAll({ driver, scanUser }) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
allUserScans.push(
|
usersToScan.push(user)
|
||||||
scanUser(user).catch(reason => {
|
},
|
||||||
|
onCompleted: async () => {
|
||||||
|
session.close()
|
||||||
|
|
||||||
|
for (let user of usersToScan) {
|
||||||
|
try {
|
||||||
|
await scanUser(user)
|
||||||
|
} catch (reason) {
|
||||||
console.log(
|
console.log(
|
||||||
`User scan exception for user ${user.username} ${reason}`
|
`User scan exception for user ${user.username} ${reason}`
|
||||||
)
|
)
|
||||||
reject(reason)
|
reject(reason)
|
||||||
})
|
}
|
||||||
)
|
}
|
||||||
},
|
|
||||||
onCompleted: () => {
|
|
||||||
session.close()
|
|
||||||
|
|
||||||
Promise.all(allUserScans).then(() => {
|
|
||||||
resolve()
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
onError: error => {
|
onError: error => {
|
||||||
session.close()
|
session.close()
|
||||||
|
|
|
@ -7,7 +7,6 @@ export default async function scanUser({ driver, scanAlbum }, user) {
|
||||||
console.log('Scanning user', user.username, 'at', user.path)
|
console.log('Scanning user', user.username, 'at', user.path)
|
||||||
|
|
||||||
let foundAlbumIds = []
|
let foundAlbumIds = []
|
||||||
let albumScanPromises = []
|
|
||||||
|
|
||||||
async function scanPath(path, parentAlbum) {
|
async function scanPath(path, parentAlbum) {
|
||||||
console.log('SCAN PATH', path)
|
console.log('SCAN PATH', path)
|
||||||
|
@ -52,7 +51,7 @@ export default async function scanUser({ driver, scanAlbum }, user) {
|
||||||
foundImageOrAlbum = true
|
foundImageOrAlbum = true
|
||||||
nextParentAlbum = album.id
|
nextParentAlbum = album.id
|
||||||
foundAlbumIds.push(album.id)
|
foundAlbumIds.push(album.id)
|
||||||
albumScanPromises.push(scanAlbum(album))
|
await scanAlbum(album)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -108,7 +107,7 @@ export default async function scanUser({ driver, scanAlbum }, user) {
|
||||||
}
|
}
|
||||||
|
|
||||||
foundAlbumIds.push(album.id)
|
foundAlbumIds.push(album.id)
|
||||||
albumScanPromises.push(scanAlbum(album))
|
await scanAlbum(album)
|
||||||
|
|
||||||
session.close()
|
session.close()
|
||||||
}
|
}
|
||||||
|
@ -155,7 +154,5 @@ export default async function scanUser({ driver, scanAlbum }, user) {
|
||||||
|
|
||||||
session.close()
|
session.close()
|
||||||
|
|
||||||
await Promise.all(albumScanPromises)
|
|
||||||
|
|
||||||
console.log('User scan complete')
|
console.log('User scan complete')
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue