diff options
| author | copilot-swe-agent[bot] <[email protected]> | 2026-03-09 06:35:47 +0000 |
|---|---|---|
| committer | copilot-swe-agent[bot] <[email protected]> | 2026-03-09 06:35:47 +0000 |
| commit | 2600825c50d7e7f2b4427674f1aefca270bcca27 (patch) | |
| tree | 18f216c6af28fd3975a0665d75ccf7b5c0078cb6 /plugin/mihomo/mrs_out.go | |
| parent | 5a14eb90f575b983aa407341af91aa7654e65f12 (diff) | |
Refactor: all plugin subdirectories use option patterncopilot/modify-plugin-files-subdirectories
Apply the same functional options pattern from plugin/singbox to:
- plugin/mihomo (mrs_in.go, mrs_out.go)
- plugin/plaintext (text_in.go, common_in.go, common_out.go, text_out.go, clash_in.go, clash_out.go, json_in.go, surge_in.go, surge_out.go)
- plugin/maxmind (all input/output files)
- plugin/v2ray (dat_in.go, dat_out.go)
- plugin/special (cutter.go, lookup.go, private.go, stdin.go, stdout.go)
- lookup.go and merge.go updated to use new constructors
Co-authored-by: Loyalsoldier <[email protected]>
Diffstat (limited to 'plugin/mihomo/mrs_out.go')
| -rw-r--r-- | plugin/mihomo/mrs_out.go | 107 |
1 files changed, 73 insertions, 34 deletions
diff --git a/plugin/mihomo/mrs_out.go b/plugin/mihomo/mrs_out.go index e8d65e9f..c8437dcc 100644 --- a/plugin/mihomo/mrs_out.go +++ b/plugin/mihomo/mrs_out.go @@ -27,14 +27,69 @@ var ( func init() { lib.RegisterOutputConfigCreator(TypeMRSOut, func(action lib.Action, data json.RawMessage) (lib.OutputConverter, error) { - return newMRSOut(action, data) + return NewMRSOutFromBytes(action, data) }) - lib.RegisterOutputConverter(TypeMRSOut, &MRSOut{ + lib.RegisterOutputConverter(TypeMRSOut, &mrs_out{ Description: DescMRSOut, }) } -func newMRSOut(action lib.Action, data json.RawMessage) (lib.OutputConverter, error) { +type mrs_out struct { + Type string + Action lib.Action + Description string + OutputDir string + Want []string + Exclude []string + OnlyIPType lib.IPType +} + +func NewMRSOut(action lib.Action, opts ...lib.OutputOption) lib.OutputConverter { + m := &mrs_out{ + Type: TypeMRSOut, + Action: action, + Description: DescMRSOut, + } + + for _, opt := range opts { + if opt != nil { + opt(m) + } + } + + return m +} + +func WithOutputDir(dir string) lib.OutputOption { + return func(m lib.OutputConverter) { + dir = strings.TrimSpace(dir) + if dir == "" { + dir = defaultOutputDir + } + + m.(*mrs_out).OutputDir = dir + } +} + +func WithOutputWantedList(lists []string) lib.OutputOption { + return func(m lib.OutputConverter) { + m.(*mrs_out).Want = lists + } +} + +func WithOutputExcludedList(lists []string) lib.OutputOption { + return func(m lib.OutputConverter) { + m.(*mrs_out).Exclude = lists + } +} + +func WithOutputOnlyIPType(onlyIPType lib.IPType) lib.OutputOption { + return func(m lib.OutputConverter) { + m.(*mrs_out).OnlyIPType = onlyIPType + } +} + +func NewMRSOutFromBytes(action lib.Action, data []byte) (lib.OutputConverter, error) { var tmp struct { OutputDir string `json:"outputDir"` Want []string `json:"wantedList"` @@ -48,44 +103,28 @@ func newMRSOut(action lib.Action, data json.RawMessage) (lib.OutputConverter, er } } - if tmp.OutputDir == "" { - tmp.OutputDir = defaultOutputDir - } - - return &MRSOut{ - Type: TypeMRSOut, - Action: action, - Description: DescMRSOut, - OutputDir: tmp.OutputDir, - Want: tmp.Want, - Exclude: tmp.Exclude, - OnlyIPType: tmp.OnlyIPType, - }, nil -} - -type MRSOut struct { - Type string - Action lib.Action - Description string - OutputDir string - Want []string - Exclude []string - OnlyIPType lib.IPType + return NewMRSOut( + action, + WithOutputDir(tmp.OutputDir), + WithOutputWantedList(tmp.Want), + WithOutputExcludedList(tmp.Exclude), + WithOutputOnlyIPType(tmp.OnlyIPType), + ), nil } -func (m *MRSOut) GetType() string { +func (m *mrs_out) GetType() string { return m.Type } -func (m *MRSOut) GetAction() lib.Action { +func (m *mrs_out) GetAction() lib.Action { return m.Action } -func (m *MRSOut) GetDescription() string { +func (m *mrs_out) GetDescription() string { return m.Description } -func (m *MRSOut) Output(container lib.Container) error { +func (m *mrs_out) Output(container lib.Container) error { for _, name := range m.filterAndSortList(container) { entry, found := container.GetEntry(name) if !found { @@ -101,7 +140,7 @@ func (m *MRSOut) Output(container lib.Container) error { return nil } -func (m *MRSOut) filterAndSortList(container lib.Container) []string { +func (m *mrs_out) filterAndSortList(container lib.Container) []string { excludeMap := make(map[string]bool) for _, exclude := range m.Exclude { if exclude = strings.ToUpper(strings.TrimSpace(exclude)); exclude != "" { @@ -137,7 +176,7 @@ func (m *MRSOut) filterAndSortList(container lib.Container) []string { return list } -func (m *MRSOut) generate(entry *lib.Entry) error { +func (m *mrs_out) generate(entry *lib.Entry) error { ipRanges, err := entry.MarshalIPRange(lib.GetIgnoreIPType(m.OnlyIPType)) if err != nil { return err @@ -155,7 +194,7 @@ func (m *MRSOut) generate(entry *lib.Entry) error { return nil } -func (m *MRSOut) writeFile(filename string, ipRanges []netipx.IPRange) error { +func (m *mrs_out) writeFile(filename string, ipRanges []netipx.IPRange) error { if err := os.MkdirAll(m.OutputDir, 0755); err != nil { return err } @@ -176,7 +215,7 @@ func (m *MRSOut) writeFile(filename string, ipRanges []netipx.IPRange) error { return nil } -func (m *MRSOut) convertToMrs(ipRanges []netipx.IPRange, w io.Writer) (err error) { +func (m *mrs_out) convertToMrs(ipRanges []netipx.IPRange, w io.Writer) (err error) { encoder, err := zstd.NewWriter(w) if err != nil { return err |
