black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 16:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor: Remove unused parameter

Browse source
This commit is contained in:
世界 2023-08-16 16:48:23 +08:00
parent 7b79d98f59
commit 53a0bf2d11
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
experimental/libbox/command_client.go
View file

@ -32,7 +32,7 @@ func NewStandaloneCommandClient() *CommandClient {
return new(CommandClient) return new(CommandClient)
} }
func NewCommandClient(sharedDirectory string, handler CommandClientHandler, options *CommandClientOptions) *CommandClient { func NewCommandClient(handler CommandClientHandler, options *CommandClientOptions) *CommandClient {
return &CommandClient{ return &CommandClient{
handler: handler, handler: handler,
options: common.PtrValueOrDefault(options), options: common.PtrValueOrDefault(options),

27
experimental/libbox/command_group.go
View file

@ -19,7 +19,7 @@ type OutboundGroup struct {
Type string Type string
Selectable bool Selectable bool
Selected string Selected string
isExpand int8 IsExpand bool
items []*OutboundGroupItem items []*OutboundGroupItem
} }
@ -27,19 +27,6 @@ func (g *OutboundGroup) GetItems() OutboundGroupItemIterator {
return newIterator(g.items) return newIterator(g.items)
} }
func (g *OutboundGroup) IsExpand() bool {
switch g.isExpand {
case -1:
return g.Selectable
case 0:
return false
case 1:
return true
default:
panic("unexpected expand value")
}
}
type OutboundGroupIterator interface { type OutboundGroupIterator interface {
Next() *OutboundGroup Next() *OutboundGroup
HasNext() bool HasNext() bool
@ -129,7 +116,7 @@ func readGroups(reader io.Reader) (OutboundGroupIterator, error) {
return nil, err return nil, err
} }
err = binary.Read(reader, binary.BigEndian, &group.isExpand) err = binary.Read(reader, binary.BigEndian, &group.IsExpand)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -192,12 +179,8 @@ func writeGroups(writer io.Writer, boxService *BoxService) error {
_, group.Selectable = iGroup.(*outbound.Selector) _, group.Selectable = iGroup.(*outbound.Selector)
group.Selected = iGroup.Now() group.Selected = iGroup.Now()
if cacheFile != nil { if cacheFile != nil {
if isExpand, loaded := cacheFile.LoadGroupExpand(group.Tag); !loaded { if isExpand, loaded := cacheFile.LoadGroupExpand(group.Tag); loaded {
group.isExpand = -1 group.IsExpand = isExpand
} else if isExpand {
group.isExpand = 1
} else {
group.isExpand = 0
} }
} }
@ -240,7 +223,7 @@ func writeGroups(writer io.Writer, boxService *BoxService) error {
if err != nil { if err != nil {
return err return err
} }
err = binary.Write(writer, binary.BigEndian, group.isExpand) err = binary.Write(writer, binary.BigEndian, group.IsExpand)
if err != nil { if err != nil {
return err return err
} }