change map to slice
This commit is contained in:
@@ -2,42 +2,45 @@ package models
|
||||
|
||||
// driver model
|
||||
type Driver struct {
|
||||
Type string `json:"type"` // driver type name of driver in collection
|
||||
Buses map[string]*Bus `json:"buses"` // name of driver bus
|
||||
Type string `json:"type"` // driver type name of driver in collection
|
||||
Buses []*Bus `json:"buses,omitempty"` // name of driver bus
|
||||
}
|
||||
|
||||
func (d *Driver) AddNewBus(name string) *Bus {
|
||||
if d.Buses == nil {
|
||||
d.Buses = make(map[string]*Bus)
|
||||
for _, b := range d.Buses {
|
||||
if b.Name == name {
|
||||
return b
|
||||
}
|
||||
}
|
||||
if b, ok := d.Buses[name]; ok {
|
||||
return b
|
||||
}
|
||||
d.Buses[name] = &Bus{Name: name}
|
||||
return d.Buses[name]
|
||||
b := &Bus{Name: name}
|
||||
d.Buses = append(d.Buses, b)
|
||||
return b
|
||||
}
|
||||
|
||||
func (d *Driver) AddBuses(buses map[string]*Bus) {
|
||||
if d.Buses == nil {
|
||||
d.Buses = make(map[string]*Bus)
|
||||
}
|
||||
for key, newBus := range buses {
|
||||
if currentBus, ok := d.Buses[key]; ok {
|
||||
func (d *Driver) AddBuses(buses []*Bus) {
|
||||
next:
|
||||
for _, newBus := range buses {
|
||||
for _, currentBus := range d.Buses {
|
||||
if currentBus.Name != newBus.Name {
|
||||
continue
|
||||
}
|
||||
currentBus.AddAddress(newBus.Address...)
|
||||
if newBus.Topic == nil {
|
||||
continue
|
||||
continue next
|
||||
}
|
||||
currentBus.AddSubscription(newBus.Topic.Subscribe...)
|
||||
currentBus.AddPublish(newBus.Topic.Publish...)
|
||||
continue
|
||||
continue next
|
||||
}
|
||||
d.Buses[key] = newBus
|
||||
d.Buses = append(d.Buses, newBus)
|
||||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetBus(name string) *Bus {
|
||||
if b, ok := d.Buses[name]; ok {
|
||||
return b
|
||||
for _, b := range d.Buses {
|
||||
if b.Name == name {
|
||||
return b
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user