Skip to content

Commit

Permalink
Make XDG directory specification support more convenient (#1269)
Browse files Browse the repository at this point in the history
  • Loading branch information
tony-sol committed May 10, 2024
1 parent 814d962 commit 6692a27
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/utils/userDataManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { HistoricalHttpRequest } from '../models/httpRequest';
import { JsonFileUtility } from './jsonFileUtility';

const restClientDir = 'rest-client';
const rootPath = path.join(os.homedir(), `.${restClientDir}`);
const rootPath = process.env.VSC_REST_CLIENT_HOME !== undefined
? process.env.VSC_REST_CLIENT_HOME
: path.join(os.homedir(), `.${restClientDir}`);

function getCachePath(): string {
if (fs.existsSync(rootPath)) {
Expand All @@ -19,13 +21,13 @@ function getCachePath(): string {
return rootPath;
}

function getConfigPath(): string {
function getStatePath(): string {
if (fs.existsSync(rootPath)) {
return rootPath;
}

if (process.env.XDG_CONFIG_HOME !== undefined) {
return path.join(process.env.XDG_CONFIG_HOME, restClientDir);
if (process.env.XDG_STATE_HOME !== undefined) {
return path.join(process.env.XDG_STATE_HOME, restClientDir);
}

return rootPath;
Expand All @@ -36,7 +38,7 @@ export class UserDataManager {
private static readonly historyItemsMaxCount = 50;

private static readonly cachePath: string = getCachePath();
private static readonly configPath: string = getConfigPath();
private static readonly statePath: string = getStatePath();

public static get cookieFilePath() {
return path.join(this.cachePath, 'cookie.json');
Expand All @@ -47,7 +49,7 @@ export class UserDataManager {
}

private static get environmentFilePath() {
return path.join(this.configPath, 'environment.json');
return path.join(this.statePath, 'environment.json');
}

private static get responseSaveFolderPath() {
Expand Down

0 comments on commit 6692a27

Please sign in to comment.