expo-tiddlywiki-filesystem-android-external-storage 2.2.0 → 2.2.2

package/android/src/main/java/expo/modules/externalstorage/ExternalStorageModule.kt

@@ -590,6 +590,8 @@ class ExternalStorageModule : Module() {
       val changes = JSONArray()
       val indexPaths = mutableSetOf<String>()
 
+      var modifiedCount = 0
+      var deletedCount = 0
       for (entry in indexEntries) {
         indexPaths.add(entry.path)
         val workFile = File(root, entry.path)
@@ -599,6 +601,7 @@ class ExternalStorageModule : Module() {
           obj.put("path", entry.path)
           obj.put("type", "delete")
           changes.put(obj)
+          deletedCount++
         } else {
           // Check stat cache: size and mtime
           val diskSize = workFile.length()
@@ -608,23 +611,119 @@ class ExternalStorageModule : Module() {
             obj.put("path", entry.path)
             obj.put("type", "modify")
             changes.put(obj)
+            modifiedCount++
+            if (modifiedCount <= 3) {
+              android.util.Log.i("GitStatus", "  modify: ${entry.path} disk(size=$diskSize,mtime=$diskMtime) vs index(size=${entry.size},mtime=${entry.mtimeSeconds})")
+            }
           }
         }
       }
 
       // 4. Files on disk but not in index → added
+      var addedCount = 0
       for (path in workdirFiles) {
         if (path !in indexPaths) {
           val obj = JSONObject()
           obj.put("path", path)
           obj.put("type", "add")
           changes.put(obj)
+          addedCount++
+          if (addedCount <= 5) {
+            android.util.Log.i("GitStatus", "  add: $path")
+          }
         }
       }
 
+      android.util.Log.i("GitStatus", "Result: ${changes.length()} changes (add=$addedCount, modify=$modifiedCount, delete=$deletedCount), indexEntries=${indexEntries.size}, workdirFiles=${workdirFiles.size}")
       changes.toString()
     }
 
+    /**
+     * Return diagnostic info about git index vs working directory.
+     * Used to debug why gitStatus returns 0 when changes exist.
+     */
+    AsyncFunction("gitStatusDebug") { gitRootDir: String ->
+      val root = File(gitRootDir)
+      val gitDir = File(root, ".git")
+      val indexFile = File(gitDir, "index")
+
+      val result = JSONObject()
+
+      if (!indexFile.exists()) {
+        result.put("error", "no git index file")
+        return@AsyncFunction result.toString()
+      }
+
+      val indexEntries = parseGitIndex(indexFile)
+      result.put("indexEntryCount", indexEntries.size)
+
+      // Sample a few index entries with their stats
+      val indexSamples = JSONArray()
+      // Find $__StoryList.tid or similar common tiddler in the index
+      val storyListEntry = indexEntries.find { it.path == "tiddlers/\$__StoryList.tid" }
+      if (storyListEntry != null) {
+        val obj = JSONObject()
+        obj.put("path", storyListEntry.path)
+        obj.put("indexSize", storyListEntry.size)
+        obj.put("indexMtime", storyListEntry.mtimeSeconds)
+        val workFile = File(root, storyListEntry.path)
+        obj.put("diskExists", workFile.exists())
+        if (workFile.exists()) {
+          obj.put("diskSize", workFile.length())
+          obj.put("diskMtime", workFile.lastModified() / 1000)
+          obj.put("diskMtimeMs", workFile.lastModified())
+          obj.put("sizeMatch", workFile.length() == storyListEntry.size)
+          obj.put("mtimeMatch", workFile.lastModified() / 1000 == storyListEntry.mtimeSeconds)
+        }
+        indexSamples.put(obj)
+      }
+
+      // Check 新条目.tid
+      val newEntryFile = File(root, "tiddlers/新条目.tid")
+      val newObj = JSONObject()
+      newObj.put("path", "tiddlers/新条目.tid")
+      newObj.put("diskExists", newEntryFile.exists())
+      if (newEntryFile.exists()) {
+        newObj.put("diskSize", newEntryFile.length())
+        newObj.put("diskMtime", newEntryFile.lastModified() / 1000)
+      }
+      val inIndex = indexEntries.any { it.path == "tiddlers/新条目.tid" }
+      newObj.put("inIndex", inIndex)
+      indexSamples.put(newObj)
+
+      // Walk working dir and count
+      val skipDirs = setOf(".git", "node_modules", "output")
+      val workdirFiles = mutableSetOf<String>()
+      fun walkDir(dir: File, prefix: String) {
+        val children = dir.listFiles() ?: return
+        for (child in children) {
+          val relPath = if (prefix.isEmpty()) child.name else "$prefix/${child.name}"
+          if (child.isDirectory) {
+            if (child.name !in skipDirs) walkDir(child, relPath)
+          } else {
+            workdirFiles.add(relPath)
+          }
+        }
+      }
+      walkDir(root, "")
+
+      result.put("workdirFileCount", workdirFiles.size)
+      result.put("tiddlerFileCount", workdirFiles.count { it.startsWith("tiddlers/") })
+      result.put("newEntryInWorkdir", workdirFiles.contains("tiddlers/新条目.tid"))
+      result.put("samples", indexSamples)
+
+      // Count files in workdir not in index (potential adds)
+      val indexPaths = indexEntries.map { it.path }.toSet()
+      val addCount = workdirFiles.count { it !in indexPaths }
+      result.put("potentialAddCount", addCount)
+      // List first 5 potential adds
+      val addSamples = JSONArray()
+      workdirFiles.filter { it !in indexPaths }.take(5).forEach { addSamples.put(it) }
+      result.put("potentialAddSamples", addSamples)
+
+      result.toString()
+    }
+
     // ─── TiddlyWiki batch file parsing ─────────────────────────────────
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-tiddlywiki-filesystem-android-external-storage",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Expo native module for TidGi-Mobile: external storage I/O + TiddlyWiki .tid/.meta/.json batch parsing in Kotlin",
   "main": "build/index.js",
   "types": "build/index.d.ts",