diff --git a/src/commands/Article.ts b/src/commands/Article.ts index ca3b5463..e39d2fef 100644 --- a/src/commands/Article.ts +++ b/src/commands/Article.ts @@ -313,12 +313,15 @@ export class Article { } } + const suffix = Settings.get(SETTING_SLUG_SUFFIX) as string; + const prefix = Settings.get(SETTING_SLUG_PREFIX) as string; + if (parsedFile.name.toLowerCase() !== 'index') { - return parsedFile.name; + return `${prefix}${parsedFile.name}${suffix}`; } const folderName = basename(dirname(file)); - return folderName; + return `${prefix}${folderName}${suffix}`; } /** diff --git a/src/commands/Preview.ts b/src/commands/Preview.ts index 2aacf8c3..79c65dd8 100644 --- a/src/commands/Preview.ts +++ b/src/commands/Preview.ts @@ -19,13 +19,13 @@ import { ContentFolder, ContentType, PreviewSettings } from '../models'; import { format } from 'date-fns'; import { DateHelper } from '../helpers/DateHelper'; import { Article } from '.'; -import { urlJoin } from 'url-join-ts'; import { WebviewHelper } from '@estruyf/vscode'; import { Folders } from './Folders'; import { ParsedFrontMatter } from '../parsers'; import { getLocalizationFile } from '../utils/getLocalizationFile'; import * as l10n from '@vscode/l10n'; import { LocalizationKey } from '../localization'; +import { joinUrl } from '../utils'; export class Preview { public static filePath: string | undefined = undefined; @@ -65,7 +65,7 @@ export class Preview { const localhostUrl = await this.getLocalServerUrl(); if (browserLiteCommand) { - const pageUrl = urlJoin(localhostUrl.toString(), slug || ''); + const pageUrl = joinUrl(localhostUrl.toString(), slug || ''); commands.executeCommand(browserLiteCommand, pageUrl); return; } @@ -177,7 +177,7 @@ export class Preview { Front Matter Preview -