bug fix and improvment remove driver
This commit is contained in:
@@ -7,14 +7,14 @@ func (d *Drivers) AddNewDriver(typ string) *Driver {
|
||||
if drv, ok := (*d)[typ]; ok {
|
||||
return drv
|
||||
}
|
||||
(*d)[typ] = &Driver{Type: typ}
|
||||
return (*d)[typ]
|
||||
drv := &Driver{Type: typ}
|
||||
(*d)[typ] = drv
|
||||
return drv
|
||||
}
|
||||
|
||||
func (d *Drivers) AddDriver(drv *Driver) {
|
||||
if driver, ok := (*d)[drv.Type]; ok {
|
||||
driver.AddBuses(drv.Buses)
|
||||
(*d)[drv.Type] = driver
|
||||
return
|
||||
}
|
||||
(*d)[drv.Type] = drv
|
||||
@@ -23,13 +23,14 @@ func (d *Drivers) AddDriver(drv *Driver) {
|
||||
func (d *Drivers) RemoveDriver(drv *Driver) {
|
||||
if driver, ok := (*d)[drv.Type]; ok {
|
||||
driver.RemoveBuses(drv.Buses)
|
||||
if len(driver.Buses) == 1 {
|
||||
if len(driver.Buses[0].Address) == 0 && driver.Buses[0].Topic == nil {
|
||||
(*d)[drv.Type] = &Driver{}
|
||||
return
|
||||
}
|
||||
}
|
||||
d.CleanEmptyDrivers()
|
||||
}
|
||||
|
||||
func (d *Drivers) CleanEmptyDrivers() {
|
||||
for key, drv := range *d {
|
||||
if len(drv.Buses) == 0 {
|
||||
delete(*d, key)
|
||||
}
|
||||
(*d)[drv.Type] = driver
|
||||
return
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user