mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-02-24 17:10:56 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: file path

Browse source
This commit is contained in:
linonetwo 2023-06-21 13:04:56 +08:00 • committed by lin onetwo
parent 8ba073392c
commit 6da0946a7c
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/services/native/index.ts
View file

@ -256,7 +256,7 @@ ${message.message}
* urlWithFileProtocol: `file://./files/xxx.png`
* hostname: `.`, pathname: `/files/xxx.png`
*/
const filePath = `${hostname}${pathname}`;
const filePath = decodeURIComponent(`${hostname}${pathname}`);
logger.info('handle file:// or open:// This url will open file in-wiki', { hostname, pathname, filePath, function: 'formatFileUrlToAbsolutePath' });
let fileExists = fs.existsSync(filePath);
logger.info(`This file (decodeURI) ${fileExists ? '' : 'not '}exists`, { filePath, function: 'formatFileUrlToAbsolutePath' });

14
src/services/view/setupViewFileProtocol.ts
View file

@ -30,10 +30,9 @@ export function handleOpenFileExternalLink(nextUrl: string): INewWindowAction |
* Handle file protocol in webview to request file content and show in the view.
*/
export function handleViewFileContentLoading(view: BrowserView) {
const nativeService = container.get<INativeService>(serviceIdentifier.NativeService);
view.webContents.session.webRequest.onBeforeRequest((details, callback) => {
if (details.url.startsWith('file://') || details.url.startsWith('open://')) {
handleFileLink(details, nativeService, callback);
handleFileLink(details, callback);
} else {
callback({
cancel: false,
@ -42,18 +41,19 @@ export function handleViewFileContentLoading(view: BrowserView) {
});
}
function handleFileLink(details: Electron.OnBeforeRequestListenerDetails, nativeService: INativeService, callback: (response: Electron.CallbackResponse) => void) {
const redirectURL = nativeService.formatFileUrlToAbsolutePath(decodeURI(details.url));
// DEBUG: console redirectURL
console.log(`redirectURL`, redirectURL);
function handleFileLink(details: Electron.OnBeforeRequestListenerDetails, callback: (response: Electron.CallbackResponse) => void) {
const nativeService = container.get<INativeService>(serviceIdentifier.NativeService);
const redirectURL = nativeService.formatFileUrlToAbsolutePath(details.url);
if (redirectURL === details.url) {
callback({
cancel: false,
// prevent redirect loop, remove file:// prefix, so it never comes back to this function from `handleViewFileContentLoading` again.
redirectURL: redirectURL.replace('file://', '').replace('open://', ''),
});
} else {
callback({
cancel: false,
redirectURL,
redirectURL: encodeURI(redirectURL),
});
}
}