From 80fa8e0971d2caf707e3abab29447948ba2ba9c7 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Wed, 25 Sep 2019 20:58:25 +0200 Subject: Adding recipes as unpacked asset --- electron-builder.yml | 1 + src/api/server/ServerApi.js | 5 ++--- 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: asarUnpack: - ./dictionaries + - ./recipes - ./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'; import OrderModel from '../../models/Order'; import { sleep } from '../../helpers/async-helpers'; -import { asarPath } from '../../helpers/asar-helpers'; import { API } from '../../environment'; +import { RECIPES_PATH } from '../../config'; import apiBase from '../apiBase'; import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; @@ -372,8 +372,7 @@ export default class ServerApi { const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId); const tempArchivePath = path.join(recipeTempDirectory, 'recipe.tar.gz'); - const internalRecipesDirectory = asarPath(path.join(__dirname, '../../', 'recipes')); - const internalRecipeFile = path.join(internalRecipesDirectory, `${recipeId}.tar.gz`); + const internalRecipeFile = path.join(RECIPES_PATH, `${recipeId}.tar.gz`); fs.ensureDirSync(recipeTempDirectory); 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'); // Replacing app.asar is not beautiful but unforunately necessary export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries')); +export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); export const ALLOWED_PROTOCOLS = [ 'https:', -- cgit v1.2.3-70-g09d2