Skip to content

Commit

Permalink
Simulot/issue172 (#176)
Browse files Browse the repository at this point in the history
* fix linter messages

* Documentation improvments
Fixes #172
  • Loading branch information
simulot authored Mar 10, 2024
1 parent 4502c40 commit 16bfc79
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
13 changes: 7 additions & 6 deletions cmd/upload/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ assetLoop:
}

func (app *UpCmd) handleAsset(ctx context.Context, a *browser.LocalAssetFile) error {
const willBeAddedToAlbum = "Will be added to the album: "
defer func() {
a.Close()
}()
Expand Down Expand Up @@ -366,7 +367,7 @@ func (app *UpCmd) handleAsset(ctx context.Context, a *browser.LocalAssetFile) er
app.journalAsset(a, logger.Upgraded, advice.Message)
// add the superior asset into albums of the original asset
for _, al := range advice.ServerAsset.Albums {
app.journalAsset(a, logger.INFO, "Will be added to the album: "+al.AlbumName)
app.journalAsset(a, logger.INFO, willBeAddedToAlbum+al.AlbumName)
a.AddAlbum(browser.LocalAlbum{Name: al.AlbumName})
}
ID, err = app.UploadAsset(ctx, a)
Expand All @@ -386,16 +387,16 @@ func (app *UpCmd) handleAsset(ctx context.Context, a *browser.LocalAssetFile) er
ID = advice.ServerAsset.ID
if app.CreateAlbums {
for _, al := range a.Albums {
app.journalAsset(a, logger.INFO, "Will be added to the album: "+al.Name)
app.journalAsset(a, logger.INFO, willBeAddedToAlbum+al.Name)
app.AddToAlbum(advice.ServerAsset.ID, app.albumName(al))
}
}
if app.ImportIntoAlbum != "" {
app.journalAsset(a, logger.INFO, "Will be added to the album: "+app.ImportIntoAlbum)
app.journalAsset(a, logger.INFO, willBeAddedToAlbum+app.ImportIntoAlbum)
app.AddToAlbum(advice.ServerAsset.ID, app.ImportIntoAlbum)
}
if app.PartnerAlbum != "" && a.FromPartner {
app.journalAsset(a, logger.INFO, "Will be added to the album: "+app.PartnerAlbum)
app.journalAsset(a, logger.INFO, willBeAddedToAlbum+app.PartnerAlbum)
app.AddToAlbum(advice.ServerAsset.ID, app.PartnerAlbum)
}
if !advice.ServerAsset.JustUploaded {
Expand All @@ -411,12 +412,12 @@ func (app *UpCmd) handleAsset(ctx context.Context, a *browser.LocalAssetFile) er
// keep the server version but update albums
if app.CreateAlbums {
for _, al := range a.Albums {
app.journalAsset(a, logger.INFO, "Will be added to the album: "+al.Name)
app.journalAsset(a, logger.INFO, willBeAddedToAlbum+al.Name)
app.AddToAlbum(advice.ServerAsset.ID, app.albumName(al))
}
}
if app.PartnerAlbum != "" && a.FromPartner {
app.journalAsset(a, logger.INFO, "Will be added to the album: "+app.PartnerAlbum)
app.journalAsset(a, logger.INFO, willBeAddedToAlbum+app.PartnerAlbum)
app.AddToAlbum(advice.ServerAsset.ID, app.PartnerAlbum)
}
}
Expand Down
1 change: 0 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* **Leverage Google Photos Metadata:** Immich-Go doesn't just upload your photos; it also imports the associated metadata from Google Photos. This includes details like GPS location, date taken, and album information, ensuring your photos stay organized on your Immich server.
* **Flexible Uploads:** Immich-Go isn't limited to Google Photos. You can upload photos directly from your computer folders, folders tree and ZIP archives.
* **Simple Installation:** Forget complex setups! Immich-Go doesn't require NodeJS or Docker for installation. This makes it easy to get started, even for those less familiar with technical environments.
* **Import Options:** Choose how you want to upload your photos. Immich-Go supports importing individual folders, entire folder structures, and compressed ZIP archives for maximum flexibility.
* **Prioritize Quality, Discard Duplicates:** Immich-Go discards any lower-resolution versions that might be included in Google Photos Takeout, ensuring you have the best possible copies on your Immich server.


Expand Down

0 comments on commit 16bfc79

Please sign in to comment.