Merge branch 'Acode-Foundation:main' into codemirror

Author: bajrangCoder

.github/workflows/close-inactive-issues.yml

@@ -24,7 +24,7 @@ jobs:
           close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
           days-before-pr-stale: -1
           days-before-pr-close: -1
-          exempt-issue-labels: "new plugin idea, todo"
+          exempt-issue-labels: "new plugin idea, todo, enhancement, bug, Low priority, documentation"
           operations-per-run: 100
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

src/components/terminal/terminalManager.js

@@ -19,12 +19,15 @@ class TerminalManager {
 		this.terminalCounter = 0;
 	}
 
-	getPersistedSessions() {
+	async getPersistedSessions() {
 		try {
 			const stored = helpers.parseJSON(
 				localStorage.getItem(TERMINAL_SESSION_STORAGE_KEY),
 			);
 			if (!Array.isArray(stored)) return [];
+			if (!(await Terminal.isAxsRunning())) {
+				return [];
+			}
 			return stored
 				.map((entry) => {
 					if (!entry) return null;
@@ -58,11 +61,11 @@ class TerminalManager {
 		}
 	}
 
-	persistTerminalSession(pid, name) {
+	async persistTerminalSession(pid, name) {
 		if (!pid) return;
 
 		const pidStr = String(pid);
-		const sessions = this.getPersistedSessions();
+		const sessions = await this.getPersistedSessions();
 		const existingIndex = sessions.findIndex(
 			(session) => session.pid === pidStr,
 		);
@@ -83,11 +86,11 @@ class TerminalManager {
 		this.savePersistedSessions(sessions);
 	}
 
-	removePersistedSession(pid) {
+	async removePersistedSession(pid) {
 		if (!pid) return;
 
 		const pidStr = String(pid);
-		const sessions = this.getPersistedSessions();
+		const sessions = await this.getPersistedSessions();
 		const nextSessions = sessions.filter((session) => session.pid !== pidStr);
 
 		if (nextSessions.length !== sessions.length) {
@@ -96,7 +99,7 @@ class TerminalManager {
 	}
 
 	async restorePersistedSessions() {
-		const sessions = this.getPersistedSessions();
+		const sessions = await this.getPersistedSessions();
 		if (!sessions.length) return;
 
 		const manager = window.editorManager;
@@ -185,7 +188,7 @@ class TerminalManager {
 			});
 
 			// Wait for tab creation and setup
-			const terminalInstance = await new Promise((resolve, reject) => {
+			return await new Promise((resolve, reject) => {
 				setTimeout(async () => {
 					try {
 						// Mount terminal component
@@ -222,7 +225,10 @@ class TerminalManager {
 						this.terminals.set(uniqueId, instance);
 
 						if (terminalComponent.serverMode && terminalComponent.pid) {
-							this.persistTerminalSession(terminalComponent.pid, terminalName);
+							await this.persistTerminalSession(
+								terminalComponent.pid,
+								terminalName,
+							);
 						}
 						resolve(instance);
 					} catch (error) {
@@ -231,8 +237,6 @@ class TerminalManager {
 					}
 				}, 100);
 			});
-
-			return terminalInstance;
 		} catch (error) {
 			console.error("Failed to create terminal:", error);
 			throw error;
@@ -336,7 +340,7 @@ class TerminalManager {
 		});
 
 		// Wait for tab creation and setup
-		const terminalInstance = await new Promise((resolve, reject) => {
+		return await new Promise((resolve, reject) => {
 			setTimeout(async () => {
 				try {
 					// Mount terminal component
@@ -376,8 +380,6 @@ class TerminalManager {
 				}
 			}, 100);
 		});
-
-		return terminalInstance;
 	}
 
 	/**
@@ -386,7 +388,7 @@ class TerminalManager {
 	 * @param {TerminalComponent} terminalComponent - Terminal component
 	 * @param {string} terminalId - Terminal ID
 	 */
-	setupTerminalHandlers(terminalFile, terminalComponent, terminalId) {
+	async setupTerminalHandlers(terminalFile, terminalComponent, terminalId) {
 		// Handle tab focus/blur
 		terminalFile.onfocus = () => {
 			// Guarded fit on focus: only fit if cols/rows would change, then focus
@@ -504,14 +506,17 @@ class TerminalManager {
 			this.closeTerminal(terminalId);
 		};
 
-		terminalComponent.onTitleChange = (title) => {
+		terminalComponent.onTitleChange = async (title) => {
 			if (title) {
 				// Format terminal title as "Terminal ! - title"
 				const formattedTitle = `Terminal ${this.terminalCounter} - ${title}`;
 				terminalFile.filename = formattedTitle;
 
 				if (terminalComponent.serverMode && terminalComponent.pid) {
-					this.persistTerminalSession(terminalComponent.pid, formattedTitle);
+					await this.persistTerminalSession(
+						terminalComponent.pid,
+						formattedTitle,
+					);
 				}
 
 				// Refresh the header subtitle if this terminal is active

src/pages/fileBrowser/fileBrowser.js

@@ -748,6 +748,20 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 				});
 			}
 
+			async function getShareableUri(fileUrl) {
+				if (!fileUrl) return null;
+				try {
+					const fs = fsOperation(fileUrl);
+					if (/^s?ftp:/.test(fileUrl)) {
+						return fs.localName;
+					}
+					const stat = await fs.stat();
+					return stat?.url || null;
+				} catch (error) {
+					return null;
+				}
+			}
+
 			async function contextMenuHandler() {
 				if (appSettings.value.vibrateOnTap) {
 					navigator.vibrate(constants.VIBRATION_TIME);
@@ -824,19 +838,20 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 
 					case "open_with":
 						try {
-							let mimeType = mimeTypes.lookup(name || "text/plain");
-							const fs = fsOperation(url);
-							if (/^s?ftp:/.test(url)) return fs.localName;
-
-							system.fileAction(
-								(await fs.stat()).url,
-								name,
-								"VIEW",
-								mimeType,
-								() => {
-									toast(strings["no app found to handle this file"]);
-								},
-							);
+							const shareableUri = await getShareableUri(url);
+							if (!shareableUri) {
+								toast(strings["no app found to handle this file"]);
+								break;
+							}
+
+							const mimeType =
+								mimeTypes.lookup(name) ||
+								mimeTypes.lookup(shareableUri) ||
+								"text/plain";
+
+							system.fileAction(shareableUri, name, "VIEW", mimeType, () => {
+								toast(strings["no app found to handle this file"]);
+							});
 						} catch (error) {
 							console.error(error);
 							toast(strings.error);