From 3dc92b9a67d2e7dca529cd1b26395305c2a031fc Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Fri, 3 Mar 2023 13:22:37 +0300 Subject: [PATCH] fileproto: FileInfo --- commonfile/fileproto/file.pb.go | 458 +++++++++++++++++++------ commonfile/fileproto/file_drpc.pb.go | 28 +- commonfile/fileproto/protos/file.proto | 16 +- 3 files changed, 375 insertions(+), 127 deletions(-) diff --git a/commonfile/fileproto/file.pb.go b/commonfile/fileproto/file.pb.go index 9aa8aeeb..dc3e0a31 100644 --- a/commonfile/fileproto/file.pb.go +++ b/commonfile/fileproto/file.pb.go @@ -706,23 +706,23 @@ func (m *FilesDeleteResponse) XXX_DiscardUnknown() { var xxx_messageInfo_FilesDeleteResponse proto.InternalMessageInfo -type FilesCheckRequest struct { +type FilesInfoRequest struct { SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` FileIds []string `protobuf:"bytes,2,rep,name=fileIds,proto3" json:"fileIds,omitempty"` } -func (m *FilesCheckRequest) Reset() { *m = FilesCheckRequest{} } -func (m *FilesCheckRequest) String() string { return proto.CompactTextString(m) } -func (*FilesCheckRequest) ProtoMessage() {} -func (*FilesCheckRequest) Descriptor() ([]byte, []int) { +func (m *FilesInfoRequest) Reset() { *m = FilesInfoRequest{} } +func (m *FilesInfoRequest) String() string { return proto.CompactTextString(m) } +func (*FilesInfoRequest) ProtoMessage() {} +func (*FilesInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor_fd665a7e11c833d5, []int{13} } -func (m *FilesCheckRequest) XXX_Unmarshal(b []byte) error { +func (m *FilesInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *FilesCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *FilesInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_FilesCheckRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_FilesInfoRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -732,48 +732,48 @@ func (m *FilesCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *FilesCheckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_FilesCheckRequest.Merge(m, src) +func (m *FilesInfoRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilesInfoRequest.Merge(m, src) } -func (m *FilesCheckRequest) XXX_Size() int { +func (m *FilesInfoRequest) XXX_Size() int { return m.Size() } -func (m *FilesCheckRequest) XXX_DiscardUnknown() { - xxx_messageInfo_FilesCheckRequest.DiscardUnknown(m) +func (m *FilesInfoRequest) XXX_DiscardUnknown() { + xxx_messageInfo_FilesInfoRequest.DiscardUnknown(m) } -var xxx_messageInfo_FilesCheckRequest proto.InternalMessageInfo +var xxx_messageInfo_FilesInfoRequest proto.InternalMessageInfo -func (m *FilesCheckRequest) GetSpaceId() string { +func (m *FilesInfoRequest) GetSpaceId() string { if m != nil { return m.SpaceId } return "" } -func (m *FilesCheckRequest) GetFileIds() []string { +func (m *FilesInfoRequest) GetFileIds() []string { if m != nil { return m.FileIds } return nil } -type FilesCheckResponse struct { - BlocksAvailability []*BlockAvailability `protobuf:"bytes,1,rep,name=blocksAvailability,proto3" json:"blocksAvailability,omitempty"` +type FilesInfoResponse struct { + FilesInfo []*FileInfo `protobuf:"bytes,1,rep,name=filesInfo,proto3" json:"filesInfo,omitempty"` } -func (m *FilesCheckResponse) Reset() { *m = FilesCheckResponse{} } -func (m *FilesCheckResponse) String() string { return proto.CompactTextString(m) } -func (*FilesCheckResponse) ProtoMessage() {} -func (*FilesCheckResponse) Descriptor() ([]byte, []int) { +func (m *FilesInfoResponse) Reset() { *m = FilesInfoResponse{} } +func (m *FilesInfoResponse) String() string { return proto.CompactTextString(m) } +func (*FilesInfoResponse) ProtoMessage() {} +func (*FilesInfoResponse) Descriptor() ([]byte, []int) { return fileDescriptor_fd665a7e11c833d5, []int{14} } -func (m *FilesCheckResponse) XXX_Unmarshal(b []byte) error { +func (m *FilesInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *FilesCheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *FilesInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_FilesCheckResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_FilesInfoResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -783,25 +783,85 @@ func (m *FilesCheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *FilesCheckResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_FilesCheckResponse.Merge(m, src) +func (m *FilesInfoResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilesInfoResponse.Merge(m, src) } -func (m *FilesCheckResponse) XXX_Size() int { +func (m *FilesInfoResponse) XXX_Size() int { return m.Size() } -func (m *FilesCheckResponse) XXX_DiscardUnknown() { - xxx_messageInfo_FilesCheckResponse.DiscardUnknown(m) +func (m *FilesInfoResponse) XXX_DiscardUnknown() { + xxx_messageInfo_FilesInfoResponse.DiscardUnknown(m) } -var xxx_messageInfo_FilesCheckResponse proto.InternalMessageInfo +var xxx_messageInfo_FilesInfoResponse proto.InternalMessageInfo -func (m *FilesCheckResponse) GetBlocksAvailability() []*BlockAvailability { +func (m *FilesInfoResponse) GetFilesInfo() []*FileInfo { if m != nil { - return m.BlocksAvailability + return m.FilesInfo } return nil } +type FileInfo struct { + FileId string `protobuf:"bytes,1,opt,name=fileId,proto3" json:"fileId,omitempty"` + UsageBytes uint64 `protobuf:"varint,2,opt,name=usageBytes,proto3" json:"usageBytes,omitempty"` + CidsCount uint32 `protobuf:"varint,3,opt,name=cidsCount,proto3" json:"cidsCount,omitempty"` +} + +func (m *FileInfo) Reset() { *m = FileInfo{} } +func (m *FileInfo) String() string { return proto.CompactTextString(m) } +func (*FileInfo) ProtoMessage() {} +func (*FileInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_fd665a7e11c833d5, []int{15} +} +func (m *FileInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *FileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_FileInfo.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *FileInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileInfo.Merge(m, src) +} +func (m *FileInfo) XXX_Size() int { + return m.Size() +} +func (m *FileInfo) XXX_DiscardUnknown() { + xxx_messageInfo_FileInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_FileInfo proto.InternalMessageInfo + +func (m *FileInfo) GetFileId() string { + if m != nil { + return m.FileId + } + return "" +} + +func (m *FileInfo) GetUsageBytes() uint64 { + if m != nil { + return m.UsageBytes + } + return 0 +} + +func (m *FileInfo) GetCidsCount() uint32 { + if m != nil { + return m.CidsCount + } + return 0 +} + type CheckRequest struct { } @@ -809,7 +869,7 @@ func (m *CheckRequest) Reset() { *m = CheckRequest{} } func (m *CheckRequest) String() string { return proto.CompactTextString(m) } func (*CheckRequest) ProtoMessage() {} func (*CheckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fd665a7e11c833d5, []int{15} + return fileDescriptor_fd665a7e11c833d5, []int{16} } func (m *CheckRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -847,7 +907,7 @@ func (m *CheckResponse) Reset() { *m = CheckResponse{} } func (m *CheckResponse) String() string { return proto.CompactTextString(m) } func (*CheckResponse) ProtoMessage() {} func (*CheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fd665a7e11c833d5, []int{16} + return fileDescriptor_fd665a7e11c833d5, []int{17} } func (m *CheckResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -898,7 +958,7 @@ func (m *SpaceInfoRequest) Reset() { *m = SpaceInfoRequest{} } func (m *SpaceInfoRequest) String() string { return proto.CompactTextString(m) } func (*SpaceInfoRequest) ProtoMessage() {} func (*SpaceInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fd665a7e11c833d5, []int{17} + return fileDescriptor_fd665a7e11c833d5, []int{18} } func (m *SpaceInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -945,7 +1005,7 @@ func (m *SpaceInfoResponse) Reset() { *m = SpaceInfoResponse{} } func (m *SpaceInfoResponse) String() string { return proto.CompactTextString(m) } func (*SpaceInfoResponse) ProtoMessage() {} func (*SpaceInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fd665a7e11c833d5, []int{18} + return fileDescriptor_fd665a7e11c833d5, []int{19} } func (m *SpaceInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1018,8 +1078,9 @@ func init() { proto.RegisterType((*BlocksBindResponse)(nil), "filesync.BlocksBindResponse") proto.RegisterType((*FilesDeleteRequest)(nil), "filesync.FilesDeleteRequest") proto.RegisterType((*FilesDeleteResponse)(nil), "filesync.FilesDeleteResponse") - proto.RegisterType((*FilesCheckRequest)(nil), "filesync.FilesCheckRequest") - proto.RegisterType((*FilesCheckResponse)(nil), "filesync.FilesCheckResponse") + proto.RegisterType((*FilesInfoRequest)(nil), "filesync.FilesInfoRequest") + proto.RegisterType((*FilesInfoResponse)(nil), "filesync.FilesInfoResponse") + proto.RegisterType((*FileInfo)(nil), "filesync.FileInfo") proto.RegisterType((*CheckRequest)(nil), "filesync.CheckRequest") proto.RegisterType((*CheckResponse)(nil), "filesync.CheckResponse") proto.RegisterType((*SpaceInfoRequest)(nil), "filesync.SpaceInfoRequest") @@ -1031,53 +1092,55 @@ func init() { } var fileDescriptor_fd665a7e11c833d5 = []byte{ - // 731 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x8e, 0x13, 0x93, 0xc6, 0x93, 0xfe, 0x38, 0xdb, 0x52, 0x82, 0x1b, 0xac, 0xc8, 0x07, 0x54, - 0x55, 0x28, 0x95, 0x0a, 0x87, 0x5e, 0x7a, 0x68, 0xd2, 0x1f, 0x42, 0xa5, 0x82, 0x5c, 0x21, 0x04, - 0x9c, 0x1c, 0x7b, 0x43, 0x4d, 0x5d, 0x6f, 0xf0, 0x6e, 0xa0, 0x7d, 0x0b, 0x78, 0x1c, 0xde, 0xa0, - 0xc7, 0x1e, 0x39, 0xa2, 0xf6, 0x45, 0x90, 0xd7, 0xeb, 0x78, 0x93, 0xb8, 0x4a, 0x55, 0x89, 0x8b, - 0xb3, 0x3b, 0x3f, 0xdf, 0xf7, 0x69, 0x66, 0x67, 0x14, 0x78, 0xee, 0x92, 0xf3, 0x73, 0x12, 0xf6, - 0xfd, 0x00, 0x6f, 0xc6, 0x9f, 0x41, 0x44, 0x18, 0xd9, 0xe4, 0x5f, 0xca, 0x0d, 0x2d, 0x7e, 0x46, - 0x95, 0xf8, 0x4c, 0x2f, 0x43, 0xd7, 0xda, 0x81, 0xa5, 0x76, 0x40, 0xdc, 0xb3, 0x43, 0xcc, 0x6c, - 0xfc, 0x6d, 0x88, 0x29, 0x43, 0x75, 0x98, 0xa3, 0x03, 0xc7, 0xc5, 0x5d, 0xaf, 0xae, 0x34, 0x95, - 0x75, 0xcd, 0x4e, 0xaf, 0x48, 0x87, 0x92, 0xeb, 0x7b, 0xf5, 0x62, 0x53, 0x59, 0x9f, 0xb7, 0xe3, - 0xa3, 0xb5, 0x0d, 0x7a, 0x96, 0x4e, 0x07, 0x24, 0xa4, 0x38, 0x8d, 0x52, 0x46, 0x51, 0x08, 0x81, - 0xea, 0x39, 0xcc, 0x11, 0x89, 0xfc, 0x6c, 0x7d, 0x15, 0x99, 0xef, 0x86, 0xf4, 0x74, 0x36, 0xf3, - 0x2a, 0x94, 0x63, 0xc9, 0xdd, 0x84, 0x5c, 0xb3, 0xc5, 0x2d, 0xe5, 0x2a, 0x4d, 0x73, 0xa9, 0x12, - 0xd7, 0x32, 0xd4, 0x24, 0xae, 0x44, 0xa6, 0xd5, 0x81, 0x65, 0x6e, 0xa4, 0x7b, 0x38, 0xc0, 0x0c, - 0xcf, 0xd6, 0x80, 0x40, 0x75, 0x7d, 0x8f, 0xd6, 0x8b, 0xcd, 0x52, 0x8c, 0x1c, 0x9f, 0xad, 0x55, - 0x58, 0x19, 0x07, 0x11, 0xe0, 0x6d, 0x40, 0x89, 0xbd, 0x73, 0x8a, 0xdd, 0xb3, 0x87, 0x61, 0xf7, - 0x52, 0x81, 0x02, 0x43, 0x94, 0xf7, 0x08, 0x50, 0x8f, 0x9b, 0x77, 0xbf, 0x3b, 0x7e, 0xe0, 0xf4, - 0xfc, 0xc0, 0x67, 0x97, 0x75, 0xa5, 0x59, 0x5a, 0xaf, 0x6e, 0xad, 0xb5, 0xd2, 0xc6, 0xb6, 0x78, - 0xaa, 0x1c, 0x62, 0xe7, 0xa4, 0x59, 0x9f, 0x45, 0x65, 0x64, 0x63, 0x4e, 0x03, 0x5f, 0x41, 0x99, - 0x32, 0x87, 0x0d, 0x29, 0x2f, 0xff, 0xe2, 0x56, 0x23, 0xe3, 0x91, 0x33, 0x4f, 0x78, 0x8c, 0x2d, - 0x62, 0xad, 0x8f, 0x02, 0x9c, 0xb6, 0xfd, 0xd0, 0x7b, 0x78, 0x8f, 0xd3, 0xda, 0x94, 0xa4, 0xda, - 0xac, 0xa4, 0xf5, 0x4d, 0xa0, 0x45, 0xd5, 0x5f, 0x03, 0x3a, 0x88, 0x75, 0xdd, 0xb7, 0xa3, 0x75, - 0x98, 0x4b, 0x38, 0x92, 0xc2, 0x6b, 0x76, 0x7a, 0xb5, 0x1e, 0xc3, 0xf2, 0x18, 0x92, 0x20, 0x38, - 0x84, 0x1a, 0x37, 0xdf, 0xb3, 0xab, 0x77, 0xe3, 0x3b, 0x42, 0xe9, 0x7f, 0x6c, 0xed, 0x22, 0xcc, - 0xcb, 0x32, 0xad, 0x23, 0x58, 0x18, 0x67, 0x33, 0xa0, 0x22, 0x84, 0x52, 0xce, 0xa1, 0xd9, 0xa3, - 0x3b, 0x32, 0x01, 0x9c, 0x20, 0x20, 0x3f, 0x3e, 0x44, 0x3e, 0xc3, 0xbc, 0x1f, 0x15, 0x5b, 0xb2, - 0x58, 0x2f, 0x40, 0x3f, 0xe1, 0xb1, 0x61, 0x9f, 0xcc, 0xac, 0x83, 0xf5, 0x4b, 0x81, 0x9a, 0x14, - 0x2e, 0xf8, 0x4d, 0x80, 0xc0, 0x3f, 0xf7, 0x59, 0xfb, 0x92, 0x61, 0xca, 0x53, 0x54, 0x5b, 0xb2, - 0xc4, 0xfe, 0x21, 0x75, 0xbe, 0xe0, 0xc4, 0x5f, 0x4c, 0xfc, 0x99, 0x05, 0x35, 0x40, 0x8b, 0xdf, - 0x42, 0x87, 0x0c, 0x43, 0xc6, 0x37, 0x80, 0x6a, 0x67, 0x86, 0x38, 0x9b, 0x17, 0x2c, 0x71, 0xab, - 0x49, 0x76, 0x66, 0xd9, 0xd8, 0x81, 0xca, 0x7e, 0x14, 0x75, 0x88, 0x87, 0x29, 0x5a, 0x04, 0x78, - 0x1f, 0xe2, 0x8b, 0x01, 0x76, 0x19, 0xf6, 0xf4, 0x02, 0x5a, 0x82, 0x6a, 0xa7, 0xbb, 0x77, 0x4c, - 0xd8, 0x01, 0x19, 0x86, 0x9e, 0xae, 0x20, 0x1d, 0xaa, 0xfb, 0x51, 0x44, 0xa2, 0xb7, 0xfd, 0x3e, - 0xc5, 0x4c, 0xbf, 0x52, 0x36, 0xda, 0x80, 0xa6, 0x5f, 0x3e, 0x5a, 0x00, 0xed, 0x98, 0xb0, 0xfd, - 0x0b, 0x9f, 0x32, 0xaa, 0x17, 0x10, 0x40, 0x59, 0x9c, 0x15, 0x54, 0x83, 0x85, 0xe4, 0xdc, 0x0d, - 0x79, 0x29, 0xf4, 0xe2, 0xd6, 0x6f, 0x15, 0xd4, 0xf8, 0x15, 0xa0, 0x5d, 0xa8, 0xa4, 0x5b, 0x14, - 0x3d, 0x9d, 0xe8, 0x73, 0xb6, 0x98, 0x0d, 0x23, 0xcf, 0x25, 0x8a, 0xb9, 0x07, 0xda, 0x68, 0xc5, - 0xa1, 0xc9, 0x40, 0x69, 0xc7, 0x1a, 0x6b, 0xb9, 0x3e, 0x81, 0xf2, 0x06, 0xaa, 0xd2, 0xca, 0x41, - 0x8d, 0x89, 0xd8, 0xb1, 0x77, 0x6f, 0x3c, 0xbb, 0xc3, 0x2b, 0xb0, 0x0e, 0x01, 0xb2, 0x11, 0x45, - 0x93, 0xb4, 0xf2, 0x4e, 0x30, 0x1a, 0xf9, 0xce, 0x4c, 0x94, 0x34, 0x8b, 0xb2, 0xa8, 0xe9, 0x61, - 0x97, 0x45, 0xe5, 0x0c, 0x70, 0x2c, 0x2a, 0x9b, 0x3b, 0x59, 0xd4, 0xd4, 0x58, 0x1b, 0x8d, 0x7c, - 0xa7, 0x00, 0xda, 0x86, 0x47, 0x09, 0xc6, 0x6a, 0x16, 0x36, 0x96, 0xfe, 0x64, 0xca, 0x9e, 0x75, - 0x6a, 0x34, 0x0b, 0x72, 0xa7, 0x26, 0xe7, 0x49, 0xee, 0xd4, 0xd4, 0xf0, 0xb4, 0x5b, 0x57, 0x37, - 0xa6, 0x72, 0x7d, 0x63, 0x2a, 0x7f, 0x6f, 0x4c, 0xe5, 0xe7, 0xad, 0x59, 0xb8, 0xbe, 0x35, 0x0b, - 0x7f, 0x6e, 0xcd, 0xc2, 0xa7, 0x95, 0xbc, 0xff, 0x00, 0xbd, 0x32, 0xff, 0x79, 0xf9, 0x2f, 0x00, - 0x00, 0xff, 0xff, 0x21, 0xe9, 0xf4, 0xee, 0x22, 0x08, 0x00, 0x00, + // 764 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xc1, 0x4e, 0xdb, 0x4c, + 0x10, 0xce, 0x12, 0xff, 0x21, 0x9e, 0x10, 0x70, 0x16, 0x7e, 0xfe, 0xfc, 0x21, 0xb5, 0x22, 0x1f, + 0x2a, 0x84, 0xaa, 0x50, 0xd1, 0x1e, 0xb8, 0x70, 0x20, 0x21, 0xd0, 0x14, 0x89, 0x56, 0x46, 0x55, + 0xd5, 0xf6, 0x52, 0xc7, 0xde, 0x14, 0x17, 0xe3, 0x4d, 0xb3, 0x9b, 0x16, 0xde, 0xa2, 0x7d, 0x99, + 0x3e, 0x03, 0x47, 0x8e, 0x3d, 0x56, 0xf0, 0x22, 0x95, 0xd7, 0xeb, 0x78, 0x93, 0xb8, 0x82, 0xd2, + 0x4b, 0x98, 0xfd, 0x76, 0x66, 0xbe, 0xd9, 0x6f, 0x3c, 0x23, 0xe0, 0xa1, 0x4b, 0xcf, 0xce, 0x68, + 0xd8, 0xf7, 0x03, 0xb2, 0x19, 0xfd, 0x0c, 0x86, 0x94, 0xd3, 0x4d, 0xf1, 0xcb, 0x04, 0xd0, 0x14, + 0x36, 0x2e, 0x46, 0x36, 0xbb, 0x08, 0x5d, 0x6b, 0x07, 0x96, 0x5a, 0x01, 0x75, 0x4f, 0x0f, 0x08, + 0xb7, 0xc9, 0xa7, 0x11, 0x61, 0x1c, 0x57, 0x61, 0x9e, 0x0d, 0x1c, 0x97, 0x74, 0xbd, 0x2a, 0x6a, + 0xa0, 0x75, 0xdd, 0x4e, 0x8e, 0xd8, 0x80, 0xbc, 0xeb, 0x7b, 0xd5, 0xb9, 0x06, 0x5a, 0x5f, 0xb0, + 0x23, 0xd3, 0xda, 0x06, 0x23, 0x0d, 0x67, 0x03, 0x1a, 0x32, 0x92, 0x78, 0xa1, 0xb1, 0x17, 0xc6, + 0xa0, 0x79, 0x0e, 0x77, 0x64, 0xa0, 0xb0, 0xad, 0x8f, 0x32, 0xf2, 0xe5, 0x88, 0x9d, 0xdc, 0xce, + 0xbc, 0x0a, 0x85, 0xa8, 0xe4, 0x6e, 0x4c, 0xae, 0xdb, 0xf2, 0x94, 0x70, 0xe5, 0x67, 0xb9, 0x34, + 0x85, 0x6b, 0x19, 0x2a, 0x0a, 0x57, 0x5c, 0xa6, 0xd5, 0x86, 0x65, 0x01, 0xb2, 0x3d, 0x12, 0x10, + 0x4e, 0x6e, 0xaf, 0x01, 0x83, 0xe6, 0xfa, 0x1e, 0xab, 0xce, 0x35, 0xf2, 0x51, 0xe6, 0xc8, 0xb6, + 0x56, 0x61, 0x65, 0x32, 0x89, 0x4c, 0xde, 0x02, 0x1c, 0xe3, 0xed, 0x13, 0xe2, 0x9e, 0xde, 0x2f, + 0x77, 0x2f, 0x29, 0x50, 0xe6, 0x90, 0xf2, 0x1e, 0x02, 0xee, 0x09, 0x78, 0xf7, 0xb3, 0xe3, 0x07, + 0x4e, 0xcf, 0x0f, 0x7c, 0x7e, 0x51, 0x45, 0x8d, 0xfc, 0x7a, 0x69, 0x6b, 0xad, 0x99, 0x34, 0xb6, + 0x29, 0x42, 0x55, 0x17, 0x3b, 0x23, 0xcc, 0x7a, 0x27, 0x95, 0x51, 0xc1, 0x8c, 0x06, 0x3e, 0x85, + 0x02, 0xe3, 0x0e, 0x1f, 0x31, 0x21, 0xff, 0xe2, 0x56, 0x3d, 0xe5, 0x51, 0x23, 0x8f, 0x85, 0x8f, + 0x2d, 0x7d, 0xad, 0x37, 0x32, 0x39, 0x6b, 0xf9, 0xa1, 0x77, 0xff, 0x1e, 0x27, 0xda, 0xe4, 0x15, + 0x6d, 0x56, 0x12, 0x7d, 0xe3, 0xd4, 0x52, 0xf5, 0x67, 0x80, 0xf7, 0xa3, 0xba, 0xee, 0xda, 0xd1, + 0x2a, 0xcc, 0xc7, 0x1c, 0xb1, 0xf0, 0xba, 0x9d, 0x1c, 0xad, 0x7f, 0x61, 0x79, 0x22, 0x93, 0x24, + 0xd8, 0x07, 0x43, 0xc0, 0xdd, 0xb0, 0x4f, 0xff, 0x26, 0x7d, 0x07, 0x2a, 0x4a, 0x1e, 0xd9, 0xd8, + 0xc7, 0xa0, 0xf7, 0x13, 0x50, 0xf6, 0x13, 0xa7, 0x3a, 0x47, 0xfe, 0xc2, 0x3d, 0x75, 0xb2, 0xde, + 0x43, 0x31, 0x81, 0x15, 0xf5, 0xd0, 0x84, 0x7a, 0x26, 0xc0, 0x88, 0x39, 0x1f, 0x48, 0xeb, 0x82, + 0x93, 0xb8, 0x7d, 0x9a, 0xad, 0x20, 0xb8, 0x0e, 0x7a, 0xa4, 0x68, 0x9b, 0x8e, 0x42, 0x2e, 0xe6, + 0xa8, 0x6c, 0xa7, 0x80, 0xb5, 0x08, 0x0b, 0xea, 0x17, 0x6c, 0x1d, 0x42, 0x79, 0xf2, 0x6b, 0xac, + 0x41, 0x51, 0x3e, 0x97, 0x89, 0x9a, 0x75, 0x7b, 0x7c, 0x8e, 0xa8, 0x9d, 0x20, 0xa0, 0x5f, 0x5e, + 0x0f, 0x7d, 0x4e, 0x04, 0x75, 0xd1, 0x56, 0x10, 0xeb, 0x11, 0x18, 0xc7, 0xc2, 0xf7, 0x2e, 0x6a, + 0x5a, 0xdf, 0x10, 0x54, 0x14, 0x77, 0xc9, 0x6f, 0x02, 0x04, 0xfe, 0x99, 0xcf, 0xe3, 0xe7, 0xa1, + 0xf8, 0x79, 0x29, 0xf2, 0xe7, 0xcf, 0xd7, 0x94, 0xe7, 0x47, 0xd1, 0x42, 0xed, 0xf8, 0x5a, 0x8b, + 0xa3, 0x53, 0x64, 0x63, 0x07, 0x8a, 0x9d, 0xe1, 0xb0, 0x4d, 0x3d, 0xc2, 0xf0, 0x22, 0xc0, 0xab, + 0x90, 0x9c, 0x0f, 0x88, 0xcb, 0x89, 0x67, 0xe4, 0xf0, 0x12, 0x94, 0xda, 0xdd, 0xbd, 0x23, 0xca, + 0xf7, 0xe9, 0x28, 0xf4, 0x0c, 0x84, 0x0d, 0x28, 0x75, 0x86, 0x43, 0x3a, 0x7c, 0xd1, 0xef, 0x33, + 0xc2, 0x8d, 0x4b, 0xb4, 0xd1, 0x02, 0x3c, 0x3b, 0x3e, 0xb8, 0x0c, 0xfa, 0x11, 0xe5, 0x9d, 0x73, + 0x9f, 0x71, 0x66, 0xe4, 0x30, 0x40, 0x41, 0xda, 0x08, 0x57, 0xa0, 0x1c, 0xdb, 0xdd, 0x50, 0x48, + 0x61, 0xcc, 0x6d, 0x7d, 0xd7, 0x40, 0x8b, 0x3e, 0x02, 0xbc, 0x0b, 0xc5, 0x64, 0x15, 0xe3, 0xff, + 0xa7, 0xf6, 0x40, 0xba, 0xdd, 0x6b, 0xb5, 0xac, 0x2b, 0x29, 0xe6, 0x1e, 0xe8, 0xe3, 0x3d, 0x89, + 0xa7, 0x1d, 0x95, 0x45, 0x5d, 0x5b, 0xcb, 0xbc, 0x93, 0x59, 0x9e, 0x43, 0x49, 0xd9, 0x5b, 0xb8, + 0x3e, 0xe5, 0x3b, 0xb1, 0x12, 0x6b, 0x0f, 0x7e, 0x73, 0x2b, 0x73, 0x1d, 0x00, 0xa4, 0x73, 0x8e, + 0xa7, 0x69, 0xd5, 0xc5, 0x52, 0xab, 0x67, 0x5f, 0xa6, 0x45, 0x29, 0x03, 0xad, 0x16, 0x35, 0xbb, + 0x31, 0xd4, 0xa2, 0x32, 0xb6, 0x40, 0x24, 0xd3, 0x78, 0x7a, 0x55, 0x99, 0xa6, 0x57, 0x83, 0x2a, + 0xd3, 0xec, 0xb8, 0x6f, 0xc3, 0x3f, 0xb1, 0x40, 0xab, 0xa9, 0xd7, 0x84, 0x34, 0xff, 0xcd, 0xe0, + 0x29, 0xff, 0x78, 0x10, 0x54, 0xfe, 0xe9, 0x61, 0x52, 0xf9, 0x67, 0x26, 0xa7, 0xd5, 0xbc, 0xbc, + 0x36, 0xd1, 0xd5, 0xb5, 0x89, 0x7e, 0x5e, 0x9b, 0xe8, 0xeb, 0x8d, 0x99, 0xbb, 0xba, 0x31, 0x73, + 0x3f, 0x6e, 0xcc, 0xdc, 0xdb, 0x95, 0xac, 0xff, 0x22, 0x7a, 0x05, 0xf1, 0xe7, 0xc9, 0xaf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xc8, 0x47, 0x3d, 0x0c, 0x64, 0x08, 0x00, 0x00, } func (m *BlockGetRequest) Marshal() (dAtA []byte, err error) { @@ -1532,7 +1595,7 @@ func (m *FilesDeleteResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *FilesCheckRequest) Marshal() (dAtA []byte, err error) { +func (m *FilesInfoRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1542,12 +1605,12 @@ func (m *FilesCheckRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *FilesCheckRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *FilesInfoRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *FilesCheckRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *FilesInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1571,7 +1634,7 @@ func (m *FilesCheckRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *FilesCheckResponse) Marshal() (dAtA []byte, err error) { +func (m *FilesInfoResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1581,20 +1644,20 @@ func (m *FilesCheckResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *FilesCheckResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *FilesInfoResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *FilesCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *FilesInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.BlocksAvailability) > 0 { - for iNdEx := len(m.BlocksAvailability) - 1; iNdEx >= 0; iNdEx-- { + if len(m.FilesInfo) > 0 { + for iNdEx := len(m.FilesInfo) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.BlocksAvailability[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.FilesInfo[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1608,6 +1671,46 @@ func (m *FilesCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *FileInfo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *FileInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FileInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.CidsCount != 0 { + i = encodeVarintFile(dAtA, i, uint64(m.CidsCount)) + i-- + dAtA[i] = 0x18 + } + if m.UsageBytes != 0 { + i = encodeVarintFile(dAtA, i, uint64(m.UsageBytes)) + i-- + dAtA[i] = 0x10 + } + if len(m.FileId) > 0 { + i -= len(m.FileId) + copy(dAtA[i:], m.FileId) + i = encodeVarintFile(dAtA, i, uint64(len(m.FileId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *CheckRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1963,7 +2066,7 @@ func (m *FilesDeleteResponse) Size() (n int) { return n } -func (m *FilesCheckRequest) Size() (n int) { +func (m *FilesInfoRequest) Size() (n int) { if m == nil { return 0 } @@ -1982,14 +2085,14 @@ func (m *FilesCheckRequest) Size() (n int) { return n } -func (m *FilesCheckResponse) Size() (n int) { +func (m *FilesInfoResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.BlocksAvailability) > 0 { - for _, e := range m.BlocksAvailability { + if len(m.FilesInfo) > 0 { + for _, e := range m.FilesInfo { l = e.Size() n += 1 + l + sovFile(uint64(l)) } @@ -1997,6 +2100,25 @@ func (m *FilesCheckResponse) Size() (n int) { return n } +func (m *FileInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.FileId) + if l > 0 { + n += 1 + l + sovFile(uint64(l)) + } + if m.UsageBytes != 0 { + n += 1 + sovFile(uint64(m.UsageBytes)) + } + if m.CidsCount != 0 { + n += 1 + sovFile(uint64(m.CidsCount)) + } + return n +} + func (m *CheckRequest) Size() (n int) { if m == nil { return 0 @@ -3355,7 +3477,7 @@ func (m *FilesDeleteResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *FilesCheckRequest) Unmarshal(dAtA []byte) error { +func (m *FilesInfoRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3378,10 +3500,10 @@ func (m *FilesCheckRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: FilesCheckRequest: wiretype end group for non-group") + return fmt.Errorf("proto: FilesInfoRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: FilesCheckRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: FilesInfoRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3469,7 +3591,7 @@ func (m *FilesCheckRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *FilesCheckResponse) Unmarshal(dAtA []byte) error { +func (m *FilesInfoResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3492,15 +3614,15 @@ func (m *FilesCheckResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: FilesCheckResponse: wiretype end group for non-group") + return fmt.Errorf("proto: FilesInfoResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: FilesCheckResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: FilesInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlocksAvailability", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FilesInfo", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3527,8 +3649,8 @@ func (m *FilesCheckResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.BlocksAvailability = append(m.BlocksAvailability, &BlockAvailability{}) - if err := m.BlocksAvailability[len(m.BlocksAvailability)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.FilesInfo = append(m.FilesInfo, &FileInfo{}) + if err := m.FilesInfo[len(m.FilesInfo)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3553,6 +3675,126 @@ func (m *FilesCheckResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *FileInfo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: FileInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: FileInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FileId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFile + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFile + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.FileId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UsageBytes", wireType) + } + m.UsageBytes = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.UsageBytes |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CidsCount", wireType) + } + m.CidsCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CidsCount |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipFile(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthFile + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *CheckRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/commonfile/fileproto/file_drpc.pb.go b/commonfile/fileproto/file_drpc.pb.go index 43d9124a..2f9ee69d 100644 --- a/commonfile/fileproto/file_drpc.pb.go +++ b/commonfile/fileproto/file_drpc.pb.go @@ -45,7 +45,7 @@ type DRPCFileClient interface { BlocksCheck(ctx context.Context, in *BlocksCheckRequest) (*BlocksCheckResponse, error) BlocksBind(ctx context.Context, in *BlocksBindRequest) (*BlocksBindResponse, error) FilesDelete(ctx context.Context, in *FilesDeleteRequest) (*FilesDeleteResponse, error) - FilesCheck(ctx context.Context, in *FilesCheckRequest) (*FilesCheckResponse, error) + FilesInfo(ctx context.Context, in *FilesInfoRequest) (*FilesInfoResponse, error) Check(ctx context.Context, in *CheckRequest) (*CheckResponse, error) SpaceInfo(ctx context.Context, in *SpaceInfoRequest) (*SpaceInfoResponse, error) } @@ -105,9 +105,9 @@ func (c *drpcFileClient) FilesDelete(ctx context.Context, in *FilesDeleteRequest return out, nil } -func (c *drpcFileClient) FilesCheck(ctx context.Context, in *FilesCheckRequest) (*FilesCheckResponse, error) { - out := new(FilesCheckResponse) - err := c.cc.Invoke(ctx, "/filesync.File/FilesCheck", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, in, out) +func (c *drpcFileClient) FilesInfo(ctx context.Context, in *FilesInfoRequest) (*FilesInfoResponse, error) { + out := new(FilesInfoResponse) + err := c.cc.Invoke(ctx, "/filesync.File/FilesInfo", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, in, out) if err != nil { return nil, err } @@ -138,7 +138,7 @@ type DRPCFileServer interface { BlocksCheck(context.Context, *BlocksCheckRequest) (*BlocksCheckResponse, error) BlocksBind(context.Context, *BlocksBindRequest) (*BlocksBindResponse, error) FilesDelete(context.Context, *FilesDeleteRequest) (*FilesDeleteResponse, error) - FilesCheck(context.Context, *FilesCheckRequest) (*FilesCheckResponse, error) + FilesInfo(context.Context, *FilesInfoRequest) (*FilesInfoResponse, error) Check(context.Context, *CheckRequest) (*CheckResponse, error) SpaceInfo(context.Context, *SpaceInfoRequest) (*SpaceInfoResponse, error) } @@ -165,7 +165,7 @@ func (s *DRPCFileUnimplementedServer) FilesDelete(context.Context, *FilesDeleteR return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } -func (s *DRPCFileUnimplementedServer) FilesCheck(context.Context, *FilesCheckRequest) (*FilesCheckResponse, error) { +func (s *DRPCFileUnimplementedServer) FilesInfo(context.Context, *FilesInfoRequest) (*FilesInfoResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } @@ -229,14 +229,14 @@ func (DRPCFileDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, ) }, DRPCFileServer.FilesDelete, true case 5: - return "/filesync.File/FilesCheck", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, + return "/filesync.File/FilesInfo", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCFileServer). - FilesCheck( + FilesInfo( ctx, - in1.(*FilesCheckRequest), + in1.(*FilesInfoRequest), ) - }, DRPCFileServer.FilesCheck, true + }, DRPCFileServer.FilesInfo, true case 6: return "/filesync.File/Check", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { @@ -344,16 +344,16 @@ func (x *drpcFile_FilesDeleteStream) SendAndClose(m *FilesDeleteResponse) error return x.CloseSend() } -type DRPCFile_FilesCheckStream interface { +type DRPCFile_FilesInfoStream interface { drpc.Stream - SendAndClose(*FilesCheckResponse) error + SendAndClose(*FilesInfoResponse) error } -type drpcFile_FilesCheckStream struct { +type drpcFile_FilesInfoStream struct { drpc.Stream } -func (x *drpcFile_FilesCheckStream) SendAndClose(m *FilesCheckResponse) error { +func (x *drpcFile_FilesInfoStream) SendAndClose(m *FilesInfoResponse) error { if err := x.MsgSend(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{}); err != nil { return err } diff --git a/commonfile/fileproto/protos/file.proto b/commonfile/fileproto/protos/file.proto index 853cdd50..c7d78cb9 100644 --- a/commonfile/fileproto/protos/file.proto +++ b/commonfile/fileproto/protos/file.proto @@ -20,8 +20,8 @@ service File { rpc BlocksBind(BlocksBindRequest) returns (BlocksBindResponse); // FilesDelete deletes files by id rpc FilesDelete(FilesDeleteRequest) returns (FilesDeleteResponse); - // FileCheck checks file CIDs and children for exists - rpc FilesCheck(FilesCheckRequest) returns (FilesCheckResponse); + // FilesInfo return info by given files id + rpc FilesInfo(FilesInfoRequest) returns (FilesInfoResponse); // Check checks the connection and credentials rpc Check(CheckRequest) returns (CheckResponse); // SpaceInfo returns usage, limit, etc about space @@ -91,13 +91,19 @@ message FilesDeleteRequest { message FilesDeleteResponse {} -message FilesCheckRequest { +message FilesInfoRequest { string spaceId = 1; repeated string fileIds = 2; } -message FilesCheckResponse { - repeated BlockAvailability blocksAvailability = 1; +message FilesInfoResponse { + repeated FileInfo filesInfo = 1; +} + +message FileInfo { + string fileId = 1; + uint64 usageBytes = 2; + uint32 cidsCount = 3; } message CheckRequest {}