diff options
-rw-r--r-- | electron-builder.yml | 1 | ||||
-rw-r--r-- | src/api/server/ServerApi.js | 5 | ||||
-rw-r--r-- | src/config.js | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/electron-builder.yml b/electron-builder.yml index 764b3e144..e95eb47b7 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -53,4 +53,5 @@ protocols: | |||
53 | 53 | ||
54 | asarUnpack: | 54 | asarUnpack: |
55 | - ./dictionaries | 55 | - ./dictionaries |
56 | - ./recipes | ||
56 | - ./assets/images/taskbar | 57 | - ./assets/images/taskbar |
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 663c2716f..02f6b389d 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -13,9 +13,9 @@ import UserModel from '../../models/User'; | |||
13 | import OrderModel from '../../models/Order'; | 13 | import OrderModel from '../../models/Order'; |
14 | 14 | ||
15 | import { sleep } from '../../helpers/async-helpers'; | 15 | import { sleep } from '../../helpers/async-helpers'; |
16 | import { asarPath } from '../../helpers/asar-helpers'; | ||
17 | 16 | ||
18 | import { API } from '../../environment'; | 17 | import { API } from '../../environment'; |
18 | import { RECIPES_PATH } from '../../config'; | ||
19 | import apiBase from '../apiBase'; | 19 | import apiBase from '../apiBase'; |
20 | import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; | 20 | import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; |
21 | 21 | ||
@@ -372,8 +372,7 @@ export default class ServerApi { | |||
372 | const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId); | 372 | const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId); |
373 | const tempArchivePath = path.join(recipeTempDirectory, 'recipe.tar.gz'); | 373 | const tempArchivePath = path.join(recipeTempDirectory, 'recipe.tar.gz'); |
374 | 374 | ||
375 | const internalRecipesDirectory = asarPath(path.join(__dirname, '../../', 'recipes')); | 375 | const internalRecipeFile = path.join(RECIPES_PATH, `${recipeId}.tar.gz`); |
376 | const internalRecipeFile = path.join(internalRecipesDirectory, `${recipeId}.tar.gz`); | ||
377 | 376 | ||
378 | fs.ensureDirSync(recipeTempDirectory); | 377 | fs.ensureDirSync(recipeTempDirectory); |
379 | 378 | ||
diff --git a/src/config.js b/src/config.js index 789e31fe3..ea36be1f9 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -100,6 +100,7 @@ export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); | |||
100 | 100 | ||
101 | // Replacing app.asar is not beautiful but unforunately necessary | 101 | // Replacing app.asar is not beautiful but unforunately necessary |
102 | export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); | 102 | export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); |
103 | export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); | ||
103 | 104 | ||
104 | export const ALLOWED_PROTOCOLS = [ | 105 | export const ALLOWED_PROTOCOLS = [ |
105 | 'https:', | 106 | 'https:', |