adam/vscode-front-matter
1
0
Fork 0
mirror of https://github.com/estruyf/vscode-front-matter.git synced 2026-08-07 09:23:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Making sure paths are parsed for Windows

Browse Source
This commit is contained in:
Elio
2021-10-05 20:20:31 +02:00
parent e8c67c75fd
commit 97a635c2de
7 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands/Dashboard.ts
+5 -5
View File
@@ -290,7 +290,7 @@ export class Dashboard {
selectedFolder = '';
}
const relSelectedFolderPath = selectedFolder ? selectedFolder.substring((wsFolder?.fsPath || "").length + 1) : '';
const relSelectedFolderPath = selectedFolder ? selectedFolder.substring((parseWinPath(wsFolder?.fsPath || "")).length + 1) : '';
let allMedia: MediaInfo[] = [];
@@ -361,20 +361,20 @@ export class Dashboard {
if (selectedFolder) {
if (existsSync(selectedFolder)) {
allFolders = readdirSync(selectedFolder, { withFileTypes: true }).filter(dir => dir.isDirectory()).map(dir => parseWinPath(join(selectedFolder, dir.name)) as string);
allFolders = readdirSync(selectedFolder, { withFileTypes: true }).filter(dir => dir.isDirectory()).map(dir => parseWinPath(join(selectedFolder, dir.name)));
}
} else {
for (const contentFolder of contentFolders) {
const contentPath = contentFolder.path;
if (contentPath && existsSync(contentPath)) {
const subFolders = readdirSync(contentPath, { withFileTypes: true }).filter(dir => dir.isDirectory()).map(dir => parseWinPath(join(contentPath, dir.name)) as string);
const subFolders = readdirSync(contentPath, { withFileTypes: true }).filter(dir => dir.isDirectory()).map(dir => parseWinPath(join(contentPath, dir.name)));
allContentFolders = [...allContentFolders, ...subFolders];
}
}
const staticPath = join(wsFolder?.fsPath || "", staticFolder || "");
const staticPath = join(parseWinPath(wsFolder?.fsPath || ""), staticFolder || "");
if (staticPath && existsSync(staticPath)) {
allFolders = readdirSync(staticPath, { withFileTypes: true }).filter(dir => dir.isDirectory()).map(dir => parseWinPath(join(staticPath, dir.name)) as string);
allFolders = readdirSync(staticPath, { withFileTypes: true }).filter(dir => dir.isDirectory()).map(dir => parseWinPath(join(staticPath, dir.name)));
}
}
src/commands/Folders.ts
+6 -4
View File
@@ -10,6 +10,7 @@ import { Settings } from "../helpers";
import { existsSync, mkdirSync } from 'fs';
import { format } from 'date-fns';
import { Dashboard } from './Dashboard';
import { parseWinPath } from '../helpers/parseWinPath';
export const WORKSPACE_PLACEHOLDER = `[[workspace]]`;
@@ -26,7 +27,7 @@ export class Folders {
let startPath = "";
if (data?.selectedFolder) {
startPath = data.selectedFolder.replace((wsFolder?.fsPath || ""), "");
startPath = data.selectedFolder.replace(parseWinPath(wsFolder?.fsPath || ""), "");
} else if (staticFolder) {
startPath = `/${staticFolder}`;
}
@@ -51,7 +52,7 @@ export class Folders {
let parentFolders: string[] = [];
for (const folder of folders) {
const folderPath = join(wsFolder?.fsPath || "", parentFolders.join("/"), folder);
const folderPath = join(parseWinPath(wsFolder?.fsPath || ""), parentFolders.join("/"), folder);
parentFolders.push(folder);
@@ -179,6 +180,7 @@ export class Folders {
return projectFolder;
}
return undefined;
}
@@ -283,7 +285,7 @@ export class Folders {
*/
private static absWsFolder(folder: ContentFolder, wsFolder?: Uri) {
const isWindows = process.platform === 'win32';
let absPath = folder.path.replace(WORKSPACE_PLACEHOLDER, wsFolder?.fsPath || "");
let absPath = folder.path.replace(WORKSPACE_PLACEHOLDER, parseWinPath(wsFolder?.fsPath || ""));
absPath = isWindows ? absPath.split('/').join('\\') : absPath;
return absPath;
}
@@ -296,7 +298,7 @@ export class Folders {
*/
private static relWsFolder(folder: ContentFolder, wsFolder?: Uri) {
const isWindows = process.platform === 'win32';
let absPath = folder.path.replace(wsFolder?.fsPath || "", WORKSPACE_PLACEHOLDER);
let absPath = folder.path.replace(parseWinPath(wsFolder?.fsPath || ""), WORKSPACE_PLACEHOLDER);
absPath = isWindows ? absPath.split('\\').join('/') : absPath;
return absPath;
}
src/dashboardWebView/components/Header/Breadcrumb.tsx
+8 -6
View File
@@ -3,6 +3,7 @@ import { basename, join } from 'path';
import * as React from 'react';
import { useRecoilState, useRecoilValue } from 'recoil';
import { HOME_PAGE_NAVIGATION_ID } from '../../../constants';
import { parseWinPath } from '../../../helpers/parseWinPath';
import { SelectedMediaFolderAtom, SettingsAtom } from '../../state';
export interface IBreadcrumbProps {}
@@ -19,10 +20,11 @@ export const Breadcrumb: React.FunctionComponent<IBreadcrumbProps> = (props: Rea
React.useEffect(() => {
const { wsFolder, staticFolder, contentFolders } = settings;
const isValid = (folderPath: string) => {
const isValid = (folderPath: string) => {
if (staticFolder) {
const staticPath = join(wsFolder, staticFolder);
const relPath = folderPath.replace(staticPath, '');
const staticPath = parseWinPath(join(wsFolder, staticFolder)) as string;
const relPath = folderPath.replace(staticPath, '') as string;
if (relPath.length > 1 && folderPath.startsWith(staticPath)) {
return true;
} else if (relPath.length === 0) {
@@ -31,7 +33,7 @@ export const Breadcrumb: React.FunctionComponent<IBreadcrumbProps> = (props: Rea
}
for (let i = 0; i < contentFolders.length; i++) {
const contentFolder = contentFolders[i];
const contentFolder = parseWinPath(contentFolders[i]) as string;
const relContentPath = folderPath.replace(contentFolder, '');
return relContentPath.length > 1 && folderPath.startsWith(contentFolder);
}
@@ -42,10 +44,10 @@ export const Breadcrumb: React.FunctionComponent<IBreadcrumbProps> = (props: Rea
if (!selectedFolder) {
setFolders([]);
} else {
const relPath = selectedFolder.replace(settings.wsFolder, '');
const relPath = parseWinPath(selectedFolder.replace(parseWinPath(settings.wsFolder) as string, '')) as string;
const folderParts = relPath.split('/').filter(f => f);
const allFolders: string[] = [];
let previousFolder = settings.wsFolder;
let previousFolder = parseWinPath(settings.wsFolder) as string;
for (const part of folderParts) {
const folder = join(previousFolder, part);
src/helpers/ArticleHelper.ts
+1
View File
@@ -201,6 +201,7 @@ export class ArticleHelper {
await EditorHelper.showFile(fileName)
}
}];
Notifications.error(`There seems to be an issue parsing the content its front matter. FileName: ${basename(fileName)}. ERROR: ${error.message || error}`, ...items).then((result: any) => {
if (result?.title) {
const item = items.find(i => i.title === result.title);
src/helpers/ImageHelper.ts
+3 -2
View File
@@ -5,6 +5,7 @@ import { existsSync } from 'fs';
import { Folders } from '../commands/Folders';
import { Settings } from './SettingsHelper';
import { SETTINGS_CONTENT_STATIC_FOLDER } from '../constants';
import { parseWinPath } from './parseWinPath';
export class ImageHelper {
@@ -51,7 +52,7 @@ export class ImageHelper {
const wsFolder = Folders.getWorkspaceFolder();
const staticFolder = Settings.get<string>(SETTINGS_CONTENT_STATIC_FOLDER);
const staticPath = join(wsFolder?.fsPath || "", staticFolder || "", value);
const staticPath = join(parseWinPath(wsFolder?.fsPath || ""), staticFolder || "", value);
const contentFolderPath = filePath ? join(dirname(filePath), value) : null;
if (existsSync(staticPath)) {
@@ -72,7 +73,7 @@ export class ImageHelper {
let relPath = imgValue || "";
if (imgValue) {
relPath = imgValue.split(wsFolder?.fsPath || "").pop() || "";
relPath = imgValue.split(parseWinPath(wsFolder?.fsPath || "")).pop() || "";
relPath = imgValue.split(staticFolder || "").pop() || "";
}
return relPath;
src/helpers/MediaLibrary.ts
+3 -2
View File
@@ -5,6 +5,7 @@ import { basename, dirname, join, parse } from 'path';
import { Folders, WORKSPACE_PLACEHOLDER } from '../commands/Folders';
import { existsSync, renameSync } from 'fs';
import { Notifications } from './Notifications';
import { parseWinPath } from './parseWinPath';
interface MediaRecord {
description: string;
@@ -17,7 +18,7 @@ export class MediaLibrary {
private constructor() {
const wsFolder = Folders.getWorkspaceFolder();
this.db = new JsonDB(join(wsFolder?.fsPath || "", '.frontmatter/mediaDb.json'), true, false, '/');
this.db = new JsonDB(join(parseWinPath(wsFolder?.fsPath || ""), '.frontmatter/mediaDb.json'), true, false, '/');
workspace.onDidRenameFiles(e => {
e.files.forEach(f => {
@@ -93,7 +94,7 @@ export class MediaLibrary {
private parsePath(path: string) {
const wsFolder = Folders.getWorkspaceFolder();
const isWindows = process.platform === 'win32';
let absPath = path.replace(wsFolder?.fsPath || "", WORKSPACE_PLACEHOLDER);
let absPath = path.replace(parseWinPath(wsFolder?.fsPath || ""), WORKSPACE_PLACEHOLDER);
absPath = isWindows ? absPath.split('\\').join('/') : absPath;
return absPath.toLowerCase();
}
src/helpers/parseWinPath.ts
+2 -2
View File
@@ -1,3 +1,3 @@
export const parseWinPath = (path: string | undefined) => {
return path?.split(`\\`).join(`/`);
export const parseWinPath = (path: string | undefined): string => {
return path?.split(`\\`).join(`/`) || '';
}