do not download wallpapers

Author: sonu27

go.mod

@@ -5,7 +5,6 @@ go 1.25
 require (
 	cloud.google.com/go/firestore v1.15.0
 	cloud.google.com/go/pubsub v1.38.0
-	cloud.google.com/go/storage v1.40.0
 	cloud.google.com/go/translate v1.10.3
 	cloud.google.com/go/vision/v2 v2.8.2
 	firebase.google.com/go v3.13.0+incompatible
@@ -30,6 +29,7 @@ require (
 	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	cloud.google.com/go/iam v1.1.8 // indirect
 	cloud.google.com/go/longrunning v0.5.7 // indirect
+	cloud.google.com/go/storage v1.40.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect

internal/updater/image/image.go

@@ -32,7 +32,7 @@ type Image struct {
 }
 
 func (i Image) URL(bingURL string) string {
-	return bingURL + i.URLBase + "_1920x1200.jpg"
+	return bingURL + i.URLBase + "_1920x1080.jpg"
 }
 
 func From(bw bing.Image, market string) (Image, error) {

internal/updater/updater.go

@@ -3,7 +3,6 @@ package updater
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"os"
 	"slices"
@@ -14,7 +13,6 @@ import (
 	"api/internal/updater/bing"
 	"api/internal/updater/firestore"
 	imgpkg "api/internal/updater/image"
-	"cloud.google.com/go/storage"
 	"cloud.google.com/go/translate"
 	"cloud.google.com/go/vision/v2/apiv1"
 	"cloud.google.com/go/vision/v2/apiv1/visionpb"
@@ -27,7 +25,6 @@ import (
 const (
 	TopicID             = "update-wallpapers-v2"
 	SubID               = "update-wallpapers-v2-sub"
-	bucketName          = "images.sonurai.com"
 	firestoreCollection = "BingWallpapers"
 	bingURL             = "https://www.bing.com"
 )
@@ -68,19 +65,6 @@ func New() (*Updater, error) {
 		return nil, err
 	}
 
-	storageClient, err := firebaseClient.Storage(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	bucket, err := storageClient.Bucket(bucketName)
-	if err != nil {
-		return nil, err
-	}
-	if _, err := bucket.Attrs(ctx); err != nil {
-		return nil, err
-	}
-
 	annoClient, err := vision.NewImageAnnotatorClient(ctx)
 	if err != nil {
 		return nil, err
@@ -93,19 +77,15 @@ func New() (*Updater, error) {
 
 	return &Updater{
 		annoClient:      annoClient,
-		bucket:          bucket,
 		firestoreClient: firestoreClient,
-		httpClient:      httpClient,
 		imageClient:     imageClient,
 		translateClient: translateClient,
 	}, nil
 }
 
 type Updater struct {
 	annoClient      *vision.ImageAnnotatorClient
-	bucket          *storage.BucketHandle
 	firestoreClient *firestore.Client
-	httpClient      *http.Client
 	imageClient     *bing.Client
 	translateClient *translate.Client
 }
@@ -146,18 +126,8 @@ func (u *Updater) Update(ctx context.Context) error {
 			continue
 		}
 
-		imageURL := image.URL(bingURL)
-		if !u.fileExists(imageURL) {
-			continue
-		}
-
 		fmt.Printf("%s new wallpaper found\n", image.ID)
 
-		// todo: add retry if error
-		if err := u.downloadFile(ctx, imageURL, image.Filename+".jpg"); err != nil {
-			return err
-		}
-
 		// translate title if not english
 		if slices.Contains(nonENMarkets, image.Market) {
 			translatedTitle, err := u.translateText(ctx, image.Title)
@@ -168,7 +138,7 @@ func (u *Updater) Update(ctx context.Context) error {
 			}
 		}
 
-		anno, err := u.annotateImage(ctx, image.Filename+".jpg")
+		anno, err := u.annotateImage(ctx, image.URL(bingURL))
 		if err != nil {
 			return err
 		}
@@ -219,13 +189,12 @@ func (u *Updater) Update(ctx context.Context) error {
 }
 
 func (u *Updater) annotateImage(ctx context.Context, url string) (*visionpb.AnnotateImageResponse, error) {
-	url = fmt.Sprintf("gs://%s/%s", bucketName, url)
 	req := &visionpb.BatchAnnotateImagesRequest{
 		Requests: []*visionpb.AnnotateImageRequest{
 			{
 				Image: &visionpb.Image{
 					Source: &visionpb.ImageSource{
-						GcsImageUri: url,
+						ImageUri: url,
 					},
 				},
 				Features: []*visionpb.Feature{
@@ -259,36 +228,6 @@ func (u *Updater) annotateImage(ctx context.Context, url string) (*visionpb.Anno
 	return resp, nil
 }
 
-func (u *Updater) downloadFile(ctx context.Context, url string, name string) error {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return fmt.Errorf("failed to create request: %w", err)
-	}
-
-	resp, err := u.httpClient.Do(req)
-	if err != nil {
-		return fmt.Errorf("failed to download file: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("failed to download file: unexpected status %d", resp.StatusCode)
-	}
-
-	objWriter := u.bucket.Object(name).NewWriter(ctx)
-
-	_, err = io.Copy(objWriter, resp.Body)
-	if err != nil {
-		return fmt.Errorf("failed to write file: %w", err)
-	}
-
-	if err = objWriter.Close(); err != nil {
-		return fmt.Errorf("failed to close object writer: %w", err)
-	}
-
-	return nil
-}
-
 func (u *Updater) fetchAndDedupeImages(ctx context.Context, markets []string, out map[string]imgpkg.Image) error {
 	for _, market := range markets {
 		bi, err := u.imageClient.List(ctx, market)
@@ -297,6 +236,10 @@ func (u *Updater) fetchAndDedupeImages(ctx context.Context, markets []string, ou
 		}
 
 		for _, v := range bi {
+			if !v.WP {
+				continue
+			}
+
 			image, err := imgpkg.From(v, market)
 			if err != nil {
 				return err
@@ -310,21 +253,6 @@ func (u *Updater) fetchAndDedupeImages(ctx context.Context, markets []string, ou
 	return nil
 }
 
-func (u *Updater) fileExists(url string) bool {
-	req, err := http.NewRequest(http.MethodHead, url, nil)
-	if err != nil {
-		return false
-	}
-
-	resp, err := u.httpClient.Do(req)
-	if err != nil {
-		return false
-	}
-	defer resp.Body.Close()
-
-	return resp.StatusCode == http.StatusOK
-}
-
 func (u *Updater) translateText(ctx context.Context, text string) (string, error) {
 	lang, _ := language.Parse("en")
 	opts := &translate.Options{Format: "text"}