better handling all around for files and symlinks
This commit is contained in:
1
db/.gitignore
vendored
1
db/.gitignore
vendored
@@ -1,2 +1 @@
|
||||
strimserve.db
|
||||
stream_json
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import Database from 'better-sqlite3';
|
||||
import dotenv from 'dotenv';
|
||||
|
||||
const jsonFolder = './stream_json/';
|
||||
dotenv.config({ path: '../.env' });
|
||||
const jsonFolder = path.resolve(process.env.STREAM_JSON_LOCATION);
|
||||
const dbName = 'strimserve.db';
|
||||
const db = new Database(dbName);
|
||||
|
||||
@@ -36,10 +39,10 @@ fs.readdir(jsonFolder, (err, files) => {
|
||||
if (!file.endsWith('.json')) return;
|
||||
if (file.endsWith('.sideload.json')) return;
|
||||
|
||||
const jsonString = fs.readFileSync(jsonFolder + file, 'utf8');
|
||||
const jsonString = fs.readFileSync(path.join(jsonFolder, file), 'utf8');
|
||||
let jsonData = JSON.parse(jsonString);
|
||||
|
||||
const sideloadPath = jsonFolder + file.slice(0, -5) + ".sideload.json";
|
||||
const sideloadPath = path.join(jsonFolder, file.slice(0, -5) + ".sideload.json");
|
||||
if (fs.existsSync(sideloadPath, 'utf8')) {
|
||||
const sideloadData = JSON.parse(fs.readFileSync(sideloadPath));
|
||||
jsonData = { ...jsonData, ...sideloadData };
|
||||
|
||||
Reference in New Issue
Block a user