Browse Source

Don't start adb on search unless strictly necessary

pull/8/head
Daniel Martí 11 years ago
parent
commit
c29eece05f
  1. 12
      cmd/fdroidcl/devices.go
  2. 2
      cmd/fdroidcl/search.go

12
cmd/fdroidcl/devices.go

@ -40,22 +40,14 @@ func startAdbIfNeeded() {
} }
} }
func maybeOneDevice() *adb.Device { func mustOneDevice() *adb.Device {
startAdbIfNeeded() startAdbIfNeeded()
devices, err := adb.Devices() devices, err := adb.Devices()
if err != nil { if err != nil {
log.Fatalf("Could not get devices: %v", err) log.Fatalf("Could not get devices: %v", err)
} }
if len(devices) != 1 { if len(devices) != 1 {
return nil
}
return devices[0]
}
func mustOneDevice() *adb.Device {
device := maybeOneDevice()
if device == nil {
log.Fatalf("Exactly one connected device is needed") log.Fatalf("Exactly one connected device is needed")
} }
return device return devices[0]
} }

2
cmd/fdroidcl/search.go

@ -36,8 +36,6 @@ func runSearch(args []string) {
var device *adb.Device var device *adb.Device
if *installed || *updates { if *installed || *updates {
device = mustOneDevice() device = mustOneDevice()
} else {
device = maybeOneDevice()
} }
index := mustLoadIndex() index := mustLoadIndex()
apps := filterAppsSearch(index.Apps, args) apps := filterAppsSearch(index.Apps, args)

Loading…
Cancel
Save