modify escape system to enable prefix specify

puutaro · Jun 17, 2024 · eeaa97d · eeaa97d
1 parent ca73318
commit eeaa97d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/app/src/main/assets/appSystemDir/version/preference/preferenceDir/info/escape.tsv b/app/src/main/assets/appSystemDir/version/preference/preferenceDir/info/escape.tsv
@@ -1,3 +1,5 @@
 preferenceDir/settings/fannelStateStock.tsv
 preferenceDir/hideSettingVals/recentSettingHideVals.js
+preferenceDir/settings/homeScriptUrlsPath.txt
+preferenceDir/longPressMenuDir
 preference.js	1
diff --git a/...com/puutaro/commandclick/fragment_lib/command_index_fragment/init/CmdClickSystemAppDir.kt b/...com/puutaro/commandclick/fragment_lib/command_index_fragment/init/CmdClickSystemAppDir.kt
@@ -144,12 +144,12 @@ object CmdClickSystemAppDir {
 //                    escapeFilePath
 //                ).split("\n").filter { it.isNotEmpty() }
             withContext(Dispatchers.IO) {
-                FileSystems.updateFile(
-                    File(UsePath.cmdclickDefaultAppDirPath, "escape.txt").absolutePath,
-                    listOf(
-                        "${escapeMapList}"
-                    ).joinToString("\n\b") + "\n-------------\n\n"
-                )
+//                FileSystems.updateFile(
+//                    File(UsePath.cmdclickDefaultAppDirPath, "escape.txt").absolutePath,
+//                    listOf(
+//                        "${escapeMapList}"
+//                    ).joinToString("\n\b") + "\n-------------\n\n"
+//                )
                 AssetsFileManager.copyFileOrDirFromAssets(
                     context,
                     fannelRawDirAssetsPath,

diff --git a/app/src/main/java/com/puutaro/commandclick/util/file/AssetsFileManager.kt b/app/src/main/java/com/puutaro/commandclick/util/file/AssetsFileManager.kt
@@ -2,7 +2,6 @@ package com.puutaro.commandclick.util.file
 
 import android.content.Context
 import android.util.Log
-import com.puutaro.commandclick.common.variable.path.UsePath
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -161,9 +160,13 @@ object AssetsFileManager {
 //                "contain: ${escapeRelativeAssetsPathList.contains(assetsRelativeFilePath)}",
 //            ).joinToString("\n\n") + "\n------\n"
 //        )
+        val isContainEscapeRelativePathList = escapeRelativeAssetsPathList.any {
+            escapeRelativePath ->
+            assetsRelativeFilePath.startsWith(escapeRelativePath)
+        }
         if(
             newFilePathObj.isFile
-            && escapeRelativeAssetsPathList.contains(assetsRelativeFilePath)
+            && isContainEscapeRelativePathList
         ) return
         val newFilePath = newFilePathObj.absoluteFile
         val assetManager = context?.getAssets()