From 93ec59a02190ade2925bd88c4bc639008a7f4b28 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 09:21:20 +0200 Subject: [PATCH 1/7] Depending on abstraction --- src/main.go | 16 ++++++++-------- src/repo.go | 29 ++++++++++++++++++++++------- src/types.go | 8 ++++---- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/main.go b/src/main.go index 1ea0b1f..e34c630 100644 --- a/src/main.go +++ b/src/main.go @@ -7,28 +7,28 @@ import ( ) type RepoUpdate struct { - repo RepoConfig + repo Repo Tag string } func notifierThread(c chan RepoUpdate, n Notifier) { update := <-c - log.Printf("New tag stored for %s: %s", update.repo.Repo, update.Tag) + log.Printf("New tag stored for %s: %s", update.repo.Url(), update.Tag) if n.Notify(update.repo, update.Tag) { - log.Printf("Notified for %s/%s: %s", update.repo.Owner, update.repo.Repo, update.Tag) + log.Printf("Notified for %s: %s", update.repo.Url(), update.Tag) } notifierThread(c, n) } -func repoThread(c chan RepoUpdate, repo RepoConfig, avgInterval int, db Db) { - log.Println("Checking", repo.Repo) +func repoThread(c chan RepoUpdate, repo Repo, avgInterval int, db Db) { + log.Println("Checking", repo.Url()) tag, err := repo.GetLatestTag() - isNewVersion, err_2 := db.CheckAndStore(repo.Owner, repo.Repo) + isNewVersion, err_2 := db.CheckAndStore(repo.Owner(), tag.Name) if err != nil { - log.Printf("Failed to fetch latest tag for %s: %v", repo.Repo, err) + log.Printf("Failed to fetch latest tag for %s: %v", repo.Url(), err) } else if err_2 != nil { - log.Printf("Failed to store latest tag for %s: %v", repo.Repo, err_2) + log.Printf("Failed to store latest tag for %s: %v", repo.Url(), err_2) } else if isNewVersion { c <- RepoUpdate{repo, tag.Name} } diff --git a/src/repo.go b/src/repo.go index a9d8c6c..6c27df3 100644 --- a/src/repo.go +++ b/src/repo.go @@ -9,38 +9,53 @@ import ( type Repo interface { GetLatestTag() (Tag, error) + Url() string + Owner() string + Name() string } // Description of a repository (owner and name) type RepoConfig struct { - Owner string `json:"owner"` - Repo string `json:"repo"` + OwnerName string `json:"owner"` + RepoName string `json:"repo"` } func (r RepoConfig) GetLatestTag() (Tag, error) { - url := fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", r.Owner, r.Repo) + // url := fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", r.Owner, r.Url) - resp, err := http.Get(url) + resp, err := http.Get(r.Url()) if err != nil { - log.Printf("Failed to fetch releases for %s/%s: %v", r.Owner, r.Repo, err) + log.Printf("Failed to fetch releases for %s: %v", r.Url(), err) return Tag{}, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - log.Printf("Unexpected response status for %s/%s: %d", r.Owner, r.Repo, resp.StatusCode) + log.Printf("Unexpected response status for %s: %d", r.Url(), 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/%s: %v", r.Owner, r.Repo, err) + log.Printf("Failed to decode response for %s: %v", r.Url(), err) return Tag{}, err } return tags[0], nil } +func (r RepoConfig) Url() string { + return fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", r.OwnerName, r.RepoName) +} + +func (r RepoConfig) Owner() string { + return r.OwnerName +} + +func (r RepoConfig) Name() string { + return r.RepoName +} + type Commit struct { Sha string `json:"sha"` URL string `json:"url"` diff --git a/src/types.go b/src/types.go index 42fefe7..b15c552 100644 --- a/src/types.go +++ b/src/types.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - Repos []RepoConfig `json:"repos"` + Repos []RepoConfig `json:"repos"` Interval int `json:"interval"` // Polling interval in seconds NtfyTopic string `json:"ntfy_topic"` } @@ -38,16 +38,16 @@ func loadConfig(file string) (Config, error) { } type Notifier interface { - Notify(repo RepoConfig, tag string) bool + Notify(repo Repo, tag string) bool } type NtfyNotifier struct { Topic string } -func (n NtfyNotifier) Notify(repo RepoConfig, tag string) bool { +func (n NtfyNotifier) Notify(repo Repo, tag string) bool { ntfyURL := fmt.Sprintf("https://ntfy.sh/%s", n.Topic) - message := fmt.Sprintf("New release for %s/%s: %s", repo.Owner, repo.Repo, tag) + message := fmt.Sprintf("New release for %s/%s: %s", repo.Owner(), repo.Name(), tag) _, err := http.Post(ntfyURL, "text/plain", bytes.NewBuffer([]byte(message))) if err != nil { From ffafded5447b31282844fdffad0585b1512f8fa0 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 09:33:09 +0200 Subject: [PATCH 2/7] Yeet --- Justfile | 2 -- Makefile | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 Justfile create mode 100644 Makefile diff --git a/Justfile b/Justfile deleted file mode 100644 index 6d36b41..0000000 --- a/Justfile +++ /dev/null @@ -1,2 +0,0 @@ -run: - go run src/*.go diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0db1a21 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +run: + go run src/*.go + +build: + go build -o beretta src/*.go From 9e9290926366a5adaef0100c09365e0e7f063cd3 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 09:33:30 +0200 Subject: [PATCH 3/7] Ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 98e6ef6..d94ab38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.db +beretta* From adb3ac5c9e09ac4719545176983f05a043890347 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 09:40:01 +0200 Subject: [PATCH 4/7] clean --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 0db1a21..54bdd5e 100644 --- a/Makefile +++ b/Makefile @@ -3,3 +3,6 @@ run: build: go build -o beretta src/*.go + +clean: + rm beretta From 4582c60fe36f3a9cde18bd0f9917c3cdc5ef61b5 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 09:42:51 +0200 Subject: [PATCH 5/7] CLI flag for config file, rename config file to beretta.json --- config.json => beretta.json | 0 src/main.go | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) rename config.json => beretta.json (100%) diff --git a/config.json b/beretta.json similarity index 100% rename from config.json rename to beretta.json diff --git a/src/main.go b/src/main.go index e34c630..995bcb6 100644 --- a/src/main.go +++ b/src/main.go @@ -1,6 +1,7 @@ package main import ( + "flag" "log" "math/rand" "time" @@ -40,8 +41,14 @@ func repoThread(c chan RepoUpdate, repo Repo, avgInterval int, db Db) { } func main() { + + conf := flag.String("config", "./beretta.json", "The path to the config file") + flag.Parse() + + log.Printf("Using config path: %s", *conf) + // Load configuration - config, err := loadConfig("config.json") + config, err := loadConfig(*conf) if err != nil { log.Fatalf("Failed to load configuration: %v", err) } From 279f11d3cefe124edee73a884eede3ac42f58e18 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 09:42:54 +0200 Subject: [PATCH 6/7] Formatting --- src/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types.go b/src/types.go index b15c552..59074f2 100644 --- a/src/types.go +++ b/src/types.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - Repos []RepoConfig `json:"repos"` + Repos []RepoConfig `json:"repos"` Interval int `json:"interval"` // Polling interval in seconds NtfyTopic string `json:"ntfy_topic"` } From 416145dfaa07fcb49560212ad6d04d5cea51444b Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 24 Jun 2025 11:15:45 +0200 Subject: [PATCH 7/7] 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"`