Browse Source

Deduplicate apk url code

pull/8/head
Daniel Martí 11 years ago
parent
commit
46c8c686a0
  1. 2
      cmd/fdroidcl/download.go
  2. 2
      cmd/fdroidcl/install.go
  3. 4
      index.go

2
cmd/fdroidcl/download.go

@ -25,7 +25,7 @@ func runDownload(args []string) {
apps := findApps(args)
for _, app := range apps {
apk := app.CurApk
url := fmt.Sprintf("%s/%s", apk.Repo.URL, apk.ApkName)
url := apk.URL()
path := apkPath(apk.ApkName)
if err := downloadEtag(url, path, apk.Hash.Data); err != nil {
log.Fatalf("Could not download '%s': %v", app.ID, err)

2
cmd/fdroidcl/install.go

@ -26,7 +26,7 @@ func runInstall(args []string) {
paths := make([]string, len(apps))
for i, app := range apps {
apk := app.CurApk
url := fmt.Sprintf("%s/%s", apk.Repo.URL, apk.ApkName)
url := apk.URL()
path := apkPath(apk.ApkName)
if err := downloadEtag(url, path, apk.Hash.Data); err != nil {
log.Fatalf("Could not download '%s': %v", app.ID, err)

4
index.go

@ -158,6 +158,10 @@ type Apk struct {
Repo *Repo
}
func (a *Apk) URL() string {
return fmt.Sprintf("%s/%s", a.Repo.URL, a.ApkName)
}
type appList []App
func (al appList) Len() int { return len(al) }

Loading…
Cancel
Save