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 {