fix filesystem wrapper protocol for windows

xgi · Nov 5, 2024 · 4fd860b · 4fd860b
1 parent 021d1a4
commit 4fd860b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -39,6 +39,15 @@ if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true')
   require('electron-debug')();
 }
 
+protocol.registerSchemesAsPrivileged([
+  {
+    scheme: 'atom',
+    privileges: {
+      supportFetchAPI: true,
+    },
+  },
+]);
+
 const createWindows = async () => {
   const RESOURCES_PATH = app.isPackaged
     ? path.join(process.resourcesPath, 'resources')
@@ -126,8 +135,8 @@ app
     loadPlugins(spoofWindow!);
 
     protocol.handle('atom', (req) => {
-      const { pathname } = new URL(req.url);
-      return net.fetch(`file://${pathname}`, {
+      const newPath = decodeURIComponent(req.url.slice('atom://'.length));
+      return net.fetch(`file://${newPath}`, {
         method: req.method,
         headers: req.headers,
         body: req.body,

diff --git a/src/renderer/components/general/SeriesEditControls.tsx b/src/renderer/components/general/SeriesEditControls.tsx
@@ -24,7 +24,9 @@ type Props = {
 const SeriesEditControls: React.FC<Props> = (props: Props) => {
   const getCoverSrcUrl = () => {
     if (props.series.extensionId === FS_METADATA.id) {
-      return props.series.remoteCoverUrl ? `atom://${props.series.remoteCoverUrl}` : blankCover;
+      return props.series.remoteCoverUrl
+        ? `atom://${encodeURIComponent(props.series.remoteCoverUrl)}`
+        : blankCover;
     }
     return props.series.remoteCoverUrl;
   };

diff --git a/src/renderer/components/library/LibraryGrid.tsx b/src/renderer/components/library/LibraryGrid.tsx
@@ -69,11 +69,13 @@ const LibraryGrid: React.FC<Props> = (props: Props) => {
     const fileExtensions = constants.IMAGE_EXTENSIONS;
     for (let i = 0; i < fileExtensions.length; i += 1) {
       const thumbnailPath = path.join(thumbnailsDir, `${series.id}.${fileExtensions[i]}`);
-      if (fs.existsSync(thumbnailPath)) return `atom://${thumbnailPath}`;
+      if (fs.existsSync(thumbnailPath)) return `atom://${encodeURIComponent(thumbnailPath)}`;
     }
 
     if (series.extensionId === FS_METADATA.id) {
-      return series.remoteCoverUrl ? `atom://${series.remoteCoverUrl}` : blankCover;
+      return series.remoteCoverUrl
+        ? `atom://${encodeURIComponent(series.remoteCoverUrl)}`
+        : blankCover;
     }
     return series.remoteCoverUrl || blankCover;
   };

diff --git a/src/renderer/components/library/series/SeriesDetailsIntro.tsx b/src/renderer/components/library/series/SeriesDetailsIntro.tsx
@@ -29,11 +29,13 @@ const SeriesDetailsIntro: React.FC<Props> = (props: Props) => {
     const fileExtensions = constants.IMAGE_EXTENSIONS;
     for (let i = 0; i < fileExtensions.length; i += 1) {
       const thumbnailPath = path.join(thumbnailsDir, `${props.series.id}.${fileExtensions[i]}`);
-      if (fs.existsSync(thumbnailPath)) return `atom://${thumbnailPath}`;
+      if (fs.existsSync(thumbnailPath)) return `atom://${encodeURIComponent(thumbnailPath)}`;
     }
 
     if (props.series.extensionId === FS_METADATA.id) {
-      return props.series.remoteCoverUrl ? `atom://${props.series.remoteCoverUrl}` : blankCover;
+      return props.series.remoteCoverUrl
+        ? `atom://${encodeURIComponent(props.series.remoteCoverUrl)}`
+        : blankCover;
     }
     return props.series.remoteCoverUrl || blankCover;
   };

diff --git a/src/renderer/components/reader/ReaderPage.tsx b/src/renderer/components/reader/ReaderPage.tsx
@@ -191,7 +191,7 @@ const ReaderPage: React.FC = () => {
       .then((pageRequesterData: PageRequesterData) =>
         ipcRenderer.invoke(ipcChannels.EXTENSION.GET_PAGE_URLS, FS_METADATA.id, pageRequesterData),
       );
-    newPageUrls = newPageUrls.map((pageUrl) => `atom://${pageUrl}`);
+    newPageUrls = newPageUrls.map((pageUrl) => `atom://${encodeURIComponent(pageUrl)}`);
 
     setPageUrls(newPageUrls);
     setLastPageNumber(newPageUrls.length);
@@ -255,7 +255,7 @@ const ReaderPage: React.FC = () => {
       );
 
     if (series.extensionId === FS_METADATA.id) {
-      newPageUrls = newPageUrls.map((pageUrl) => `atom://${pageUrl}`);
+      newPageUrls = newPageUrls.map((pageUrl) => `atom://${encodeURIComponent(pageUrl)}`);
     }
 
     setPageUrls(newPageUrls);