summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorLoyalsoldier <[email protected]>2024-11-03 07:51:31 +0800
committerLoyalsoldier <[email protected]>2024-11-03 07:51:31 +0800
commit5ddcf42db3b2633f73aa9fe7755174e4b0980814 (patch)
treecb956bc63e6e91c60f9149bb5953b09fbec28361 /plugin
parent3ea8192bacd484ea837426160c2f02f139c72100 (diff)
Fix: description of plaintext formats
Diffstat (limited to 'plugin')
-rw-r--r--plugin/plaintext/clash_in.go4
-rw-r--r--plugin/plaintext/clash_out.go4
-rw-r--r--plugin/plaintext/common_out.go4
-rw-r--r--plugin/plaintext/json_in.go2
-rw-r--r--plugin/plaintext/surge_in.go2
-rw-r--r--plugin/plaintext/surge_out.go2
-rw-r--r--plugin/plaintext/text_in.go6
-rw-r--r--plugin/plaintext/text_out.go2
8 files changed, 13 insertions, 13 deletions
diff --git a/plugin/plaintext/clash_in.go b/plugin/plaintext/clash_in.go
index 78af932f..9dc9ae2d 100644
--- a/plugin/plaintext/clash_in.go
+++ b/plugin/plaintext/clash_in.go
@@ -21,14 +21,14 @@ const (
func init() {
lib.RegisterInputConfigCreator(TypeClashRuleSetClassicalIn, func(action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
- return newTextIn(TypeClashRuleSetClassicalIn, action, data)
+ return newTextIn(TypeClashRuleSetClassicalIn, DescClashClassicalIn, action, data)
})
lib.RegisterInputConverter(TypeClashRuleSetClassicalIn, &TextIn{
Description: DescClashClassicalIn,
})
lib.RegisterInputConfigCreator(TypeClashRuleSetIPCIDRIn, func(action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
- return newTextIn(TypeClashRuleSetIPCIDRIn, action, data)
+ return newTextIn(TypeClashRuleSetIPCIDRIn, DescClashRuleSetIn, action, data)
})
lib.RegisterInputConverter(TypeClashRuleSetIPCIDRIn, &TextIn{
Description: DescClashRuleSetIn,
diff --git a/plugin/plaintext/clash_out.go b/plugin/plaintext/clash_out.go
index 28071c84..596a5384 100644
--- a/plugin/plaintext/clash_out.go
+++ b/plugin/plaintext/clash_out.go
@@ -21,14 +21,14 @@ const (
func init() {
lib.RegisterOutputConfigCreator(TypeClashRuleSetClassicalOut, func(action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
- return newTextOut(TypeClashRuleSetClassicalOut, action, data)
+ return newTextOut(TypeClashRuleSetClassicalOut, DescClashClassicalOut, action, data)
})
lib.RegisterOutputConverter(TypeClashRuleSetClassicalOut, &TextOut{
Description: DescClashClassicalOut,
})
lib.RegisterOutputConfigCreator(TypeClashRuleSetIPCIDROut, func(action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
- return newTextOut(TypeClashRuleSetIPCIDROut, action, data)
+ return newTextOut(TypeClashRuleSetIPCIDROut, DescClashRuleSetOut, action, data)
})
lib.RegisterOutputConverter(TypeClashRuleSetIPCIDROut, &TextOut{
Description: DescClashRuleSetOut,
diff --git a/plugin/plaintext/common_out.go b/plugin/plaintext/common_out.go
index 4fc6375c..e772293a 100644
--- a/plugin/plaintext/common_out.go
+++ b/plugin/plaintext/common_out.go
@@ -32,7 +32,7 @@ type TextOut struct {
AddSuffixInLine string
}
-func newTextOut(iType string, action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
+func newTextOut(iType string, iDesc string, action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
var tmp struct {
OutputDir string `json:"outputDir"`
OutputExt string `json:"outputExtension"`
@@ -70,7 +70,7 @@ func newTextOut(iType string, action lib.Action, data json.RawMessage) (lib.Outp
return &TextOut{
Type: iType,
Action: action,
- Description: DescTextOut,
+ Description: iDesc,
OutputDir: tmp.OutputDir,
OutputExt: tmp.OutputExt,
Want: tmp.Want,
diff --git a/plugin/plaintext/json_in.go b/plugin/plaintext/json_in.go
index 14af7c87..a4643609 100644
--- a/plugin/plaintext/json_in.go
+++ b/plugin/plaintext/json_in.go
@@ -13,7 +13,7 @@ const (
func init() {
lib.RegisterInputConfigCreator(TypeJSONIn, func(action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
- return newTextIn(TypeJSONIn, action, data)
+ return newTextIn(TypeJSONIn, DescJSONIn, action, data)
})
lib.RegisterInputConverter(TypeJSONIn, &TextIn{
diff --git a/plugin/plaintext/surge_in.go b/plugin/plaintext/surge_in.go
index ebe7f37a..7621d0a1 100644
--- a/plugin/plaintext/surge_in.go
+++ b/plugin/plaintext/surge_in.go
@@ -18,7 +18,7 @@ const (
func init() {
lib.RegisterInputConfigCreator(TypeSurgeRuleSetIn, func(action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
- return newTextIn(TypeSurgeRuleSetIn, action, data)
+ return newTextIn(TypeSurgeRuleSetIn, DescSurgeRuleSetIn, action, data)
})
lib.RegisterInputConverter(TypeSurgeRuleSetIn, &TextIn{
Description: DescSurgeRuleSetIn,
diff --git a/plugin/plaintext/surge_out.go b/plugin/plaintext/surge_out.go
index 6af83271..8fe62fb4 100644
--- a/plugin/plaintext/surge_out.go
+++ b/plugin/plaintext/surge_out.go
@@ -18,7 +18,7 @@ const (
func init() {
lib.RegisterOutputConfigCreator(TypeSurgeRuleSetOut, func(action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
- return newTextOut(TypeSurgeRuleSetOut, action, data)
+ return newTextOut(TypeSurgeRuleSetOut, DescSurgeRuleSetOut, action, data)
})
lib.RegisterOutputConverter(TypeSurgeRuleSetOut, &TextOut{
Description: DescSurgeRuleSetOut,
diff --git a/plugin/plaintext/text_in.go b/plugin/plaintext/text_in.go
index f129c3cb..41fb8177 100644
--- a/plugin/plaintext/text_in.go
+++ b/plugin/plaintext/text_in.go
@@ -19,14 +19,14 @@ const (
func init() {
lib.RegisterInputConfigCreator(TypeTextIn, func(action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
- return newTextIn(TypeTextIn, action, data)
+ return newTextIn(TypeTextIn, DescTextIn, action, data)
})
lib.RegisterInputConverter(TypeTextIn, &TextIn{
Description: DescTextIn,
})
}
-func newTextIn(iType string, action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
+func newTextIn(iType string, iDesc string, action lib.Action, data json.RawMessage) (lib.InputConverter, error) {
var tmp struct {
Name string `json:"name"`
URI string `json:"uri"`
@@ -80,7 +80,7 @@ func newTextIn(iType string, action lib.Action, data json.RawMessage) (lib.Input
return &TextIn{
Type: iType,
Action: action,
- Description: DescTextIn,
+ Description: iDesc,
Name: tmp.Name,
URI: tmp.URI,
IPOrCIDR: tmp.IPOrCIDR,
diff --git a/plugin/plaintext/text_out.go b/plugin/plaintext/text_out.go
index 41c6065b..06f4df63 100644
--- a/plugin/plaintext/text_out.go
+++ b/plugin/plaintext/text_out.go
@@ -16,7 +16,7 @@ const (
func init() {
lib.RegisterOutputConfigCreator(TypeTextOut, func(action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
- return newTextOut(TypeTextOut, action, data)
+ return newTextOut(TypeTextOut, DescTextOut, action, data)
})
lib.RegisterOutputConverter(TypeTextOut, &TextOut{
Description: DescTextOut,