From b83f7beb3095fa85d067bc2f5261ea54a193b4c0 Mon Sep 17 00:00:00 2001 From: Elio Date: Mon, 13 Jun 2022 10:17:56 +0200 Subject: [PATCH 1/4] #354 - Windows file parsing fix --- src/dashboardWebView/components/Media/Item.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dashboardWebView/components/Media/Item.tsx b/src/dashboardWebView/components/Media/Item.tsx index 373b4cf3..66d4eeb1 100644 --- a/src/dashboardWebView/components/Media/Item.tsx +++ b/src/dashboardWebView/components/Media/Item.tsx @@ -61,10 +61,14 @@ export const Item: React.FunctionComponent = ({media}: React.PropsWi const getRelPath = () => { let relPath: string | undefined = ""; if (settings?.wsFolder && media.fsPath) { - relPath = media.fsPath.split(settings.wsFolder).pop(); + const wsFolderParsed = parseWinPath(settings.wsFolder); + const mediaParsed = parseWinPath(media.fsPath); + + relPath = mediaParsed.split(wsFolderParsed).pop(); if (settings.staticFolder && relPath) { - relPath = relPath.split(settings.staticFolder).pop(); + const staticFolderParsed = parseWinPath(settings.staticFolder); + relPath = relPath.split(staticFolderParsed).pop(); } } return relPath; From c5881d79055ae26824ac5e6a960748b3795ecb36 Mon Sep 17 00:00:00 2001 From: Elio Date: Mon, 13 Jun 2022 10:20:47 +0200 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90025c2d..70018854 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [7.3.3] - 2022-06-13 + +### 🐞 Fixes + +- [#354](https://github.com/estruyf/vscode-front-matter/issues/354): Fix Windows file path parsing for inserting media files + ## [7.3.3] - 2022-06-11 ### 🐞 Fixes From fbf1990045b7a79a8c68989bea33942835741c74 Mon Sep 17 00:00:00 2001 From: Elio Date: Mon, 13 Jun 2022 10:23:51 +0200 Subject: [PATCH 3/4] Update version in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70018854..346c60e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## [7.3.3] - 2022-06-13 +## [7.3.4] - 2022-06-13 ### 🐞 Fixes From 17150a53bc69a927caf5a7de38684c012566e704 Mon Sep 17 00:00:00 2001 From: Elio Date: Mon, 13 Jun 2022 10:23:57 +0200 Subject: [PATCH 4/4] 7.3.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb080740..9665890d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-front-matter-beta", - "version": "7.3.3", + "version": "7.3.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f53fe15c..8f41e6f0 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Front Matter", "description": "Front Matter is a CMS that runs within Visual Studio Code. It gives you the power and control of a full-blown CMS while also providing you the flexibility and speed of the static site generator of your choice like: Hugo, Jekyll, Hexo, NextJs, Gatsby, and many more...", "icon": "assets/frontmatter-teal-128x128.png", - "version": "7.3.3", + "version": "7.3.4", "preview": false, "publisher": "eliostruyf", "galleryBanner": {