Skip to content

refactor(file-browser): extract reusable deletion logic and abstract Termux URI validation #2548

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
+47 −73
Open

refactor(file-browser): extract reusable deletion logic and abstract Termux URI validation #2548

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
120 changes: 47 additions & 73 deletions src/pages/fileBrowser/fileBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,43 +603,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
);

try {
for (const url of selectedItems) {
if ((await fsOperation(url).stat()).isDirectory) {
if (url.startsWith("content://com.termux.documents/tree/")) {
const fs = fsOperation(url);
const entries = await fs.lsDir();
if (entries.length === 0) {
await fs.delete();
} else {
const deleteRecursively = async (currentUrl) => {
const currentFs = fsOperation(currentUrl);
const currentEntries = await currentFs.lsDir();
for (const entry of currentEntries) {
if (entry.isDirectory) {
await deleteRecursively(entry.url);
} else {
await fsOperation(entry.url).delete();
}
}
await currentFs.delete();
};
await deleteRecursively(url);
}
} else {
await fsOperation(url).delete();
}
helpers.updateUriOfAllActiveFiles(url);
recents.removeFolder(url);
} else {
const fs = fsOperation(url);
await fs.delete();
const openedFile = editorManager.getFile(url, "uri");
if (openedFile) openedFile.uri = null;
}
recents.removeFile(url);
openFolder.removeItem(url);
delete cachedDir[url];
}
for (const url of selectedItems) await deleteDirOrFile(url);
toast(strings.success);
reload();
isSelectionMode = false;
Expand Down Expand Up @@ -688,6 +652,50 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
$page.hide();
}

/**
* @param {string} url
*/
function isTermuxUrl(url) {
url = `${url ?? ""}`;
return url.startsWith("content://com.termux.documents/tree/");
}

/**
* @param {string} url
* @param {string} [type]
*/
async function deleteDirOrFile(url, type) {
const fs = fsOperation(url);
const isDir = type ? helpers.isDir(type) : (await fs.stat()).isDirectory;

if (isDir && isTermuxUrl(url)) {
const deleteRecursively = async (currentFs) => {
const entries = await currentFs.lsDir();
if (entries) {
for (const entry of entries) {
const fs = fsOperation(entry.url);
await (entry.isDirectory ? deleteRecursively(fs) : fs.delete());
}
}
await currentFs.delete();
};
await deleteRecursively(fs);
} else {
await fs.delete();
}

if (isDir) {
helpers.updateUriOfAllActiveFiles(url);
recents.removeFolder(url);
} else {
const openedFile = editorManager.getFile(url, "uri");
if (openedFile) openedFile.uri = null;
}
recents.removeFile(url);
openFolder.removeItem(url);
delete cachedDir[url];
}

function updateSelectionCount($count) {
if ($count) {
$count.textContent = `${selectedItems.size} items selected`;
Expand Down Expand Up @@ -1151,7 +1159,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
}

async function renameFile(newname) {
if (url.startsWith("content://com.termux.documents/tree/")) {
if (isTermuxUrl(url)) {
if (helpers.isDir(type)) {
alert(strings.warning, strings["rename not supported"]);
return;
Expand Down Expand Up @@ -1203,42 +1211,8 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {

async function removeFile() {
try {
if (helpers.isDir(type)) {
if (url.startsWith("content://com.termux.documents/tree/")) {
const fs = fsOperation(url);
const entries = await fs.lsDir();
if (entries.length === 0) {
await fs.delete();
} else {
const deleteRecursively = async (currentUrl) => {
const currentFs = fsOperation(currentUrl);
const currentEntries = await currentFs.lsDir();
for (const entry of currentEntries) {
if (entry.isDirectory) {
await deleteRecursively(entry.url);
} else {
await fsOperation(entry.url).delete();
}
}
await currentFs.delete();
};
await deleteRecursively(url);
}
} else {
await fsOperation(url).delete();
}
helpers.updateUriOfAllActiveFiles(url);
recents.removeFolder(url);
} else {
const fs = fsOperation(url);
await fs.delete();
const openedFile = editorManager.getFile(url, "uri");
if (openedFile) openedFile.uri = null;
}
recents.removeFile(url);
openFolder.removeItem(url);
await deleteDirOrFile(url, type);
toast(strings.success);
delete cachedDir[url];
reload();
} catch (err) {
window.log("error", err);
Expand Down