A local-first personal finance app
Respect configuration for user-files
James Long8aeb815b5a51
diff --git a/app-sync.js b/app-sync.jsindex 60af7f1214..dd0aec3ddf 100644--- a/app-sync.js+++ b/app-sync.js@@ -16,17 +16,8 @@ let SyncPb = actual.internal.SyncProtoBuf;const app = express();app.use(errorMiddleware);-async function init() {- let fileDir = join(process.env.ACTUAL_USER_FILES || config.userFiles);-- console.log('Initializing Actual with user file dir:', fileDir);-- await actual.init({- config: {- dataDir: fileDir- }- });-}+// eslint-disable-next-line+async function init() {}// This is a version representing the internal format of sync// messages. When this changes, all sync files need to be reset. Wediff --git a/load-config.js b/load-config.jsindex 719d778995..35c3c38ec4 100644--- a/load-config.js+++ b/load-config.js@@ -16,4 +16,7 @@ try {};}+// The env variable always takes precedence+config.userFiles = process.env.ACTUAL_USER_FILES || config.userFiles;+module.exports = config;diff --git a/sync-simple.js b/sync-simple.jsindex a88f188c18..d267b12428 100644--- a/sync-simple.js+++ b/sync-simple.js@@ -1,6 +1,7 @@let { existsSync, readFileSync } = require('fs');let { join } = require('path');let { openDatabase } = require('./db');+let config = require('./load-config');let actual = require('@actual-app/api');let merkle = actual.internal.merkle;@@ -8,7 +9,7 @@ let SyncPb = actual.internal.SyncProtoBuf;let Timestamp = actual.internal.timestamp.default;function getGroupDb(groupId) {- let path = join(__dirname, `user-files/${groupId}.sqlite`);+ let path = join(config.userFiles, `${groupId}.sqlite`);let needsInit = !existsSync(path);let db = openDatabase(path);