Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Format renamed metadata fields

Neeraj Guptabde2524aee74
diff --git a/cli/internal/api/file_type.go b/cli/internal/api/file_type.go
index 1d6d76a495..6083c93b45 100644
--- a/cli/internal/api/file_type.go
+++ b/cli/internal/api/file_type.go
@@ -1,20 +1,20 @@
package api
type File struct {
- ID int64 `json:"id"`
- OwnerID int64 `json:"ownerID"`
- CollectionID int64 `json:"collectionID"`
- CollectionOwnerID *int64 `json:"collectionOwnerID"`
- EncryptedKey string `json:"encryptedKey"`
- KeyDecryptionNonce string `json:"keyDecryptionNonce"`
- File FileAttributes `json:"file" binding:"required"`
- Thumbnail FileAttributes `json:"thumbnail" binding:"required"`
- Metadata FileAttributes `json:"metadata" binding:"required"`
- IsDeleted bool `json:"isDeleted"`
- UpdationTime int64 `json:"updationTime"`
- MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`
+ ID int64 `json:"id"`
+ OwnerID int64 `json:"ownerID"`
+ CollectionID int64 `json:"collectionID"`
+ CollectionOwnerID *int64 `json:"collectionOwnerID"`
+ EncryptedKey string `json:"encryptedKey"`
+ KeyDecryptionNonce string `json:"keyDecryptionNonce"`
+ File FileAttributes `json:"file" binding:"required"`
+ Thumbnail FileAttributes `json:"thumbnail" binding:"required"`
+ Metadata FileAttributes `json:"metadata" binding:"required"`
+ IsDeleted bool `json:"isDeleted"`
+ UpdationTime int64 `json:"updationTime"`
+ MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`
PublicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`
- Info *FileInfo `json:"info,omitempty"`
+ Info *FileInfo `json:"info,omitempty"`
}
func (f File) IsRemovedFromAlbum() bool {
diff --git a/server/ente/file.go b/server/ente/file.go
index 383cd9b1ab..079ec3cc00 100644
--- a/server/ente/file.go
+++ b/server/ente/file.go
@@ -19,11 +19,11 @@ type File struct {
Thumbnail FileAttributes `json:"thumbnail" binding:"required"`
Metadata FileAttributes `json:"metadata" binding:"required"`
// True when the file was removed from this collection.
- IsDeleted bool `json:"isDeleted"`
- UpdationTime int64 `json:"updationTime"`
- MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`
+ IsDeleted bool `json:"isDeleted"`
+ UpdationTime int64 `json:"updationTime"`
+ MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`
PublicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`
- Info *FileInfo `json:"info,omitempty"`
+ Info *FileInfo `json:"info,omitempty"`
// Action and ActionUser are optionally set to drive client-side behavior during diffs
Action *string `json:"action,omitempty"`
ActionUserID *int64 `json:"actionUser,omitempty"`
@@ -37,9 +37,9 @@ type MetaFile struct {
KeyDecryptionNonce string `json:"keyDecryptionNonce"`
Metadata FileAttributes `json:"metadata" binding:"required"`
// True when the file was removed from this collection.
- IsDeleted bool `json:"isDeleted"`
- UpdationTime int64 `json:"updationTime"`
- MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`
+ IsDeleted bool `json:"isDeleted"`
+ UpdationTime int64 `json:"updationTime"`
+ MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`
PublicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`
}
diff --git a/server/pkg/controller/file_copy/file_copy.go b/server/pkg/controller/file_copy/file_copy.go
index 8f759f924d..42856a455a 100644
--- a/server/pkg/controller/file_copy/file_copy.go
+++ b/server/pkg/controller/file_copy/file_copy.go
@@ -50,16 +50,16 @@ func (fci fileCopyInternal) newFile(ownedID int64) ente.File {
newThumbAttributes := fci.SourceFile.Thumbnail
newThumbAttributes.ObjectKey = fci.ThumbCopyReq.DestObjectKey
return ente.File{
- OwnerID: ownedID,
- CollectionID: fci.DestCollectionID,
- EncryptedKey: fci.EncryptedFileKey,
- KeyDecryptionNonce: fci.EncryptedFileKeyNonce,
- File: newFileAttributes,
- Thumbnail: newThumbAttributes,
- Metadata: fci.SourceFile.Metadata,
+ OwnerID: ownedID,
+ CollectionID: fci.DestCollectionID,
+ EncryptedKey: fci.EncryptedFileKey,
+ KeyDecryptionNonce: fci.EncryptedFileKeyNonce,
+ File: newFileAttributes,
+ Thumbnail: newThumbAttributes,
+ Metadata: fci.SourceFile.Metadata,
PublicMagicMetadata: fci.SourceFile.PublicMagicMetadata,
- UpdationTime: enteTime.Microseconds(),
- IsDeleted: false,
+ UpdationTime: enteTime.Microseconds(),
+ IsDeleted: false,
}
}
diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.go
index f2bb82a1e4..0e33122824 100644
--- a/server/pkg/repo/file.go
+++ b/server/pkg/repo/file.go
@@ -171,16 +171,16 @@ func (repo *FileRepository) CreateMetaFile(
return nil, stacktrace.Propagate(err, "")
}
var file ente.File = ente.File{
- ID: fileID,
- UpdationTime: metaFile.UpdationTime,
- OwnerID: metaFile.OwnerID,
- Metadata: metaFile.Metadata,
+ ID: fileID,
+ UpdationTime: metaFile.UpdationTime,
+ OwnerID: metaFile.OwnerID,
+ Metadata: metaFile.Metadata,
PublicMagicMetadata: metaFile.PublicMagicMetadata,
- MagicMetadata: metaFile.MagicMetadata,
- EncryptedKey: metaFile.EncryptedKey,
- KeyDecryptionNonce: metaFile.KeyDecryptionNonce,
- Info: info,
- CollectionID: metaFile.CollectionID,
+ MagicMetadata: metaFile.MagicMetadata,
+ EncryptedKey: metaFile.EncryptedKey,
+ KeyDecryptionNonce: metaFile.KeyDecryptionNonce,
+ Info: info,
+ CollectionID: metaFile.CollectionID,
}
return &file, stacktrace.Propagate(err, "")
}