tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/packages/server/src/api.js b/packages/server/src/api.js
2index bd43842..71ce7c9 100644
3--- a/packages/server/src/api.js
4+++ b/packages/server/src/api.js
5@@ -105,7 +105,7 @@ module.exports = new class Api {
6 }
7
8 // If not then it's possible the default image is not quite the correct aspect ratio
9- const buffer = FileInfo.create(`${config.previewDirectory}/default.jpg`).toBuffer();
10+ const buffer = FileInfo.create('NIX_OUT_PLACEHOLDER/lib/node_modules/scanservjs-api/data/preview/default.jpg').toBuffer();
11
12 try {
13 // We need to know the correct aspect ratio from the device
14diff --git a/packages/server/src/application.js b/packages/server/src/application.js
15index 2771036..0c2a4c0 100644
16--- a/packages/server/src/application.js
17+++ b/packages/server/src/application.js
18@@ -26,7 +26,7 @@ module.exports = new class Application {
19
20 userOptions() {
21 if (this._userOptions === null) {
22- this._userOptions = new UserOptions('../../config/config.local.js');
23+ this._userOptions = new UserOptions(process.env.NIX_SCANSERVJS_CONFIG_PATH);
24 }
25 return this._userOptions;
26 }
27diff --git a/packages/server/src/classes/user-options.js b/packages/server/src/classes/user-options.js
28index f129e3c..c71e754 100644
29--- a/packages/server/src/classes/user-options.js
30+++ b/packages/server/src/classes/user-options.js
31@@ -4,7 +4,7 @@ const path = require('path');
32 module.exports = class UserOptions {
33 constructor(localConfigPath) {
34 if (localConfigPath) {
35- const localPath = path.join(__dirname, localConfigPath);
36+ const localPath = localConfigPath;
37 if (fs.existsSync(localPath)) {
38 this.local = require(localPath);
39 }
40diff --git a/packages/server/src/configure.js b/packages/server/src/configure.js
41index c9e5ed8..484949c 100644
42--- a/packages/server/src/configure.js
43+++ b/packages/server/src/configure.js
44@@ -71,6 +71,7 @@ function initialize(rootPath) {
45
46 try {
47 fs.mkdirSync(config.outputDirectory, { recursive: true });
48+ fs.mkdirSync(config.previewDirectory, { recursive: true });
49 fs.mkdirSync(config.tempDirectory, { recursive: true });
50 } catch (exception) {
51 log.warn(`Error ensuring output and temp directories exist: ${exception}`);
52diff --git a/packages/server/src/server.js b/packages/server/src/server.js
53index e1a9fb0..3d58d37 100644
54--- a/packages/server/src/server.js
55+++ b/packages/server/src/server.js
56@@ -5,7 +5,7 @@ const configure = require('./configure');
57 const config = application.config();
58 const app = express();
59
60-app.use(express.static('client'));
61+app.use(express.static('@client@'));
62
63 configure(app);
64