diff options
Diffstat (limited to 'src/helpers')
-rw-r--r-- | src/helpers/recipe-helpers.js | 11 | ||||
-rw-r--r-- | src/helpers/service-helpers.js | 16 | ||||
-rw-r--r-- | src/helpers/userAgent-helpers.js | 5 |
3 files changed, 14 insertions, 18 deletions
diff --git a/src/helpers/recipe-helpers.js b/src/helpers/recipe-helpers.js index 7daa0aaab..7e4bfa85a 100644 --- a/src/helpers/recipe-helpers.js +++ b/src/helpers/recipe-helpers.js | |||
@@ -1,12 +1,12 @@ | |||
1 | import path from 'path'; | 1 | import { parse } from 'path'; |
2 | import { app } from '@electron/remote'; | 2 | import { userDataRecipesPath } from '../environment'; |
3 | 3 | ||
4 | export function getRecipeDirectory(id = '') { | 4 | export function getRecipeDirectory(id = '') { |
5 | return path.join(app.getPath('userData'), 'recipes', id); | 5 | return userDataRecipesPath(id); |
6 | } | 6 | } |
7 | 7 | ||
8 | export function getDevRecipeDirectory(id = '') { | 8 | export function getDevRecipeDirectory(id = '') { |
9 | return path.join(app.getPath('userData'), 'recipes', 'dev', id); | 9 | return userDataRecipesPath('dev', id); |
10 | } | 10 | } |
11 | 11 | ||
12 | export function loadRecipeConfig(recipeId) { | 12 | export function loadRecipeConfig(recipeId) { |
@@ -19,8 +19,7 @@ export function loadRecipeConfig(recipeId) { | |||
19 | let config = require(configPath); | 19 | let config = require(configPath); |
20 | 20 | ||
21 | const moduleConfigPath = require.resolve(configPath); | 21 | const moduleConfigPath = require.resolve(configPath); |
22 | const paths = path.parse(moduleConfigPath); | 22 | config.path = parse(moduleConfigPath).dir; |
23 | config.path = paths.dir; | ||
24 | 23 | ||
25 | return config; | 24 | return config; |
26 | } catch (e) { | 25 | } catch (e) { |
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js index 28d483182..745f40dd9 100644 --- a/src/helpers/service-helpers.js +++ b/src/helpers/service-helpers.js | |||
@@ -1,18 +1,16 @@ | |||
1 | import path from 'path'; | 1 | import { readdirSync, removeSync } from 'fs-extra'; |
2 | import { app } from '@electron/remote'; | 2 | import { userDataPath } from '../environment'; |
3 | import fs from 'fs-extra'; | ||
4 | 3 | ||
5 | export function getServicePartitionsDirectory() { | 4 | export function getServicePartitionsDirectory(...segments) { |
6 | return path.join(app.getPath('userData'), 'Partitions'); | 5 | return userDataPath('Partitions', ...([segments].flat())); |
7 | } | 6 | } |
8 | 7 | ||
9 | export function removeServicePartitionDirectory(id = '', addServicePrefix = false) { | 8 | export function removeServicePartitionDirectory(id = '', addServicePrefix = false) { |
10 | const servicePartition = path.join(getServicePartitionsDirectory(), `${addServicePrefix ? 'service-' : ''}${id}`); | 9 | const servicePartition = getServicePartitionsDirectory(`${addServicePrefix ? 'service-' : ''}${id}`); |
11 | 10 | return removeSync(servicePartition); | |
12 | return fs.remove(servicePartition); | ||
13 | } | 11 | } |
14 | 12 | ||
15 | export async function getServiceIdsFromPartitions() { | 13 | export async function getServiceIdsFromPartitions() { |
16 | const files = await fs.readdir(getServicePartitionsDirectory()); | 14 | const files = readdirSync(getServicePartitionsDirectory()); |
17 | return files.filter((n) => n !== '__chrome_extension'); | 15 | return files.filter((n) => n !== '__chrome_extension'); |
18 | } | 16 | } |
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js index 9c9c8f132..ede5e6dc4 100644 --- a/src/helpers/userAgent-helpers.js +++ b/src/helpers/userAgent-helpers.js | |||
@@ -1,11 +1,10 @@ | |||
1 | import os from 'os'; | 1 | import os from 'os'; |
2 | import macosVersion from 'macos-version'; | 2 | import macosVersion from 'macos-version'; |
3 | import { chrome } from 'useragent-generator'; | ||
3 | import { | 4 | import { |
4 | chromeVersion, isMac, isWindows, is64Bit, osArch, osRelease, | 5 | chromeVersion, isMac, isWindows, is64Bit, osArch, osRelease, |
5 | } from '../environment'; | 6 | } from '../environment'; |
6 | 7 | ||
7 | const uaGenerator = require('useragent-generator'); | ||
8 | |||
9 | function macOS() { | 8 | function macOS() { |
10 | const version = macosVersion(); | 9 | const version = macosVersion(); |
11 | let cpuName = os.cpus()[0].model.split(' ')[0]; | 10 | let cpuName = os.cpus()[0].model.split(' ')[0]; |
@@ -38,5 +37,5 @@ export default function userAgent() { | |||
38 | platformString = linux(); | 37 | platformString = linux(); |
39 | } | 38 | } |
40 | 39 | ||
41 | return uaGenerator.chrome({ os: platformString, version: chromeVersion }); | 40 | return chrome({ os: platformString, version: chromeVersion }); |
42 | } | 41 | } |