GO-4017 Set imageKind on file upload

core/application/account_create.go

@@ -134,6 +134,7 @@ func (s *Service) setAccountAndProfileDetails(ctx context.Context, req *pb.RpcAc
 			RpcFileUploadRequest: pb.RpcFileUploadRequest{
 				LocalPath: req.GetAvatarLocalPath(),
 				Type:      model.BlockContentFile_Image,
+				ImageKind: model.ImageKind_Icon,
 			},
 			ObjectOrigin: objectorigin.None(),
 		})

core/block.go

@@ -200,8 +200,12 @@ func (mw *Middleware) BlockPaste(cctx context.Context, req *pb.RpcBlockPasteRequ
 		log.Debug("Image requests to upload after paste:", uploadArr)
 		for _, r := range uploadArr {
 			r.ContextId = req.ContextId
-			req := block.UploadRequest{ObjectOrigin: objectorigin.Clipboard(), RpcBlockUploadRequest: r}
-			if err = bs.UploadBlockFile(nil, req, groupId); err != nil {
+			req := block.UploadRequest{
+				RpcBlockUploadRequest: r,
+				ObjectOrigin:          objectorigin.Clipboard(),
+				ImageKind:             model.ImageKind_AutomaticallyAdded,
+			}
+			if _, err = bs.UploadBlockFile(ctx, req, groupId, false); err != nil {
 				return err
 			}
 		}
@@ -309,7 +313,8 @@ func (mw *Middleware) BlockUpload(cctx context.Context, req *pb.RpcBlockUploadRe
 	}
 	err := mw.doBlockService(func(bs *block.Service) (err error) {
 		req := block.UploadRequest{RpcBlockUploadRequest: *req, ObjectOrigin: objectorigin.None()}
-		return bs.UploadBlockFile(nil, req, "")
+		_, err = bs.UploadBlockFile(ctx, req, "", false)
+		return err
 	})
 	if err != nil {
 		return response(pb.RpcBlockUploadResponseError_UNKNOWN_ERROR, err)

core/block/bookmark/bookmark_service.go

@@ -421,6 +421,6 @@ func (s *service) loadImage(spaceId string, title, url string) (hash string, err
 	if title != "" {
 		fileName = title
 	}
-	res := uploader.SetName(fileName).SetFile(tmpFile.Name()).Upload(ctx)
+	res := uploader.SetName(fileName).SetFile(tmpFile.Name()).SetImageKind(model.ImageKind_AutomaticallyAdded).Upload(ctx)
 	return res.FileObjectId, res.Err
 }

core/block/editor.go

@@ -26,7 +26,6 @@ import (
 	"github.com/anyproto/anytype-heart/pb"
 	"github.com/anyproto/anytype-heart/pkg/lib/bundle"
 	"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
-	"github.com/anyproto/anytype-heart/util/pbtypes"
 )
 
 var ErrOptionUsedByOtherObjects = fmt.Errorf("option is used by other objects")
@@ -40,24 +39,14 @@ type FileUploadRequest struct {
 type UploadRequest struct {
 	pb.RpcBlockUploadRequest
 	ObjectOrigin objectorigin.ObjectOrigin
+	ImageKind    model.ImageKind
 }
 
 type BookmarkFetchRequest struct {
 	pb.RpcBlockBookmarkFetchRequest
 	ObjectOrigin objectorigin.ObjectOrigin
 }
 
-func (s *Service) MarkArchived(ctx session.Context, id string, archived bool) (err error) {
-	return cache.Do(s, id, func(b basic.CommonOperations) error {
-		return b.SetDetails(nil, []*model.Detail{
-			{
-				Key:   "isArchived",
-				Value: pbtypes.Bool(archived),
-			},
-		}, true)
-	})
-}
-
 func (s *Service) CreateBlock(ctx session.Context, req pb.RpcBlockCreateRequest) (id string, err error) {
 	err = cache.DoStateCtx(s, ctx, req.ContextId, func(st *state.State, b basic.Creatable) error {
 		id, err = b.CreateBlock(st, req)
@@ -349,29 +338,21 @@ func (s *Service) FeaturedRelationRemove(ctx session.Context, contextId string,
 	})
 }
 
-func (s *Service) UploadBlockFile(ctx session.Context, req UploadRequest, groupID string) (err error) {
-	return cache.Do(s, req.ContextId, func(b file.File) error {
-		_, err = b.Upload(ctx, req.BlockId, file.FileSource{
-			Path:    req.FilePath,
-			Url:     req.Url,
-			Bytes:   req.Bytes,
-			GroupID: groupID,
-			Origin:  req.ObjectOrigin,
-		}, false)
-		return err
-	})
-}
-
-func (s *Service) UploadBlockFileSync(ctx session.Context, req UploadRequest) (err error) {
-	return cache.Do(s, req.ContextId, func(b file.File) error {
-		_, err = b.Upload(ctx, req.BlockId, file.FileSource{
-			Path:   req.FilePath,
-			Url:    req.Url,
-			Bytes:  req.Bytes,
-			Origin: req.ObjectOrigin,
-		}, true)
+func (s *Service) UploadBlockFile(
+	ctx session.Context, req UploadRequest, groupID string, isSync bool,
+) (fileObjectId string, err error) {
+	err = cache.Do(s, req.ContextId, func(b file.File) error {
+		fileObjectId, err = b.Upload(ctx, req.BlockId, file.FileSource{
+			Path:      req.FilePath,
+			Url:       req.Url,
+			Bytes:     req.Bytes,
+			GroupID:   groupID,
+			Origin:    req.ObjectOrigin,
+			ImageKind: req.ImageKind,
+		}, isSync)
 		return err
 	})
+	return fileObjectId, err
 }
 
 func (s *Service) CreateAndUploadFile(
@@ -403,6 +384,9 @@ func (s *Service) UploadFile(ctx context.Context, spaceId string, req FileUpload
 	} else if req.Url != "" {
 		upl.SetUrl(req.Url)
 	}
+	if req.ImageKind != model.ImageKind_Basic {
+		upl.SetImageKind(req.ImageKind)
+	}
 	res := upl.Upload(ctx)
 	if res.Err != nil {
 		return "", nil, res.Err
@@ -430,25 +414,6 @@ func (s *Service) SetFileStyle(
 	})
 }
 
-func (s *Service) UploadFileBlock(
-	contextID string, req UploadRequest,
-) (fileObjectId string, err error) {
-	err = cache.Do(s, contextID, func(b file.File) error {
-		fileObjectId, err = b.Upload(nil, req.BlockId, file.FileSource{
-			Path:    req.FilePath,
-			Url:     req.Url,
-			Bytes:   req.Bytes,
-			GroupID: "",
-			Origin:  req.ObjectOrigin,
-		}, true)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-	return fileObjectId, err
-}
-
 func (s *Service) Undo(
 	ctx session.Context, req pb.RpcObjectUndoRequest,
 ) (info basic.HistoryInfo, err error) {

core/block/editor/clipboard/clipboard.go

@@ -61,9 +61,9 @@ func NewClipboard(sb smartblock.SmartBlock, file file.File, tempDirProvider core
 type clipboard struct {
 	smartblock.SmartBlock
 	file              file.File
-	tempDirProvider core.TempDirProvider
-	objectStore     spaceindex.Store
-	fileService     files.Service
+	tempDirProvider   core.TempDirProvider
+	objectStore       spaceindex.Store
+	fileService       files.Service
 	fileObjectService fileobject.Service
 }
 
@@ -524,11 +524,13 @@ func (cb *clipboard) pasteFiles(ctx session.Context, req *pb.RpcBlockPasteReques
 			},
 		})
 		s.Add(b)
+
 		if err = cb.file.UploadState(ctx, s, b.Model().Id, file.FileSource{
-			Bytes:  fs.Data,
-			Path:   fs.LocalPath,
-			Name:   fs.Name,
-			Origin: objectorigin.Clipboard(),
+			Bytes:     fs.Data,
+			Path:      fs.LocalPath,
+			Name:      fs.Name,
+			Origin:    objectorigin.Clipboard(),
+			ImageKind: model.ImageKind_Basic,
 		}, false); err != nil {
 			return
 		}

core/block/editor/file/file.go

@@ -63,12 +63,13 @@ type File interface {
 }
 
 type FileSource struct {
-	Path    string
-	Url     string // nolint:revive
-	Bytes   []byte
-	Name    string
-	GroupID string
-	Origin  objectorigin.ObjectOrigin
+	Path      string
+	Url       string // nolint:revive
+	Bytes     []byte
+	Name      string
+	GroupID   string
+	Origin    objectorigin.ObjectOrigin
+	ImageKind model.ImageKind
 }
 
 type sfile struct {
@@ -161,8 +162,9 @@ func (sf *sfile) CreateAndUpload(ctx session.Context, req pb.RpcBlockFileCreateA
 		return
 	}
 	if err = sf.upload(s, newId, FileSource{
-		Path: req.LocalPath,
-		Url:  req.Url,
+		Path:      req.LocalPath,
+		Url:       req.Url,
+		ImageKind: req.ImageKind,
 	}, false).Err; err != nil {
 		return
 	}
@@ -180,6 +182,9 @@ func (sf *sfile) upload(s *state.State, id string, source FileSource, isSync boo
 		return fileuploader.UploadResult{Err: fmt.Errorf("not a file block")}
 	}
 	upl := sf.newUploader(source.Origin).SetBlock(f)
+	if source.ImageKind != model.ImageKind_Basic {
+		upl.SetImageKind(source.ImageKind)
+	}
 	if source.Path != "" {
 		upl.SetFile(source.Path)
 	} else if source.Url != "" {

core/block/import/common/syncer/file.go

@@ -66,11 +66,12 @@ func (s *FileSyncer) Sync(id domain.FullID, newIdsSet map[string]struct{}, b sim
 			BlockId: b.Model().Id,
 		}
 	}
+	params.ContextId = id.ObjectID
 	dto := block.UploadRequest{
 		RpcBlockUploadRequest: params,
 		ObjectOrigin:          origin,
 	}
-	_, err := s.service.UploadFileBlock(id.ObjectID, dto)
+	_, err := s.service.UploadBlockFile(nil, dto, "", false)
 	if os.IsNotExist(err) {
 		return anyerror.CleanupError(err)
 	}

core/block/import/common/syncer/file_test.go

@@ -74,14 +74,15 @@ func TestFileSyncer_Sync(t *testing.T) {
 		simpleBlock := simple.New(block)
 		service := mock_syncer.NewMockBlockService(t)
 		params := pb.RpcBlockUploadRequest{
-			FilePath: "not exist",
-			BlockId:  simpleBlock.Model().GetId(),
+			ContextId: id.ObjectID,
+			FilePath:  "not exist",
+			BlockId:   simpleBlock.Model().GetId(),
 		}
 		dto := block2.UploadRequest{
 			RpcBlockUploadRequest: params,
 			ObjectOrigin:          objectorigin.Import(model.Import_Pb),
 		}
-		service.EXPECT().UploadFileBlock(id.ObjectID, dto).Return("", os.ErrNotExist)
+		service.EXPECT().UploadBlockFile(nil, dto, "", false).Return("", os.ErrNotExist)
 		syncer := NewFileSyncer(service, nil)
 
 		// when
@@ -104,14 +105,15 @@ func TestFileSyncer_Sync(t *testing.T) {
 		simpleBlock := simple.New(block)
 		service := mock_syncer.NewMockBlockService(t)
 		params := pb.RpcBlockUploadRequest{
-			FilePath: "not exist",
-			BlockId:  simpleBlock.Model().GetId(),
+			ContextId: id.ObjectID,
+			FilePath:  "not exist",
+			BlockId:   simpleBlock.Model().GetId(),
 		}
 		dto := block2.UploadRequest{
 			RpcBlockUploadRequest: params,
 			ObjectOrigin:          objectorigin.Import(model.Import_Pb),
 		}
-		service.EXPECT().UploadFileBlock(id.ObjectID, dto).Return("", fmt.Errorf("new error"))
+		service.EXPECT().UploadBlockFile(nil, dto, "", false).Return("", fmt.Errorf("new error"))
 		syncer := NewFileSyncer(service, nil)
 
 		// when
@@ -134,14 +136,15 @@ func TestFileSyncer_Sync(t *testing.T) {
 		simpleBlock := simple.New(block)
 		service := mock_syncer.NewMockBlockService(t)
 		params := pb.RpcBlockUploadRequest{
-			FilePath: "exist",
-			BlockId:  simpleBlock.Model().GetId(),
+			ContextId: id.ObjectID,
+			FilePath:  "exist",
+			BlockId:   simpleBlock.Model().GetId(),
 		}
 		dto := block2.UploadRequest{
 			RpcBlockUploadRequest: params,
 			ObjectOrigin:          objectorigin.Import(model.Import_Pb),
 		}
-		service.EXPECT().UploadFileBlock(id.ObjectID, dto).Return("fileId", nil)
+		service.EXPECT().UploadBlockFile(nil, dto, "", false).Return("fileId", nil)
 		syncer := NewFileSyncer(service, nil)
 
 		// when
@@ -163,14 +166,15 @@ func TestFileSyncer_Sync(t *testing.T) {
 		simpleBlock := simple.New(block)
 		service := mock_syncer.NewMockBlockService(t)
 		params := pb.RpcBlockUploadRequest{
-			Url:     "http://example.com",
-			BlockId: simpleBlock.Model().GetId(),
+			ContextId: id.ObjectID,
+			Url:       "http://example.com",
+			BlockId:   simpleBlock.Model().GetId(),
 		}
 		dto := block2.UploadRequest{
 			RpcBlockUploadRequest: params,
 			ObjectOrigin:          objectorigin.Import(model.Import_Pb),
 		}
-		service.EXPECT().UploadFileBlock(id.ObjectID, dto).Return("fileId", nil)
+		service.EXPECT().UploadBlockFile(nil, dto, "", false).Return("fileId", nil)
 		syncer := NewFileSyncer(service, nil)
 
 		// when

core/block/import/common/syncer/icon.go

@@ -20,6 +20,7 @@ import (
 	"github.com/anyproto/anytype-heart/pb"
 	"github.com/anyproto/anytype-heart/pkg/lib/localstore/addr"
 	"github.com/anyproto/anytype-heart/pkg/lib/logging"
+	"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
 	"github.com/anyproto/anytype-heart/util/anyerror"
 )
 
@@ -92,7 +93,7 @@ func (s *IconSyncer) handleIconImage(spaceId string, newIdsSet map[string]struct
 		return fileObjectId, nil
 	}
 
-	req := pb.RpcFileUploadRequest{LocalPath: iconImage}
+	req := pb.RpcFileUploadRequest{LocalPath: iconImage, ImageKind: model.ImageKind_Icon}
 	if strings.HasPrefix(iconImage, "http://") || strings.HasPrefix(iconImage, "https://") {
 		req = pb.RpcFileUploadRequest{Url: iconImage}
 	}