Browse Source

minor: Remove unused parameter

世界 2 years ago
parent
commit
53a0bf2d11
2 changed files with 6 additions and 23 deletions
  1. 1 1
      experimental/libbox/command_client.go
  2. 5 22
      experimental/libbox/command_group.go

+ 1 - 1
experimental/libbox/command_client.go

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

+ 5 - 22
experimental/libbox/command_group.go

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