Using IdTuple as repo identifier, mutex guarding database
This commit is contained in:
parent
279f11d3ce
commit
416145dfaa
3 changed files with 27 additions and 16 deletions
10
src/db.go
10
src/db.go
|
@ -1,9 +1,10 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"database/sql"
|
||||||
_ "embed"
|
_ "embed"
|
||||||
_ "github.com/mattn/go-sqlite3"
|
_ "github.com/mattn/go-sqlite3"
|
||||||
"database/sql"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed init.sql
|
//go:embed init.sql
|
||||||
|
@ -16,10 +17,15 @@ type Db interface {
|
||||||
|
|
||||||
type SQLiteDb struct {
|
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
|
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)
|
err := s.DB.QueryRow("SELECT COUNT(*) FROM tags WHERE repo = ? AND tag = ?", repo, tag).Scan(&count)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
|
|
14
src/main.go
14
src/main.go
|
@ -14,22 +14,22 @@ type RepoUpdate struct {
|
||||||
|
|
||||||
func notifierThread(c chan RepoUpdate, n Notifier) {
|
func notifierThread(c chan RepoUpdate, n Notifier) {
|
||||||
update := <-c
|
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) {
|
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)
|
notifierThread(c, n)
|
||||||
}
|
}
|
||||||
|
|
||||||
func repoThread(c chan RepoUpdate, repo Repo, avgInterval int, db Db) {
|
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()
|
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 {
|
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 {
|
} 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 {
|
} else if isNewVersion {
|
||||||
c <- RepoUpdate{repo, tag.Name}
|
c <- RepoUpdate{repo, tag.Name}
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ func main() {
|
||||||
|
|
||||||
// Spawn a goroutine for each repository
|
// Spawn a goroutine for each repository
|
||||||
for _, repo := range config.Repos {
|
for _, repo := range config.Repos {
|
||||||
go repoThread(c, repo, config.Interval, db)
|
go repoThread(c, repo, config.Interval, &db)
|
||||||
}
|
}
|
||||||
|
|
||||||
notifierThread(c, notifier)
|
notifierThread(c, notifier)
|
||||||
|
|
17
src/repo.go
17
src/repo.go
|
@ -9,9 +9,10 @@ import (
|
||||||
|
|
||||||
type Repo interface {
|
type Repo interface {
|
||||||
GetLatestTag() (Tag, error)
|
GetLatestTag() (Tag, error)
|
||||||
Url() string
|
TagsUrl() string
|
||||||
Owner() string
|
Owner() string
|
||||||
Name() string
|
Name() string
|
||||||
|
IdTuple() string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Description of a repository (owner and name)
|
// Description of a repository (owner and name)
|
||||||
|
@ -23,28 +24,28 @@ type RepoConfig struct {
|
||||||
func (r RepoConfig) GetLatestTag() (Tag, error) {
|
func (r RepoConfig) GetLatestTag() (Tag, error) {
|
||||||
// url := fmt.Sprintf("https://api.github.com/repos/%s/%s/tags", r.Owner, r.Url)
|
// 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 {
|
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
|
return Tag{}, err
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
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)
|
return Tag{}, fmt.Errorf("unexpected response status: %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
var tags = []Tag{}
|
var tags = []Tag{}
|
||||||
if err := json.NewDecoder(resp.Body).Decode(&tags); err != nil {
|
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 Tag{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return tags[0], nil
|
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)
|
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
|
return r.RepoName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r RepoConfig) IdTuple() string {
|
||||||
|
return fmt.Sprintf("%s/%s", r.OwnerName, r.RepoName)
|
||||||
|
}
|
||||||
|
|
||||||
type Commit struct {
|
type Commit struct {
|
||||||
Sha string `json:"sha"`
|
Sha string `json:"sha"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
|
|
Loading…
Add table
Reference in a new issue