From 87e83d2f3a55b2cecb4db4f6c673545d62d883d4 Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Mon, 17 Mar 2025 11:01:24 +0530 Subject: [PATCH] [server][core] Always populate empty content type and sha256 --- server/internal/core/fs/create.go | 8 +------- server/internal/core/storage/storage.go | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/server/internal/core/fs/create.go b/server/internal/core/fs/create.go index 4fc6a96a..24c6ea69 100644 --- a/server/internal/core/fs/create.go +++ b/server/internal/core/fs/create.go @@ -55,13 +55,7 @@ func (r Resource) CreateMemberResource(name string, id uuid.UUID, dir bool, conf var err error parent := r.ID() f := r.f.withDb(d) - contentType := "" - contentSHA256 := "" - if dir { - contentType = emptyContentType - contentSHA256 = emptyContentSHA256 - } - if result, created, _, err = f.createResource(id, parent, name, dir, 0, contentType, contentSHA256, conflictResolution); err != nil { + if result, created, _, err = f.createResource(id, parent, name, dir, 0, emptyContentType, emptyContentSHA256, conflictResolution); err != nil { return err } else if created { if err := f.db.RecomputePermissions(r.f.ctx, id); err != nil { diff --git a/server/internal/core/storage/storage.go b/server/internal/core/storage/storage.go index 07e2056c..1d84bd84 100644 --- a/server/internal/core/storage/storage.go +++ b/server/internal/core/storage/storage.go @@ -63,6 +63,7 @@ func (s storage) OpenRead(id uuid.UUID, start, length int64) (io.ReadCloser, err return backend.OpenRead(id, start, length) } } + func (s storage) OpenWrite(id uuid.UUID, h func() hash.Hash, callback func(int, string, string) error) (io.WriteCloser, error) { if backend, err := s.findStorageBackend(id); err != nil { return nil, err