Merge remote-tracking branch 'origin/main' into codemirror

Author: bajrangCoder

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

@@ -22,6 +22,7 @@ jobs:
 
             Thanks for your help!
           close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          exempt-all-milestones: true
           days-before-pr-stale: -1
           days-before-pr-close: -1
           exempt-issue-labels: "new plugin idea, todo, enhancement, bug, Low priority, documentation"

bun.lock

@@ -828,26 +828,44 @@ export default class EditorFile {
 		}
 
 		const protocol = Url.getProtocol(this.#uri);
-		let fs;
+		const text = this.session.doc.toString();
+
 		if (/s?ftp:/.test(protocol)) {
 			// if file is a ftp or sftp file, get file content from cached file.
 			// remove ':' from protocol because cache file of remote files are
 			// stored as ftp102525465N i.e. protocol + id
+			// Cache files are local file:// URIs, so native file reading works
 			const cacheFilename = protocol.slice(0, -1) + this.id;
-			const cacheFile = Url.join(CACHE_STORAGE, cacheFilename);
-			fs = fsOperation(cacheFile);
-		} else {
-			fs = fsOperation(this.uri);
+			const cacheFileUri = Url.join(CACHE_STORAGE, cacheFilename);
+
+			try {
+				return await system.compareFileText(cacheFileUri, this.encoding, text);
+			} catch (error) {
+				console.error("Native compareFileText failed:", error);
+				return false;
+			}
+		}
+
+		if (/^(file|content):/.test(protocol)) {
+			// file:// and content:// URIs can be handled by native Android code
+			// Native reads file AND compares in background thread
+			try {
+				return await system.compareFileText(this.uri, this.encoding, text);
+			} catch (error) {
+				console.error("Native compareFileText failed:", error);
+				return false;
+			}
 		}
 
 		try {
+			const fs = fsOperation(this.uri);
 			const oldText = await fs.readFile(this.encoding);
 			const text = this.session.doc.toString();
 
-			if (oldText.length !== text.length) return true;
-			return oldText !== text;
+			// Offload string comparison to background thread
+			return await system.compareTexts(oldText, text);
 		} catch (error) {
-			window.log("error", error);
+			console.error(error);
 			return false;
 		}
 	}

src/lib/editorFile.js

@@ -78,6 +78,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 
 import android.os.Build;
 import android.os.Environment;
@@ -169,6 +171,8 @@ public boolean execute(
             case "decode":
             case "encode":
             case "copyToUri":
+            case "compare-file-text":
+            case "compare-texts":
                 break;
             case "get-configuration":
                 getConfiguration(callbackContext);
@@ -505,6 +509,12 @@ public void run() {
                             case "encode":
                                 encode(arg1, arg2, callbackContext);
                                 break;
+                            case "compare-file-text":
+                                compareFileText(arg1, arg2, arg3, callbackContext);
+                                break;
+                            case "compare-texts":
+                                compareTexts(arg1, arg2, callbackContext);
+                                break;
                             default:
                                 break;
                         }
@@ -616,6 +626,146 @@ private void encode(
         }
     }
 
+    /**
+     * Compares file content with provided text.
+     * This method runs in a background thread to avoid blocking the UI.
+     * 
+     * @param fileUri The URI of the file to read (file:// or content://)
+     * @param encoding The character encoding to use when reading the file
+     * @param currentText The text to compare against the file content
+     * @param callback Returns 1 if texts are different, 0 if same
+     */
+    private void compareFileText(
+        String fileUri,
+        String encoding,
+        String currentText,
+        CallbackContext callback
+    ) {
+        try {
+            if (fileUri == null || fileUri.isEmpty()) {
+                callback.error("File URI is required");
+                return;
+            }
+
+            if (encoding == null || encoding.isEmpty()) {
+                encoding = "UTF-8";
+            }
+
+            if (!Charset.isSupported(encoding)) {
+                callback.error("Charset not supported: " + encoding);
+                return;
+            }
+
+            Uri uri = Uri.parse(fileUri);
+            Charset charset = Charset.forName(encoding);
+            String fileContent;
+
+            // Handle file:// URIs
+            if ("file".equalsIgnoreCase(uri.getScheme())) {
+                File file = new File(uri.getPath());
+                
+                // Validate file
+                if (!file.exists()) {
+                    callback.error("File does not exist");
+                    return;
+                }
+                if (!file.isFile()) {
+                    callback.error("Path is not a file");
+                    return;
+                }
+                if (!file.canRead()) {
+                    callback.error("File is not readable");
+                    return;
+                }
+
+                Path path = file.toPath();
+                fileContent = new String(Files.readAllBytes(path), charset);
+
+            } else {
+                // Handle content:// URIs
+                InputStream inputStream = null;
+                try {
+                    inputStream = context.getContentResolver().openInputStream(uri);
+                    
+                    if (inputStream == null) {
+                        callback.error("Cannot open file");
+                        return;
+                    }
+
+                    StringBuilder sb = new StringBuilder();
+                    try (BufferedReader reader = new BufferedReader(
+                            new InputStreamReader(inputStream, charset))) {
+                        char[] buffer = new char[8192];
+                        int charsRead;
+                        while ((charsRead = reader.read(buffer)) != -1) {
+                            sb.append(buffer, 0, charsRead);
+                        }
+                    }
+                    fileContent = sb.toString();
+                    
+                } finally {
+                    if (inputStream != null) {
+                        try {
+                            inputStream.close();
+                        } catch (IOException ignored) {}
+                    }
+                }
+            }
+
+            // check length first 
+            if (fileContent.length() != currentText.length()) {
+                callback.success(1); // Changed
+                return;
+            }
+
+            // Full comparison
+            if (fileContent.equals(currentText)) {
+                callback.success(0); // Not changed
+            } else {
+                callback.success(1); // Changed
+            }
+
+        } catch (Exception e) {
+            callback.error(e.toString());
+        }
+    }
+
+    /**
+     * Compares two text strings.
+     * This method runs in a background thread to avoid blocking the UI
+     * for large string comparisons.
+     * 
+     * @param text1 First text to compare
+     * @param text2 Second text to compare
+     * @param callback Returns 1 if texts are different, 0 if same
+     */
+    private void compareTexts(
+        String text1,
+        String text2,
+        CallbackContext callback
+    ) {
+        try {
+            if (text1 == null) text1 = "";
+            if (text2 == null) text2 = "";
+
+            // check length first
+            if (text1.length() != text2.length()) {
+                callback.success(1); // Changed
+                return;
+            }
+
+            // Full comparison
+            if (text1.equals(text2)) {
+                callback.success(0); // Not changed
+            } else {
+                callback.success(1); // Changed
+            }
+
+        } catch (Exception e) {
+            callback.error(e.toString());
+        }
+    }
+
     private void getAvailableEncodings(CallbackContext callback) {
         try {
             Map < String, Charset > charsets = Charset.availableCharsets();

src/plugins/system/android/com/foxdebug/system/System.java

@@ -155,5 +155,44 @@ module.exports = {
   },
   getGlobalSetting: function (key, onSuccess, onFail) {
     cordova.exec(onSuccess, onFail, 'System', 'get-global-setting', [key]);
+  },
+  /**
+   * Compare file content with provided text in a background thread.
+   * @param {string} fileUri - The URI of the file to read
+   * @param {string} encoding - The character encoding to use
+   * @param {string} currentText - The text to compare against
+   * @returns {Promise<boolean>} - Resolves to true if content differs, false if same
+   */
+  compareFileText: function (fileUri, encoding, currentText) {
+    return new Promise((resolve, reject) => {
+      cordova.exec(
+        function(result) {
+          resolve(result === 1);
+        },
+        reject,
+        'System',
+        'compare-file-text',
+        [fileUri, encoding, currentText]
+      );
+    });
+  },
+  /**
+   * Compare two text strings in a background thread.
+   * @param {string} text1 - First text to compare
+   * @param {string} text2 - Second text to compare
+   * @returns {Promise<boolean>} - Resolves to true if texts differ, false if same
+   */
+  compareTexts: function (text1, text2) {
+    return new Promise((resolve, reject) => {
+      cordova.exec(
+        function(result) {
+          resolve(result === 1);
+        },
+        reject,
+        'System',
+        'compare-texts',
+        [text1, text2]
+      );
+    });
   }
 };

src/plugins/system/www/plugin.js

@@ -47,7 +47,7 @@ class Executor {
             const match = message.match(/^([^:]+):(.*)$/);
             if (match) {
               const prefix = match[1];         // e.g. "stdout"
-              const content = match[2].trim(); // output
+              const content = match[2]; // output
               onData(prefix, content);
             } else {
               onData("unknown", message);
@@ -198,4 +198,4 @@ class Executor {
 const executorInstance = new Executor();
 executorInstance.BackgroundExecutor = new Executor(true);
 
-module.exports = executorInstance;
+module.exports = executorInstance;