Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fs-plus from atom-protocol-handler #170

Merged
merged 10 commits into from
Sep 4, 2023
Merged

Remove fs-plus from atom-protocol-handler #170

Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8404658
remove sync atom-protocol-handler
sertonix Nov 21, 2022
7b7787f
Merge branch 'pulsar-edit:master' into atom-protocol-handler-async
sertonix Feb 13, 2023
55d2831
Merge branch 'master' into pr/170
confused-Techie May 21, 2023
57a12dd
Remove `async`
confused-Techie Jul 21, 2023
863b500
Use regular `catch` statements, rather than original one-liner
confused-Techie Aug 25, 2023
31bda28
Bad `()`
confused-Techie Aug 27, 2023
ae96f0a
Merge branch 'master' into pr/170
confused-Techie Aug 30, 2023
a91f6c6
Ensure we bind our `catch` to a var
confused-Techie Sep 1, 2023
6f1cd60
Merge branch 'master' into pr/170
confused-Techie Sep 1, 2023
4c0f5a7
Don't return on caught error
confused-Techie Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/main-process/atom-protocol-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { protocol } = require('electron');
const fs = require('fs-plus');
const fs = require('fs');
const path = require('path');

// Handles requests with 'atom' protocol.
Expand Down Expand Up @@ -36,15 +36,23 @@ module.exports = class AtomProtocolHandler {
let filePath;
if (relativePath.indexOf('assets/') === 0) {
const assetsPath = path.join(process.env.ATOM_HOME, relativePath);
const stat = fs.statSyncNoException(assetsPath);
if (stat && stat.isFile()) filePath = assetsPath;
try {
const stat = fs.statSync(assetsPath);
if (stat && stat.isFile()) filePath = assetsPath;
} catch (e) {
return false;
}
}
confused-Techie marked this conversation as resolved.
Show resolved Hide resolved

if (!filePath) {
for (let loadPath of this.loadPaths) {
filePath = path.join(loadPath, relativePath);
const stat = fs.statSyncNoException(filePath);
if (stat && stat.isFile()) break;
try {
const stat = fs.statSync(filePath);
if (stat && stat.isFile()) break;
} catch (e) {
return false;
confused-Techie marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

Expand Down