Skip to content

Commit 1b2966e

Browse files
committed
add validation miss import path in ac import
1 parent 3a39357 commit 1b2966e

File tree

3 files changed

+76
-9
lines changed

3 files changed

+76
-9
lines changed

app/src/main/java/com/puutaro/commandclick/common/variable/CheckTool.kt

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ object CheckTool {
10391039
putColorConByVarNotInit,
10401040
errMessage,
10411041
)
1042-
// val putColorConByMissLastUseVarKey = MissLastUseVarKey.makePutColorCon(
1043-
// putColorConByRunVarPrefixUsedErr,
1044-
// errMessage,
1045-
// )
1046-
val putColorConByMissLastVarKeyErrForAcVar = MissLastVarKeyErrForAcVar.makePutColorCon(
1042+
val putColorConByMissImportPathErr = MissImportPathErr.makePutColorCon(
10471043
putColorConByRunVarPrefixUsedErr,
10481044
errMessage,
10491045
)
1046+
val putColorConByMissLastVarKeyErrForAcVar = MissLastVarKeyErrForAcVar.makePutColorCon(
1047+
putColorConByMissImportPathErr,
1048+
errMessage,
1049+
)
10501050
val putColorConByMissVarKeyErr = MissLastReturnKeyErrForAcImport.makePutColorCon(
10511051
putColorConByMissLastVarKeyErrForAcVar,
10521052
errMessage,
@@ -2408,6 +2408,51 @@ object CheckTool {
24082408
}
24092409
}
24102410

2411+
object MissImportPathErr {
2412+
2413+
private val actionVarKey =
2414+
JsActionKeyManager.JsActionsKey.ACTION_VAR.key
2415+
private val importPathSubKey =
2416+
JsActionKeyManager.ActionImportManager.ActionImportKey.MISS_IMPORT_PATH.key
2417+
private val missImportPathErrMark = "?${importPathSubKey}="
2418+
private val missImportPathErrMessage =
2419+
"Miss '${importPathSubKey}' in ${actionVarKey} section"
2420+
2421+
fun makePutColorCon(
2422+
curPutColorCon: String,
2423+
errMessage: String,
2424+
): String {
2425+
val isNotErr = !errMessage.startsWith(missImportPathErrMessage)
2426+
if (
2427+
isNotErr
2428+
) return curPutColorCon
2429+
return curPutColorCon
2430+
.replace(
2431+
missImportPathErrMark,
2432+
"<span style=\"color:${errRedCode};\">${missImportPathErrMark}</span>",
2433+
)
2434+
}
2435+
2436+
fun check(
2437+
context: Context?,
2438+
actionImportedCon: String,
2439+
): Boolean {
2440+
if(
2441+
actionImportedCon.isEmpty()
2442+
) return false
2443+
val isNotmissImportPathErrMarkKey = !actionImportedCon.contains(
2444+
missImportPathErrMark
2445+
)
2446+
if(
2447+
isNotmissImportPathErrMarkKey
2448+
) return false
2449+
saveFirstLog(
2450+
context,
2451+
missImportPathErrMessage
2452+
)
2453+
return true
2454+
}
2455+
}
24112456
object MissLastVarKeyErrForAcVar {
24122457

24132458
private val actionVarKey =

app/src/main/java/com/puutaro/commandclick/proccess/js_macro_libs/common_libs/JsActionKeyManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ object JsActionKeyManager {
1717
JS_PATH("jsPath"),
1818
JS_IMPORT("jsImport"),
1919
TSV_VARS("tsvVars"),
20-
ACTION_VAR("actionVar"),
20+
ACTION_VAR("acVar"),
2121
}
2222

2323
enum class CommonPathKey(
2424
val key: String
2525
) {
2626
IMPORT_PATH("importPath"),
27-
// USE(TsvImportManager.tsvImportUsePhrase),
2827
}
2928

3029

@@ -139,6 +138,7 @@ object JsActionKeyManager {
139138
MISS_LAST_USE_VAR_KEY("MISS_LAST_USE_VAR_KEY"),
140139
MISS_LAST_VAR_KEY("MISS_LAST_VAR_KEY"),
141140
MISS_LAST_RETURN_KEY("MISS_LAST_RETURN_KEY"),
141+
MISS_IMPORT_PATH("MISS_IMPORT_PATH"),
142142
}
143143

144144
fun putActionImportSubKey(mainAndSubKeyCon: String): String {

app/src/main/java/com/puutaro/commandclick/proccess/js_macro_libs/common_libs/JsActionTool.kt

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,15 @@ object JsActionTool {
302302
isRunVarPrefixUsedErr
303303
) return true
304304
}
305+
CheckTool.MissImportPathErr.check(
306+
context,
307+
actionImportedCon,
308+
).let {
309+
isMissImportPathErr ->
310+
if(
311+
isMissImportPathErr
312+
) return true
313+
}
305314
CheckTool.MissLastVarKeyErrForAcVar.check(
306315
context,
307316
actionImportedCon
@@ -765,7 +774,8 @@ private object KeyToSubKeyMapListMaker {
765774
setReplaceVariableMap
766775
)
767776
for( i in 1..importRoopLimit) {
768-
var errType: ActionImportPutter.ErrSignal = ActionImportPutter.ErrSignal.NO_ERR
777+
var errType: ActionImportPutter.ErrSignal =
778+
ActionImportPutter.ErrSignal.NO_ERR
769779
keyToSubKeyConList = keyToSubKeyConList.map {
770780
keyToSubKeyPair ->
771781
val mainKeyName = keyToSubKeyPair.first
@@ -1007,6 +1017,17 @@ private object ActionImportPutter {
10071017
JsActionKeyManager.ActionImportManager.ActionImportKey.IMPORT_PATH.key
10081018
)
10091019
)
1020+
if(
1021+
importPathSrc.isEmpty()
1022+
){
1023+
val missImportKey =
1024+
"${JsActionKeyManager.ActionImportManager.ActionImportKey.MISS_IMPORT_PATH.key}="
1025+
val actionVarSec = subKeyCon.replace(
1026+
Regex("(${actionVarKey}=[^?|]+)"),
1027+
"|$1?${missImportKey}"
1028+
)
1029+
return actionVarSec to ErrSignal.ERR
1030+
}
10101031
// FileSystems.updateFile(
10111032
// File(UsePath.cmdclickDefaultAppDirPath,"jsAcImport.txt").absolutePath,
10121033
// listOf(
@@ -1016,7 +1037,8 @@ private object ActionImportPutter {
10161037
// "importPathSrc: ${importPathSrc}",
10171038
// ).joinToString("\n\n") + "\n-----\n"
10181039
// )
1019-
val importPath = JsActionKeyManager.PathExistChecker.makeCodeOrPath(importPathSrc)
1040+
val importPath =
1041+
JsActionKeyManager.PathExistChecker.makeCodeOrPath(importPathSrc)
10201042
val isNotFoundPrefix =
10211043
importPath.startsWith(JsActionKeyManager.PathExistChecker.notFoundCodePrefix)
10221044
val pathNotRegisterInRepValErrSignal =

0 commit comments

Comments
 (0)