Add filename property to app info

apps.yaml

@@ -2,15 +2,16 @@ bitwarden:
   git: https://github.com/bitwarden/android
   name: "Bitwarden"
   description: |
-    This repo has the new native Android app, currently in Beta. Looking for the legacy .NET MAUI apps? Head on over to bitwarden/mobile.  
+    This repo has the new native Android app. Looking for the legacy .NET MAUI apps? Head on over to bitwarden/mobile.
+  filename: "com.x8bit.bitwarden-fdroid.apk"
   categories: 
     - Security
 
 bitwarden-beta:
   git: https://github.com/bitwarden/android
   name: "Bitwarden Beta"
-  prerelease: true
+  filename: "com.x8bit.bitwarden.beta-fdroid.apk"
   description: |
-    This repo has the new native Android app. Looking for the legacy .NET MAUI apps? Head on over to bitwarden/mobile.
+    This repo has the new native Android app Beta version. Looking for the legacy .NET MAUI apps? Head on over to bitwarden/mobile.
   categories: 
     - Security

metascoop/apps/apps.go

@@ -25,11 +25,11 @@ type AppInfo struct {
 
 	AntiFeatures []string `yaml:"anti_features"`
 
+	Filename string `yaml:"filename"`
+
 	ReleaseDescription string
 
 	License string
-
-	Prerelease bool `yaml:"prerelease"`
 }
 
 func (a AppInfo) Name() string {

metascoop/apps/info.go

@@ -12,21 +12,13 @@ import (
 	"golang.org/x/text/unicode/norm"
 )
 
-func FindAPKRelease(release *github.RepositoryRelease) *github.ReleaseAsset {
-	return FindAPK(release, "fdroid.apk")
-}
-
-func FindAPKBeta(release* github.RepositoryRelease) *github.ReleaseAsset {
-	return FindAPK(release, "-fdroid-beta.apk")
-}
-
-func FindAPK(release* github.RepositoryRelease, suffix string) *github.ReleaseAsset {
+func FindAPK(release* github.RepositoryRelease, fileName string) *github.ReleaseAsset {
 	for _, asset := range release.Assets {
 		if asset.State == nil || *asset.State != "uploaded" {
 			continue
 		}
 
-		if asset.Name != nil && strings.HasSuffix(*asset.Name, suffix) {
+		if asset.Name != nil && asset.Name == filename {
 			return asset
 		}
 	}

metascoop/main.go

@@ -120,16 +120,10 @@ func main() {
 				log.Printf("Working on release with tag name %q", release.GetTagName())
 				var apk *github.ReleaseAsset
 
-				if app.Prerelease {
-				    log.Printf("Looking for pre-release asset %s", release.GetName())
-                    apk = apps.FindAPKBeta(release)
-				} else {
-				    log.Printf("Looking for production asset %s", release.GetName())
-                    apk = apps.FindAPKRelease(release)
-				}
+                apk = apps.FindAPK(app.Filename)
 
 				if apk == nil {
-					log.Printf("Couldn't find any F-Droid assets for application %s in %s", app.FriendlyName, release.GetName())
+					log.Printf("Couldn't find any F-Droid assets for application %s in %s with file name %s", app.FriendlyName, release.GetName(), app.FileName)
 					return false
 				}