Skip to content

refactor(file-browser): consolidate rename logic and prevent empty file names #2560

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

Open
AuDevTist1C wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −30
Open

refactor(file-browser): consolidate rename logic and prevent empty file names #2560

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
46 changes: 16 additions & 30 deletions src/pages/fileBrowser/fileBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
case "rename": {
let newname = await prompt(strings.rename, name, "text", {
match: config.FILE_NAME_REGEX,
required: true,
Comment thread
AuDevTist1C marked this conversation as resolved.
});

newname = helpers.fixFilename(newname);
Expand Down Expand Up @@ -1160,40 +1161,25 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
}

async function renameFile(newname) {
if (isTermuxUrl(url)) {
if (helpers.isDir(type)) {
alert(strings.warning, strings["rename not supported"]);
return;
} else {
// Special handling for Termux content files
const fs = fsOperation(url);
try {
let newUrl;
try {
if (isTermuxUrl(url)) {
if (helpers.isDir(type)) {
alert(strings.warning, strings["rename not supported"]);
return;
} else {
// Special handling for Termux content files
const fs = fsOperation(url);
const content = await fs.readFile();
const newUrl = Url.join(Url.dirname(url), newname);
await fsOperation(Url.dirname(url)).createFile(newname, content);
const dirname = Url.dirname(url);
newUrl = Url.join(dirname, newname);
await fsOperation(dirname).createFile(newname, content);
await fs.delete();

recents.removeFile(url);
recents.addFile(newUrl);
const file = editorManager.getFile(url, "uri");
if (file) {
file.uri = newUrl;
file.filename = newname;
}
openFolder.renameItem(url, newUrl, newname);
toast(strings.success);
reload();
return;
} catch (err) {
window.log("error", err);
helpers.error(err);
return;
}
} else {
const fs = fsOperation(url);
newUrl = await fs.renameTo(newname);
}
}
const fs = fsOperation(url);
try {
const newUrl = await fs.renameTo(newname);
recents.removeFile(url);
recents.addFile(newUrl);
const file = editorManager.getFile(url, "uri");
Expand Down