Feat: support to customize output file extension in all plaintext for…

…mats
Loyalsoldier · Aug 6, 2024 · ee2fd80 · ee2fd80
1 parent fa11a12
commit ee2fd80
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/config-example.json b/config-example.json
@@ -293,6 +293,26 @@
         "addPrefixInLine": "deny from "
       }
     },
+    {
+      "type": "text",
+      "action": "output",
+      "args": {
+        "outputDir": "./output/nginx/allow",
+        "outputExtension": ".conf",
+        "addPrefixInLine": "allow ",
+        "addSuffixInLine": ";"
+      }
+    },
+    {
+      "type": "text",
+      "action": "output",
+      "args": {
+        "outputDir": "./output/nginx/deny",
+        "outputExtension": ".conf",
+        "addPrefixInLine": "deny ",
+        "addSuffixInLine": ";"
+      }
+    },
     {
       "type": "stdout",
       "action": "output"

diff --git a/plugin/plaintext/common_out.go b/plugin/plaintext/common_out.go
@@ -23,6 +23,7 @@ type textOut struct {
 	Action      lib.Action
 	Description string
 	OutputDir   string
+	OutputExt   string
 	Want        []string
 	OnlyIPType  lib.IPType
 
@@ -33,6 +34,7 @@ type textOut struct {
 func newTextOut(iType string, action lib.Action, data json.RawMessage) (lib.OutputConverter, error) {
 	var tmp struct {
 		OutputDir  string     `json:"outputDir"`
+		OutputExt  string     `json:"outputExtension"`
 		Want       []string   `json:"wantedList"`
 		OnlyIPType lib.IPType `json:"onlyIPType"`
 
@@ -59,11 +61,16 @@ func newTextOut(iType string, action lib.Action, data json.RawMessage) (lib.Outp
 		}
 	}
 
+	if tmp.OutputExt == "" {
+		tmp.OutputExt = ".txt"
+	}
+
 	return &textOut{
 		Type:        iType,
 		Action:      action,
 		Description: descTextOut,
 		OutputDir:   tmp.OutputDir,
+		OutputExt:   tmp.OutputExt,
 		Want:        tmp.Want,
 		OnlyIPType:  tmp.OnlyIPType,
 

diff --git a/plugin/plaintext/text_out.go b/plugin/plaintext/text_out.go
@@ -50,7 +50,7 @@ func (t *textOut) Output(container lib.Container) error {
 			if err != nil {
 				return err
 			}
-			filename := strings.ToLower(entry.GetName()) + ".txt"
+			filename := strings.ToLower(entry.GetName()) + t.OutputExt
 			if err := t.writeFile(filename, data); err != nil {
 				return err
 			}
@@ -67,7 +67,7 @@ func (t *textOut) Output(container lib.Container) error {
 			if err != nil {
 				return err
 			}
-			filename := strings.ToLower(entry.GetName()) + ".txt"
+			filename := strings.ToLower(entry.GetName()) + t.OutputExt
 			if err := t.writeFile(filename, data); err != nil {
 				return err
 			}