Save/remove favorite photos from pseudo-albums

Comments in pseudo-album file
FIX: keep loading albums when an error occurs

Author: rigon

server/album.go

@@ -35,15 +35,18 @@ func (album *Album) GetPhotos(collection *Collection) error {
 		for _, pseudo := range pseudos {
 			targetCollection, err := GetCollection(pseudo.Collection)
 			if err != nil {
-				return err
+				log.Println(err)
+				continue
 			}
 			targetAlbum, err := targetCollection.GetAlbumWithPhotos(pseudo.Album, false)
 			if err != nil {
-				return err
+				log.Println(err)
+				continue
 			}
 			targetPhoto, err := targetAlbum.GetPhoto(pseudo.Photo)
 			if err != nil {
-				return err
+				log.Println(err)
+				continue
 			}
 
 			// Sub album name for filtering

server/pseudo.go

@@ -46,10 +46,15 @@ func readPseudoAlbum(collection *Collection, album *Album) ([]PseudoAlbumEntry,
 	entries := make([]PseudoAlbumEntry, 0)
 	for scanner.Scan() {
 		line := scanner.Text()
+		// Skip empty lines and comments
+		if len(line) == 0 || strings.HasPrefix(line, "#") {
+			continue
+		}
+		// Split line into fields
 		split := strings.Split(line, ":")
 		if len(split) != 3 {
-			log.Println("The following line is not formatted correctly:", line)
-			break
+			log.Println("Line is not formatted correctly:", line)
+			continue
 		}
 		// Decompose slice
 		collection, album, photo := split[0], split[1], strings.ToLower(split[2])
@@ -79,6 +84,42 @@ func writePseudoAlbum(collection *Collection, album *Album, entries ...PseudoAlb
 	return nil
 }
 
+// If the album is a pseudo album, it will resolve the reference to the source photos
+func resolveQueryPhotos(query PseudoAlbumSaveQuery) (list []PseudoAlbumEntry, err error) {
+	collection, err := GetCollection(query.Collection)
+	if err != nil {
+		return nil, err
+	}
+
+	album, err := collection.GetAlbum(query.Album)
+	if err != nil {
+		return nil, err
+	}
+
+	// If it is a pseudo album, we need to resolve the links to the photos
+	if album.IsPseudo {
+		entries, err := readPseudoAlbum(collection, album)
+		if err != nil {
+			return nil, err
+		}
+		for _, photo := range query.Photos {
+			for _, entry := range entries {
+				if entry.Photo == photo {
+					list = append(list, entry)
+					break
+				}
+			}
+		}
+	} else {
+		// If not, just convert the list of photos to PseudoAlbumEntry
+		for _, photo := range query.Photos {
+			list = append(list, PseudoAlbumEntry{Collection: query.Collection, Album: query.Album, Photo: photo})
+		}
+	}
+
+	return
+}
+
 func GetPseudoAlbums(collections map[string]*Collection) []PseudoAlbum {
 	pseudos := make([]PseudoAlbum, 0)
 
@@ -95,36 +136,52 @@ func GetPseudoAlbums(collections map[string]*Collection) []PseudoAlbum {
 }
 
 func (album *Album) EditPseudoAlbum(collection *Collection, query PseudoAlbumSaveQuery, isAdd bool) error {
+	// Read entries from target album
 	entries, err := readPseudoAlbum(collection, album)
 	if err != nil {
 		return err
 	}
 
-	var updated []string
-	for _, photo := range query.Photos {
+	// Resolve links for pseudo albums
+	editPhotos, err := resolveQueryPhotos(query)
+	if err != nil {
+		return err
+	}
+
+	updated := make(map[string]PseudoAlbumSaveQuery)
+	errs := make([]string, 0)
+	for _, edit := range editPhotos {
 		// Find entry already in the album
 		found := -1
 		for i, entry := range entries {
-			if entry.Collection == query.Collection && entry.Album == query.Album && entry.Photo == photo {
+			if entry.Collection == edit.Collection && entry.Album == edit.Album && entry.Photo == edit.Photo {
 				found = i
 				break
 			}
 		}
 
 		if isAdd {
-			if found >= 0 { // Duplicated entry
-				return errors.New("entry duplicated")
+			if found < 0 {
+				// Add a new entry
+				entries = append(entries, edit)
+			} else {
+				errs = append(errs, "entry duplicated: "+edit.Photo)
 			}
-			// Add a new entry
-			entries = append(entries, PseudoAlbumEntry{Collection: query.Collection, Album: query.Album, Photo: photo})
-			updated = append(updated, photo)
 		} else {
-			if found < 0 {
-				return errors.New("entry could not be found")
+			if found >= 0 {
+				// Remove the entry
+				entries = append(entries[:found], entries[found+1:]...)
+			} else {
+				errs = append(errs, "entry could not be found: "+edit.Photo)
 			}
-			// Remove the entry
-			entries = append(entries[:found], entries[found+1:]...)
-			updated = append(updated, photo)
+		}
+
+		// Add photo to the list of updated photos
+		key := edit.Collection + ":" + edit.Album
+		if _, ok := updated[key]; !ok {
+			updated[key] = PseudoAlbumSaveQuery{Collection: edit.Collection, Album: edit.Album, Photos: []string{edit.Photo}}
+		} else {
+			updated[key] = PseudoAlbumSaveQuery{Collection: edit.Collection, Album: edit.Album, Photos: append(updated[key].Photos, edit.Photo)}
 		}
 	}
 
@@ -135,37 +192,46 @@ func (album *Album) EditPseudoAlbum(collection *Collection, query PseudoAlbumSav
 	}
 
 	// Update in background cached entries that were changed
-	go func() error {
-		fromCollection, err := GetCollection(query.Collection)
-		if err != nil {
-			return err
-		}
-		fromAlbum, err := fromCollection.GetAlbumWithPhotos(query.Album, false)
-		if err != nil {
-			return err
-		}
-
-		var photos []*Photo
-		for _, photo := range updated {
-			fromPhoto, err := fromAlbum.GetPhoto(photo)
+	go func() {
+		for _, entry := range updated {
+			fromCollection, err := GetCollection(entry.Collection)
 			if err != nil {
+				log.Println(err)
+				continue
+			}
+			fromAlbum, err := fromCollection.GetAlbumWithPhotos(entry.Album, false)
+			if err != nil {
+				log.Println(err)
 				continue
 			}
 
-			result := false
-			if isAdd { // Add link to the album
-				result = fromPhoto.AddFavorite(collection, album)
-			} else { // Remove link to the album
-				result = fromPhoto.RemoveFavorite(collection, album)
+			var photos []*Photo
+			for _, photo := range entry.Photos {
+				fromPhoto, err := fromAlbum.GetPhoto(photo)
+				if err != nil {
+					continue
+				}
+
+				result := false
+				if isAdd { // Add link to the album
+					result = fromPhoto.AddFavorite(collection, album)
+				} else { // Remove link to the album
+					result = fromPhoto.RemoveFavorite(collection, album)
+				}
+				if result {
+					photos = append(photos, fromPhoto)
+				}
 			}
-			if result {
-				photos = append(photos, fromPhoto)
+			// Update info about cached photos
+			err = fromCollection.cache.AddPhotoInfo(fromAlbum, photos...)
+			if err != nil {
+				log.Println(err)
 			}
 		}
-
-		// Update info about cached photos
-		return fromCollection.cache.AddPhotoInfo(fromAlbum, photos...)
 	}()
 
+	if len(errs) > 0 {
+		return errors.New(strings.Join(errs, "\n"))
+	}
 	return nil
 }