From 416145dfaa07fcb49560212ad6d04d5cea51444b Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Tue, 24 Jun 2025 11:15:45 +0200
Subject: [PATCH] Using IdTuple as repo identifier, mutex guarding database

---
 src/db.go   | 12 +++++++++---
 src/main.go | 14 +++++++-------
 src/repo.go | 17 +++++++++++------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/db.go b/src/db.go
index dab5118..6c4bf7d 100644
--- a/src/db.go
+++ b/src/db.go
@@ -1,9 +1,10 @@
 package main
 
 import (
+	"database/sql"
 	_ "embed"
 	_ "github.com/mattn/go-sqlite3"
-	"database/sql"
+	"sync"
 )
 
 //go:embed init.sql
@@ -15,11 +16,16 @@ type Db interface {
 }
 
 type SQLiteDb struct {
-	DB *sql.DB
+	DB     *sql.DB
+	db_mtx sync.Mutex
 }
 
-func (s SQLiteDb) CheckAndStore(repo, tag string) (bool, error) {
+func (s *SQLiteDb) CheckAndStore(repo, tag string) (bool, error) {
 	var count int
+
+	s.db_mtx.Lock()
+	defer s.db_mtx.Unlock()
+
 	err := s.DB.QueryRow("SELECT COUNT(*) FROM tags WHERE repo = ? AND tag = ?", repo, tag).Scan(&count)
 	if err != nil {
 		return false, err
diff --git a/src/main.go b/src/main.go
index 995bcb6..fa55a33 100644
--- a/src/main.go
+++ b/src/main.go
@@ -14,22 +14,22 @@ type RepoUpdate struct {
 
 func notifierThread(c chan RepoUpdate, n Notifier) {
 	update := <-c
-	log.Printf("New tag stored for %s: %s", update.repo.Url(), update.Tag)
+	log.Printf("New tag stored for %s: %s", update.repo.IdTuple(), update.Tag)
 	if n.Notify(update.repo, update.Tag) {
-		log.Printf("Notified for %s: %s", update.repo.Url(), update.Tag)
+		log.Printf("Notified for %s: %s", update.repo.IdTuple(), update.Tag)
 	}
 	notifierThread(c, n)
 }
 
 func repoThread(c chan RepoUpdate, repo Repo, avgInterval int, db Db) {
-	log.Println("Checking", repo.Url())
+	log.Println("Checking", repo.IdTuple())
 	tag, err := repo.GetLatestTag()
-	isNewVersion, err_2 := db.CheckAndStore(repo.Owner(), tag.Name)
+	isNewVersion, err_2 := db.CheckAndStore(repo.IdTuple(), tag.Name)
 
 	if err != nil {
-		log.Printf("Failed to fetch latest tag for %s: %v", repo.Url(), err)
+		log.Printf("Failed to fetch latest tag for %s: %v", repo.IdTuple(), err)
 	} else if err_2 != nil {
-		log.Printf("Failed to store latest tag for %s: %v", repo.Url(), err_2)
+		log.Printf("Failed to store latest tag for %s: %v", repo.IdTuple(), err_2)
 	} else if isNewVersion {
 		c <- RepoUpdate{repo, tag.Name}
 	}
@@ -65,7 +65,7 @@ func main() {
 
 	// Spawn a goroutine for each repository
 	for _, repo := range config.Repos {
-		go repoThread(c, repo, config.Interval, db)
+		go repoThread(c, repo, config.Interval, &db)
 	}
 
 	notifierThread(c, notifier)
diff --git a/src/repo.go b/src/repo.go
index 6c27df3..8dd4f1f 100644
--- a/src/repo.go
+++ b/src/repo.go
@@ -9,9 +9,10 @@ import (
 
 type Repo interface {
 	GetLatestTag() (Tag, error)
-	Url() string
+	TagsUrl() string
 	Owner() string
 	Name() string
+	IdTuple() string
 }
 
 // Description of a repository (owner and name)
@@ -23,28 +24,28 @@ type RepoConfig struct {
 func (r RepoConfig) GetLatestTag() (Tag, error) {
 	// url := fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", r.Owner, r.Url)
 
-	resp, err := http.Get(r.Url())
+	resp, err := http.Get(r.TagsUrl())
 	if err != nil {
-		log.Printf("Failed to fetch releases for %s: %v", r.Url(), err)
+		log.Printf("Failed to fetch releases for %s: %v", r.TagsUrl(), err)
 		return Tag{}, err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		log.Printf("Unexpected response status for %s: %d", r.Url(), resp.StatusCode)
+		log.Printf("Unexpected response status for %s: %d", r.TagsUrl(), resp.StatusCode)
 		return Tag{}, fmt.Errorf("unexpected response status: %d", resp.StatusCode)
 	}
 
 	var tags = []Tag{}
 	if err := json.NewDecoder(resp.Body).Decode(&tags); err != nil {
-		log.Printf("Failed to decode response for %s: %v", r.Url(), err)
+		log.Printf("Failed to decode response for %s: %v", r.TagsUrl(), err)
 		return Tag{}, err
 	}
 
 	return tags[0], nil
 }
 
-func (r RepoConfig) Url() string {
+func (r RepoConfig) TagsUrl() string {
 	return fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", r.OwnerName, r.RepoName)
 }
 
@@ -56,6 +57,10 @@ func (r RepoConfig) Name() string {
 	return r.RepoName
 }
 
+func (r RepoConfig) IdTuple() string {
+	return fmt.Sprintf("%s/%s", r.OwnerName, r.RepoName)
+}
+
 type Commit struct {
 	Sha string `json:"sha"`
 	URL string `json:"url"`