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

MOBILE-2431 file: Fix copy and move files with special characters

main
Dani Palou 2018-06-20 13:18:44 +02:00
parent 8b8721a7f6
commit 14ec310129
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/providers/file.ts
View File

@ -609,7 +609,17 @@ export class CoreFileProvider {
return this.file.moveFile(commonPath, originalPath, commonPath, newPath); return this.file.moveFile(commonPath, originalPath, commonPath, newPath);
} else { } else {
return this.file.moveFile(this.basePath, originalPath, this.basePath, newPath); return this.file.moveFile(this.basePath, originalPath, this.basePath, newPath).catch((error) => {
// The move can fail if the path has encoded characters. Try again if that's the case.
const decodedOriginal = decodeURI(originalPath),
decodedNew = decodeURI(newPath);
if (decodedOriginal != originalPath || decodedNew != newPath) {
return this.file.moveFile(this.basePath, decodedOriginal, this.basePath, decodedNew);
} else {
return Promise.reject(error);
}
});
} }
}); });
} }
@ -645,7 +655,17 @@ export class CoreFileProvider {
return this.file.copyFile(fromDir, fromFileAndDir.name, toDir, toFileAndDir.name); return this.file.copyFile(fromDir, fromFileAndDir.name, toDir, toFileAndDir.name);
} else { } else {
return this.file.copyFile(this.basePath, from, this.basePath, to); return this.file.copyFile(this.basePath, from, this.basePath, to).catch((error) => {
// The copy can fail if the path has encoded characters. Try again if that's the case.
const decodedFrom = decodeURI(from),
decodedTo = decodeURI(to);
if (from != decodedFrom || to != decodedTo) {
return this.file.copyFile(this.basePath, decodedFrom, this.basePath, decodedTo);
} else {
return Promise.reject(error);
}
});
} }
}); });
} }