Prevent the Upload of photos that are trashed (Google Photos)

Fixes #287
simulot · Jun 9, 2024 · bb9fa66 · bb9fa66
1 parent 0c60659
commit bb9fa66
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/cmd/upload/upload.go b/cmd/upload/upload.go
@@ -375,9 +375,6 @@ func (app *UpCmd) getImmichAssets(ctx context.Context, updateFn progressUpdate)
  return ctx.Err()
  default:
  received++
- if a.IsTrashed {
- return nil
- }
  list = append(list, a)
  if updateFn != nil {
  updateFn(received, totalOnImmich)

diff --git a/immich/metadata.go b/immich/metadata.go
@@ -4,10 +4,6 @@ import (
  "context"
 )
 
-type searchMetadataBody interface {
- setPage(p int)
-}
-
 type searchMetadataResponse struct {
  Assets struct {
  Total int `json:"total"`
@@ -18,17 +14,14 @@ type searchMetadataResponse struct {
 }
 
 type searchMetadataGetAllBody struct {
- Page int `json:"page"`
- WithExif bool `json:"withExif,omitempty"`
- IsVisible bool `json:"isVisible,omitempty"`
-}
-
-func (sb *searchMetadataGetAllBody) setPage(p int) {
- sb.Page = p
+ Page int `json:"page"`
+ WithExif bool `json:"withExif,omitempty"`
+ IsVisible bool `json:"isVisible,omitempty"`
+ WithDeleted bool `json:"withDeleted,omitempty"`
 }
 
-func (ic *ImmichClient) callSearchMetadata(ctx context.Context, req searchMetadataBody, filter func(*Asset) error) error {
- req.setPage(1)
+func (ic *ImmichClient) callSearchMetadata(ctx context.Context, req *searchMetadataGetAllBody, filter func(*Asset) error) error {
+ req.Page = 1
  for {
  select {
  case <-ctx.Done():
@@ -50,15 +43,15 @@ func (ic *ImmichClient) callSearchMetadata(ctx context.Context, req searchMetada
  if resp.Assets.NextPage == 0 {
  return nil
  }
- req.setPage(resp.Assets.NextPage)
+ req.Page = resp.Assets.NextPage
  }
  }
 }
 
 func (ic *ImmichClient) GetAllAssets(ctx context.Context) ([]*Asset, error) {
  var assets []*Asset
 
- req := searchMetadataGetAllBody{Page: 1, WithExif: true, IsVisible: true}
+ req := searchMetadataGetAllBody{Page: 1, WithExif: true, IsVisible: true, WithDeleted: true}
  err := ic.callSearchMetadata(ctx, &req, func(asset *Asset) error {
  assets = append(assets, asset)
  return nil
@@ -70,6 +63,6 @@ func (ic *ImmichClient) GetAllAssets(ctx context.Context) ([]*Asset, error) {
 }
 
 func (ic *ImmichClient) GetAllAssetsWithFilter(ctx context.Context, filter func(*Asset) error) error {
- req := searchMetadataGetAllBody{Page: 1, WithExif: true, IsVisible: true}
+ req := searchMetadataGetAllBody{Page: 1, WithExif: true, IsVisible: true, WithDeleted: true}
  return ic.callSearchMetadata(ctx, &req, filter)
 }