From 01037c8f28ba31152ebb2ee2659434920ba11ac0 Mon Sep 17 00:00:00 2001
From: Linus789 <Linus789@users.noreply.github.com>
Date: Tue, 28 Feb 2023 06:41:44 +0100
Subject: [PATCH] show: also show name of f-droid repository

---
 fdroid/index.go | 41 +++++++++++++++++++++--------------------
 show.go         |  2 +-
 update.go       |  3 ++-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/fdroid/index.go b/fdroid/index.go
index b654233..e2f4d38 100644
--- a/fdroid/index.go
+++ b/fdroid/index.go
@@ -34,26 +34,27 @@ type Repo struct {
 
 // App is an Android application
 type App struct {
-	PackageName  string   `json:"packageName"`
-	Name         string   `json:"name"`
-	Summary      string   `json:"summary"`
-	Added        UnixDate `json:"added"`
-	Updated      UnixDate `json:"lastUpdated"`
-	Icon         string   `json:"icon"`
-	Description  string   `json:"description"`
-	License      string   `json:"license"`
-	Categories   []string `json:"categories"`
-	Website      string   `json:"webSite"`
-	SourceCode   string   `json:"sourceCode"`
-	IssueTracker string   `json:"issueTracker"`
-	Changelog    string   `json:"changelog"`
-	Donate       string   `json:"donate"`
-	Bitcoin      string   `json:"bitcoin"`
-	Litecoin     string   `json:"litecoin"`
-	FlattrID     string   `json:"flattrID"`
-	SugVersName  string   `json:"suggestedVersionName"`
-	SugVersCode  int      `json:"suggestedVersionCode,string"`
-	FdroidRepo   string   `json:"-"`
+	PackageName    string   `json:"packageName"`
+	Name           string   `json:"name"`
+	Summary        string   `json:"summary"`
+	Added          UnixDate `json:"added"`
+	Updated        UnixDate `json:"lastUpdated"`
+	Icon           string   `json:"icon"`
+	Description    string   `json:"description"`
+	License        string   `json:"license"`
+	Categories     []string `json:"categories"`
+	Website        string   `json:"webSite"`
+	SourceCode     string   `json:"sourceCode"`
+	IssueTracker   string   `json:"issueTracker"`
+	Changelog      string   `json:"changelog"`
+	Donate         string   `json:"donate"`
+	Bitcoin        string   `json:"bitcoin"`
+	Litecoin       string   `json:"litecoin"`
+	FlattrID       string   `json:"flattrID"`
+	SugVersName    string   `json:"suggestedVersionName"`
+	SugVersCode    int      `json:"suggestedVersionCode,string"`
+	FdroidRepoName string   `json:"-"`
+	FdroidRepoURL  string   `json:"-"`
 
 	Localized map[string]Localization `json:"localized"`
 
diff --git a/show.go b/show.go
index 6cc9809..e04e3f4 100644
--- a/show.go
+++ b/show.go
@@ -123,7 +123,7 @@ func printAppDetailed(app fdroid.App) {
 	if app.FlattrID != "" {
 		fmt.Printf("Flattr               : https://flattr.com/thing/%s\n", app.FlattrID)
 	}
-	fmt.Printf("F-Droid Repository   : %s\n", app.FdroidRepo)
+	fmt.Printf("F-Droid Repository   : %s (%s)\n", app.FdroidRepoName, app.FdroidRepoURL)
 	fmt.Println()
 	fmt.Println("Description :")
 	fmt.Println()
diff --git a/update.go b/update.go
index 73ea30a..9aec758 100644
--- a/update.go
+++ b/update.go
@@ -187,7 +187,8 @@ func loadIndexes() ([]fdroid.App, error) {
 		}
 		for i := range index.Apps {
 			app := index.Apps[i]
-			app.FdroidRepo = r.URL
+			app.FdroidRepoName = r.ID
+			app.FdroidRepoURL = r.URL
 			orig, e := m[app.PackageName]
 			if !e {
 				m[app.PackageName] = &app