Archive/rdio-scanner
1
0
Fork 0
mirror of https://github.com/chuot/rdio-scanner.git synced 2026-08-13 16:33:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dirWatch[].deleteAfter=true not always being deleted

Browse source
This commit is contained in:
Chrystian Huot 2020-05-20 15:48:03 -04:00
parent aa7d17443e
commit 51c6c5a4ce
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
server/lib/rdio-scanner/dir-watch.js
View file

@ -99,10 +99,10 @@ class DirWatch {
await metaWatcher.close(); await metaWatcher.close();
let meta;
try { try {
meta = JSON.parse(fs.readFileSync(metaFile, 'utf8')); const meta = JSON.parse(fs.readFileSync(metaFile, 'utf8'));
await this.app.controller.importTrunkRecorder(audio, audioName, audioType, system, meta);
} catch (error) { } catch (error) {
console.error(`Error loading file ${metaFile}`); console.error(`Error loading file ${metaFile}`);
@ -110,12 +110,8 @@ class DirWatch {
return; return;
} }
if (meta) { if (dirWatch.deleteAfter) {
await this.app.controller.importTrunkRecorder(audio, audioName, audioType, system, meta); this.unlink(metaFile);
if (dirWatch.deleteAfter) {
this.unlink(metaFile);
}
} }
}); });
@ -138,10 +134,10 @@ class DirWatch {
await metaWatcher.close(); await metaWatcher.close();
let meta;
try { try {
meta = JSON.parse(fs.readFileSync(metaFile, 'utf8')); const meta = JSON.parse(fs.readFileSync(metaFile, 'utf8'));
await this.app.controller.importSdrtrunk(audio, audioName, audioType, system, meta);
} catch (error) { } catch (error) {
console.error(`Error loading file ${metaFile}`); console.error(`Error loading file ${metaFile}`);
@ -149,8 +145,6 @@ class DirWatch {
return; return;
} }
await this.app.controller.importSdrtrunk(audio, audioName, audioType, system, meta);
if (dirWatch.deleteAfter) { if (dirWatch.deleteAfter) {
this.unlink(metaFile); this.unlink(metaFile);
} }
@ -185,7 +179,7 @@ class DirWatch {
unlink(filename) { unlink(filename) {
try { try {
fs.unlinkSync(filename); setTimeout(() => fs.unlinkSync(filename), 1000);
} catch (error) { } catch (error) {
console.error(`Unable to delete ${filename}`); console.error(`Unable to delete ${filename}`);