Add a single place to initialize Flipper utilitary folders
Summary: We have several folders Flipper uses that sometimes we forget to create before Flipper starts. With this diff we have a single place to initialise the necessary folder structure. Reviewed By: lblasa Differential Revision: D37036601 fbshipit-source-id: f945f2bfdfc6be24ba87bd4b13c7fcef3fd74451
This commit is contained in:
committed by
Facebook GitHub Bot
parent
60f9a5e8de
commit
d987e36c62
@@ -16,15 +16,15 @@ import {
|
||||
import path from 'path';
|
||||
import tmp, {FileOptions} from 'tmp';
|
||||
import {reportPlatformFailures} from 'flipper-common';
|
||||
import os from 'os';
|
||||
import {isTest} from 'flipper-common';
|
||||
import {flipperDataFolder} from './paths';
|
||||
|
||||
const tmpFile = promisify(tmp.file) as (
|
||||
options?: FileOptions,
|
||||
) => Promise<string>;
|
||||
|
||||
const getFilePath = (fileName: string): string => {
|
||||
return path.resolve(os.homedir(), '.flipper', 'certs', fileName);
|
||||
return path.resolve(flipperDataFolder, 'certs', fileName);
|
||||
};
|
||||
|
||||
// Desktop file paths
|
||||
|
||||
18
desktop/flipper-server-core/src/utils/paths.tsx
Normal file
18
desktop/flipper-server-core/src/utils/paths.tsx
Normal file
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*
|
||||
* @format
|
||||
*/
|
||||
|
||||
import path from 'path';
|
||||
import os from 'os';
|
||||
import xdg from 'xdg-basedir';
|
||||
|
||||
export const flipperDataFolder = path.resolve(os.homedir(), '.flipper');
|
||||
export const flipperSettingsFolder = path.resolve(
|
||||
...(xdg.config ? [xdg.config] : [os.homedir(), '.config']),
|
||||
'flipper',
|
||||
);
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
import os from 'os';
|
||||
import {resolve} from 'path';
|
||||
import xdg from 'xdg-basedir';
|
||||
import {Settings, Tristate} from 'flipper-common';
|
||||
import {readFile, writeFile, pathExists, mkdirp} from 'fs-extra';
|
||||
import {flipperSettingsFolder} from './paths';
|
||||
|
||||
export async function loadSettings(
|
||||
settingsString: string = '',
|
||||
@@ -36,21 +36,14 @@ export async function loadSettings(
|
||||
}
|
||||
|
||||
export async function saveSettings(settings: Settings): Promise<void> {
|
||||
await mkdirp(getSettingsDir());
|
||||
await mkdirp(flipperSettingsFolder);
|
||||
await writeFile(getSettingsFile(), JSON.stringify(settings, null, 2), {
|
||||
encoding: 'utf8',
|
||||
});
|
||||
}
|
||||
|
||||
function getSettingsDir() {
|
||||
return resolve(
|
||||
...(xdg.config ? [xdg.config] : [os.homedir(), '.config']),
|
||||
'flipper',
|
||||
);
|
||||
}
|
||||
|
||||
function getSettingsFile() {
|
||||
return resolve(getSettingsDir(), 'settings.json');
|
||||
return resolve(flipperSettingsFolder, 'settings.json');
|
||||
}
|
||||
|
||||
export const DEFAULT_ANDROID_SDK_PATH = getDefaultAndroidSdkPath();
|
||||
|
||||
Reference in New Issue
Block a user