refactor: add a method for the provider to generate photo IDs

nakrovati · May 9, 2024 · f250ea8 · f250ea8
1 parent fbdf894
commit f250ea8
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 23 deletions.
diff --git a/internal/downloader/downloader.go b/internal/downloader/downloader.go
@@ -24,34 +24,30 @@ type PhotosProvider interface {
 	GetCollectionName() string
 	GetProviderName() string
 	GetFileName(src string) string
-	GetPhotoURL(photoID int) (string, error)
+	GetPhotoURL(photoID string) (string, error)
+	GetPhotos() ([]string, error)
 	GetRecentPhotoID() (int, error)
-	GetMinMaxPhotoID() (int, int)
 }
 
 type Downloader struct {
-	PhotosProvider
+	PhotosProvider PhotosProvider
 }
 
 func (d *Downloader) DownloadPhotos() error {
-	min, max := d.GetMinMaxPhotoID()
-
-	if max == 100000 {
-		var err error
-
-		max, err = d.PhotosProvider.GetRecentPhotoID()
-		if err != nil {
-			return fmt.Errorf("failed to get recent photo ID: %w", err)
-		}
+	downloadDir, err := utils.GetDownloadDirectory(d.PhotosProvider.GetProviderName(), d.PhotosProvider.GetCollectionName())
+	if err != nil {
+		return fmt.Errorf("failed to get download directory: %w", err)
 	}
 
-	downloadDir, err := utils.GetDownloadDirectory(d.PhotosProvider.GetProviderName(), d.GetCollectionName())
+	photos, err := d.PhotosProvider.GetPhotos()
 	if err != nil {
-		return fmt.Errorf("failed to get download directory: %w", err)
+		return fmt.Errorf("failed to get photos: %w", err)
 	}
 
-	for i := max; i >= min; i-- {
-		photoURL, err := d.PhotosProvider.GetPhotoURL(i)
+	for i := len(photos) - 1; i >= 0; i-- {
+		photoID := photos[i]
+
+		photoURL, err := d.PhotosProvider.GetPhotoURL(photoID)
 		if err != nil {
 			return fmt.Errorf("failed to get photo URL: %w", err)
 		}

diff --git a/pkg/providers/fapello/fapello.go b/pkg/providers/fapello/fapello.go
@@ -35,13 +35,41 @@ func (p *Provider) GetCollectionName() string {
 	return p.Username
 }
 
-func (p *Provider) GetPhotoURL(photoID int) (string, error) {
-	urlWithoutID, err := buildURL(p.BaseURL, p.Username, photoID)
+func (p *Provider) GetPhotos() ([]string, error) {
+	if p.MinPhotoID > p.MaxPhotoID {
+		return []string{}, fmt.Errorf("min photo ID (%d) is greater than max photo ID (%d)", p.MinPhotoID, p.MaxPhotoID)
+	}
+
+	recentPhotoID, err := p.GetRecentPhotoID()
+	if err != nil {
+		return []string{}, err
+	}
+
+	if p.MaxPhotoID > recentPhotoID {
+		p.MaxPhotoID = recentPhotoID
+	}
+
+	photos := make([]string, p.MaxPhotoID-p.MinPhotoID+1)
+
+	for i := p.MinPhotoID; i <= p.MaxPhotoID; i++ {
+		photos[i-p.MinPhotoID] = strconv.Itoa(i)
+	}
+
+	return photos, nil
+}
+
+func (p *Provider) GetPhotoURL(photoID string) (string, error) {
+	intPhotoID, err := strconv.Atoi(photoID)
+	if err != nil {
+		return "", err
+	}
+
+	urlWithoutID, err := buildURL(p.BaseURL, p.Username, intPhotoID)
 	if err != nil {
 		return "", err
 	}
 
-	paddedID := fmt.Sprintf("%04d", photoID)
+	paddedID := fmt.Sprintf("%04d", intPhotoID)
 	photoName := fmt.Sprintf("%s_%v.jpg", p.Username, paddedID)
 
 	url, err := url.JoinPath(urlWithoutID, photoName)

diff --git a/pkg/providers/fapodrop/fapodrop.go b/pkg/providers/fapodrop/fapodrop.go
@@ -31,17 +31,41 @@ func (p *Provider) GetCollectionName() string {
 	return p.Username
 }
 
-func (p *Provider) GetMinMaxPhotoID() (int, int) {
-	return p.MinPhotoID, p.MaxPhotoID
+func (p *Provider) GetPhotos() ([]string, error) {
+	if p.MinPhotoID > p.MaxPhotoID {
+		return []string{}, fmt.Errorf("min photo ID (%d) is greater than max photo ID (%d)", p.MinPhotoID, p.MaxPhotoID)
+	}
+
+	recentPhotoID, err := p.GetRecentPhotoID()
+	if err != nil {
+		return []string{}, err
+	}
+
+	if p.MaxPhotoID > recentPhotoID {
+		p.MaxPhotoID = recentPhotoID
+	}
+
+	photos := make([]string, p.MaxPhotoID-p.MinPhotoID+1)
+
+	for i := p.MinPhotoID; i <= p.MaxPhotoID; i++ {
+		photos[i-p.MinPhotoID] = strconv.Itoa(i)
+	}
+
+	return photos, nil
 }
 
-func (p *Provider) GetPhotoURL(photoID int) (string, error) {
+func (p *Provider) GetPhotoURL(photoID string) (string, error) {
+	intPhotoID, err := strconv.Atoi(photoID)
+	if err != nil {
+		return "", err
+	}
+
 	urlWithoutID, err := buildURL(p.BaseURL, p.Username)
 	if err != nil {
 		return "", err
 	}
 
-	paddedID := fmt.Sprintf("%04d", photoID)
+	paddedID := fmt.Sprintf("%04d", intPhotoID)
 	photoName := fmt.Sprintf("%s_%s.jpeg", p.Username, paddedID)
 
 	url, err := url.JoinPath(urlWithoutID, photoName)