diff --git a/.forgejo/workflows/publish.yaml b/.forgejo/workflows/publish.yaml index 6a96701..38740bd 100644 --- a/.forgejo/workflows/publish.yaml +++ b/.forgejo/workflows/publish.yaml @@ -28,8 +28,7 @@ jobs: cp -r site/* build/. - name: Building Header Image run: | - go run ./cmd/fetch-header-image -o build/imgs/header.jpg \ - -out-data build/data/current-pending-images.json + go run ./cmd/fetch-header-image -o build/imgs/header.jpg - name: Deploying Site run: | netlify deploy --dir build --prod \ No newline at end of file diff --git a/cmd/fetch-header-image/main.go b/cmd/fetch-header-image/main.go index b4df8fb..b31fafb 100644 --- a/cmd/fetch-header-image/main.go +++ b/cmd/fetch-header-image/main.go @@ -15,9 +15,7 @@ import ( func main() { headerImages := flag.String("i", "data/pending-header-images.json", "header images json file") - currentPendingImage := flag.String("curr-image-data", "", "current header image URL") targetFile := flag.String("o", "out.jpg", "target file") - odFile := flag.String("out-data", "out-data.json", "target file data") flag.Parse() pis, err := LoadPendingImages(*headerImages) @@ -32,17 +30,6 @@ func main() { } log.Printf("found pending image: %s\n", pi.URL) - if *currentPendingImage != "" { - if cpi, err := LoadPendingImageFromURL(*currentPendingImage); err == nil { - if pi.URL == cpi.URL { - log.Println("current pending image is already the latest") - return - } - } else { - log.Printf("warn: failed to load current pending image: %s\n", err) - } - } - if err := fetchHeaderImageFromURL(*targetFile, pi); err != nil { log.Fatal(err) } @@ -52,10 +39,6 @@ func main() { if err := json.NewEncoder(&dBfr).Encode(pi); err != nil { log.Fatal(err) } - - if err := os.WriteFile(*odFile, dBfr.Bytes(), 0644); err != nil { - log.Fatal(err) - } } func fetchHeaderImageFromURL(outFile string, pi PendingImage) error { diff --git a/cmd/fetch-header-image/models.go b/cmd/fetch-header-image/models.go index f00fd97..0fc1cc1 100644 --- a/cmd/fetch-header-image/models.go +++ b/cmd/fetch-header-image/models.go @@ -2,8 +2,6 @@ package main import ( "encoding/json" - "errors" - "net/http" "os" "sort" "time" @@ -11,31 +9,12 @@ import ( const CropBottom = "bottom" -var ErrNon200Error = errors.New("non 200 status code") - type PendingImage struct { Date time.Time `json:"date"` URL string `json:"url"` Crop string `json:"crop"` } -func LoadPendingImageFromURL(url string) (pi PendingImage, err error) { - resp, err := http.Get(url) - if err != nil { - return PendingImage{}, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - return PendingImage{}, ErrNon200Error - } - - if err := json.NewDecoder(resp.Body).Decode(&pi); err != nil { - return PendingImage{}, err - } - return pi, nil -} - type PendingImages struct { Images []PendingImage `json:"images"` }