EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4172 from dpalou/MOBILE-4482-2 

MOBILE-4482 core: Fix treat draft URLs failing because of encoded chars
main
Pau Ferrer Ocaña 2024-09-12 16:53:36 +02:00 committed by GitHub
parent d7c3c37b21 c827311684
commit 54100ac7e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/services/file-helper.ts
View File

@ -562,6 +562,7 @@ export class CoreFileHelperProvider {
if (filename.indexOf('?') != -1) { if (filename.indexOf('?') != -1) {
filename = filename.substring(0, filename.indexOf('?')); filename = filename.substring(0, filename.indexOf('?'));
} }
filename = CoreUrl.decodeURIComponent(filename);
if (pluginfileMap[filename]) { if (pluginfileMap[filename]) {
replaceMap[url] = pluginfileMap[filename]; replaceMap[url] = pluginfileMap[filename];
@ -611,23 +612,24 @@ export class CoreFileHelperProvider {
const draftfileUrlRegexPrefix = CoreText.escapeForRegex(draftfileUrl) + '/[^/]+/[^/]+/[^/]+/[^/]+/'; const draftfileUrlRegexPrefix = CoreText.escapeForRegex(draftfileUrl) + '/[^/]+/[^/]+/[^/]+/[^/]+/';
files.forEach((file) => { files.forEach((file) => {
if (!file.filename) { // Get the file name from the URL instead of using file.filename because the URL can have encoded characters.
return; // encodeURIComponent doesn't encode parenthesis, so it's better to rely on the name from the URL.
const url = CoreFileHelper.getFileUrl(file);
let filename = url.substring(url.lastIndexOf('/') + 1);
if (filename.indexOf('?') != -1) {
filename = filename.substring(0, filename.indexOf('?'));
} }
// Search the draftfile URL in the original text. // Search the draftfile URL in the original text.
const matches = originalText.match( const matches = originalText.match(
new RegExp(draftfileUrlRegexPrefix + CoreText.escapeForRegex(file.filename) + '[^\'" ]*', 'i'), new RegExp(draftfileUrlRegexPrefix + CoreText.escapeForRegex(filename) + '[^\'" ]*', 'i'),
); );
if (!matches || !matches[0]) { if (!matches || !matches[0]) {
return; // Original URL not found, skip. return; // Original URL not found, skip.
} }
treatedText = treatedText.replace( treatedText = treatedText.replace(new RegExp(CoreText.escapeForRegex(url), 'g'), matches[0]);
new RegExp(CoreText.escapeForRegex(CoreFileHelper.getFileUrl(file)), 'g'),
matches[0],
);
}); });
return treatedText; return treatedText;