Merge pull request #1046 from bajrangCoder/main

bajrangCoder · web-flow · commit 833557a00940 · 2024-10-13T21:59:34.000+05:30
fix: termux related fs operations failure
diff --git a/package.json b/package.json
@@ -106,4 +106,4 @@
     "yargs": "^17.7.2"
   },
   "browserslist": "cover 100%,not android < 5"
-}
+}
diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "الأكثر تنزيلًا",
 	"newly_added": "أضاف حديثا",
-	"top_rated": "أعلى تصنيف"
+	"top_rated": "أعلى تصنيف",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/be-by.json b/src/lang/be-by.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/de-de.json b/src/lang/de-de.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verifizierter Herausgeber",
 	"most_downloaded": "Meist Heruntergeladene",
 	"newly_added": "Neu Hinzugefügte",
-	"top_rated": "Am besten Bewertete"
+	"top_rated": "Am besten Bewertete",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/en-us.json b/src/lang/en-us.json
@@ -382,5 +382,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Publicador verificado",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json
@@ -382,5 +382,6 @@
 	"verified publisher": "सत्यापित प्रकाशक",
 	"most_downloaded": "सर्वाधिक डाउनलोड",
 	"newly_added": "नया नया़ा",
-	"top_rated": "टॉप रेटेड"
+	"top_rated": "टॉप रेटेड",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/id-id.json b/src/lang/id-id.json
@@ -383,5 +383,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json
@@ -382,5 +382,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/it-it.json b/src/lang/it-it.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json
@@ -381,5 +381,6 @@
 	"verified publisher": "検証済み発行者",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "대부분의 다운로드",
 	"newly_added": "새로 추가되었습니다",
-	"top_rated": "최고 평점"
+	"top_rated": "최고 평점",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json
@@ -381,5 +381,6 @@
 	"verified publisher": "പരിശോധിച്ച പ്രസാധകൻ",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Zweryfikowany wydawca",
 	"most_downloaded": "Najczęściej pobierane",
 	"newly_added": "Ostatnio dodane",
-	"top_rated": "Najwyżej oceniane"
+	"top_rated": "Najwyżej oceniane",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json
@@ -382,5 +382,6 @@
 	"verified publisher": "Проверенный издатель",
 	"most_downloaded": "Популярные",
 	"newly_added": "Новые",
-	"top_rated": "С высокой оценкой"
+	"top_rated": "С высокой оценкой",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json
@@ -381,5 +381,6 @@
 	"verified publisher": "Verified publisher",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json
@@ -382,5 +382,6 @@
 	"verified publisher": "Nhà phát hành đã xác minh",
 	"most_downloaded": "Tải xuống nhiều nhất",
 	"newly_added": "Mới được thêm vào",
-	"top_rated": "Đánh giá cao nhất"
+	"top_rated": "Đánh giá cao nhất",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json
@@ -381,5 +381,6 @@
 	"verified publisher": "已认证发布者",
 	"most_downloaded": "最多下载",
 	"newly_added": "最近上架",
-	"top_rated": "最多好评"
+	"top_rated": "最多好评",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json
@@ -381,5 +381,6 @@
 	"verified publisher": "已認證發布者",
 	"most_downloaded": "最多下載",
 	"newly_added": "最近上架",
-	"top_rated": "最多好評"
+	"top_rated": "最多好評",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json
@@ -381,5 +381,6 @@
 	"verified publisher": "已驗證的發行者",
 	"most_downloaded": "Most Downloaded",
 	"newly_added": "Newly Added",
-	"top_rated": "Top Rated"
+	"top_rated": "Top Rated",
+	"rename not supported": "Rename on termux dir isn't supported"
 }
diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js
@@ -1,6 +1,7 @@
 import collapsableList from "components/collapsableList";
 import Sidebar from "components/sidebar";
 import tile from "components/tile";
+import alert from "dialogs/alert";
 import confirm from "dialogs/confirm";
 import prompt from "dialogs/prompt";
 import select from "dialogs/select";
@@ -350,15 +351,40 @@ function execOperation(type, action, url, $target, name) {
 		const confirmation = await confirm(strings.warning, msg);
 		if (!confirmation) return;
 		startLoading();
-		await fsOperation(url).delete();
+		if (!(await fsOperation(url).exists())) return;
+		// await fsOperation(url).delete();
 		recents.removeFile(url);
 		if (helpers.isFile(type)) {
+			await fsOperation(url).delete();
 			$target.remove();
 			const file = editorManager.getFile(url, "uri");
 			if (file) file.uri = null;
 			editorManager.onupdate("delete-file");
 			editorManager.emit("update", "delete-file");
 		} else {
+			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();
+			}
 			recents.removeFolder(url);
 			helpers.updateUriOfAllActiveFiles(url, null);
 			$target.parentElement.remove();
@@ -371,6 +397,10 @@ function execOperation(type, action, url, $target, name) {
 	}
 
 	async function renameFile() {
+		if (url.startsWith("content://com.termux.documents/tree/")) {
+			alert(strings.warning, strings["rename not supported"]);
+			return;
+		}
 		let newName = await prompt(strings.rename, name, "text", {
 			match: constants.FILE_NAME_REGEX,
 			required: true,
diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js
@@ -3,6 +3,7 @@ import "./fileBrowser.scss";
 import Contextmenu from "components/contextmenu";
 import Page from "components/page";
 import searchBar from "components/searchbar";
+import alert from "dialogs/alert";
 import confirm from "dialogs/confirm";
 import loader from "dialogs/loader";
 import prompt from "dialogs/prompt";
@@ -447,6 +448,10 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 			}
 
 			async function renameFile(newname) {
+				if (url.startsWith("content://com.termux.documents/tree/")) {
+					alert(strings.warning, strings["rename not supported"]);
+					return;
+				}
 				const fs = fsOperation(url);
 				try {
 					const newUrl = await fs.renameTo(newname);
@@ -468,18 +473,40 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 
 			async function removeFile() {
 				try {
-					const fs = fsOperation(url);
-					await fs.delete();
-					recents.removeFile(url);
-					openFolder.removeItem(url);
-
 					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);
 					toast(strings.success);
 					delete cachedDir[url];
 					reload();

Original file line number	Diff line number	Diff line change
`@@ -381,5 +381,6 @@`
`381`	`381`	`"verified publisher": "Verified publisher",`
`382`	`382`	`"most_downloaded": "الأكثر تنزيلًا",`
`383`	`383`	`"newly_added": "أضاف حديثا",`
`384`		`- "top_rated": "أعلى تصنيف"`
	`384`	`+ "top_rated": "أعلى تصنيف",`
	`385`	`+ "rename not supported": "Rename on termux dir isn't supported"`
`385`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,5 +382,6 @@`
`382`	`382`	`"verified publisher": "Verified publisher",`
`383`	`383`	`"most_downloaded": "Most Downloaded",`
`384`	`384`	`"newly_added": "Newly Added",`
`385`		`- "top_rated": "Top Rated"`
	`385`	`+ "top_rated": "Top Rated",`
	`386`	`+ "rename not supported": "Rename on termux dir isn't supported"`
`386`	`387`	`}`