Skip to content

fix mobile importJs #1

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

Merged
merged 1 commit into from
Sep 7, 2023
Merged

fix mobile importJs #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/api/API.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ export class API {
* @param path the vault relative path of the file to import
*/
public async importJs(path: string): Promise<any> {
const fullPath = this.app.vault.adapter.getResourcePath(path);
let fullPath = this.app.vault.adapter.getResourcePath(path);
if (!fullPath.includes('?')) {
Copy link
Owner

@mProjectsCode mProjectsCode Sep 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the path on mobile includes a ? somewhere along the way?

Copy link
Owner

@mProjectsCode mProjectsCode Sep 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like this/is/a?path/foo.js

Copy link
Contributor Author

@Krakor92 Krakor92 Sep 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it have one? Isn't ? an illegal character to have in a path or in a filename? If you're talking about a mobile path that already contains query parameters then It shouldn't be the case since on mobile, getResourcePath doesn't append anything at the end of the full path.

Edit: If you prefer I can construct an URL object with the full path and check whether or not it has a searchParams.size === 0

Copy link
Owner

@mProjectsCode mProjectsCode Sep 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/os/FileUtils.java;l=1008?q=isValidFatFilenameChar
Seems like you are correct and ? as an invalid character for file paths.

const scriptFile = this.app.metadataCache.getFirstLinkpathDest(path, "")
if (scriptFile) {
fullPath += '?' + scriptFile.stat.mtime
}
}
return import(fullPath);
}

Expand Down