From eeaa97dbdb3b1ae250a4fd19d1df7aec210c3698 Mon Sep 17 00:00:00 2001
From: puutaro <hoperstep@gmail.com>
Date: Mon, 17 Jun 2024 09:09:25 +0900
Subject: [PATCH] modify escape system to enable prefix specify

---
 .../version/preference/preferenceDir/info/escape.tsv |  2 ++
 .../init/CmdClickSystemAppDir.kt                     | 12 ++++++------
 .../commandclick/util/file/AssetsFileManager.kt      |  7 +++++--
 3 files changed, 13 insertions(+), 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
index 68682539a..591dfe9c0 100644
--- 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
\ No newline at end of file
diff --git a/app/src/main/java/com/puutaro/commandclick/fragment_lib/command_index_fragment/init/CmdClickSystemAppDir.kt b/app/src/main/java/com/puutaro/commandclick/fragment_lib/command_index_fragment/init/CmdClickSystemAppDir.kt
index f729ded39..969d47608 100755
--- a/app/src/main/java/com/puutaro/commandclick/fragment_lib/command_index_fragment/init/CmdClickSystemAppDir.kt
+++ b/app/src/main/java/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
index ff13a5273..20ba8486d 100755
--- 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()