diff --git a/entity/copy_status.pb.go b/entity/copy_status.pb.go index 5a9c120..ed66a5d 100644 --- a/entity/copy_status.pb.go +++ b/entity/copy_status.pb.go @@ -88,10 +88,10 @@ var file_copy_status_proto_rawDesc = []byte{ 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x41, 0x47, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x55, 0x42, 0x4d, 0x49, 0x54, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0b, 0x0a, - 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0xff, 0x01, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, + 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0xff, 0x01, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, - 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, - 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/file.pb.go b/entity/file.pb.go index a9babef..95ff3d6 100644 --- a/entity/file.pb.go +++ b/entity/file.pb.go @@ -190,10 +190,9 @@ var file_file_proto_rawDesc = []byte{ 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, - 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6d, 0x65, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, + 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/job.pb.go b/entity/job.pb.go index 09ab87c..74be39a 100644 --- a/entity/job.pb.go +++ b/entity/job.pb.go @@ -677,10 +677,10 @@ var file_job_proto_rawDesc = []byte{ 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x53, 0x53, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x06, - 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0xff, 0x01, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, + 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0xff, 0x01, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, - 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, 0x6e, - 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/job_archive.pb.go b/entity/job_archive.pb.go index b01c701..2bd218a 100644 --- a/entity/job_archive.pb.go +++ b/entity/job_archive.pb.go @@ -412,8 +412,8 @@ type JobArchiveDisplay struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CopyedBytes int64 `protobuf:"varint,1,opt,name=copyed_bytes,json=copyedBytes,proto3" json:"copyed_bytes,omitempty"` - CopyedFiles int64 `protobuf:"varint,2,opt,name=copyed_files,json=copyedFiles,proto3" json:"copyed_files,omitempty"` + CopiedBytes int64 `protobuf:"varint,1,opt,name=copied_bytes,json=copiedBytes,proto3" json:"copied_bytes,omitempty"` + CopiedFiles int64 `protobuf:"varint,2,opt,name=copied_files,json=copiedFiles,proto3" json:"copied_files,omitempty"` TotalBytes int64 `protobuf:"varint,3,opt,name=total_bytes,json=totalBytes,proto3" json:"total_bytes,omitempty"` TotalFiles int64 `protobuf:"varint,4,opt,name=total_files,json=totalFiles,proto3" json:"total_files,omitempty"` Speed *int64 `protobuf:"varint,5,opt,name=speed,proto3,oneof" json:"speed,omitempty"` @@ -452,16 +452,16 @@ func (*JobArchiveDisplay) Descriptor() ([]byte, []int) { return file_job_archive_proto_rawDescGZIP(), []int{6} } -func (x *JobArchiveDisplay) GetCopyedBytes() int64 { +func (x *JobArchiveDisplay) GetCopiedBytes() int64 { if x != nil { - return x.CopyedBytes + return x.CopiedBytes } return 0 } -func (x *JobArchiveDisplay) GetCopyedFiles() int64 { +func (x *JobArchiveDisplay) GetCopiedFiles() int64 { if x != nil { - return x.CopyedFiles + return x.CopiedFiles } return 0 } @@ -537,11 +537,11 @@ var file_job_archive_proto_rawDesc = []byte{ 0x13, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x07, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0xdf, 0x01, 0x0a, 0x11, 0x4a, 0x6f, 0x62, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x44, 0x69, 0x73, 0x70, - 0x6c, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x70, 0x79, 0x65, 0x64, 0x5f, 0x62, 0x79, - 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x70, 0x79, 0x65, - 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x70, 0x79, 0x65, 0x64, + 0x6c, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x5f, 0x62, 0x79, + 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x70, 0x69, 0x65, + 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, - 0x70, 0x79, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, + 0x70, 0x69, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, @@ -554,10 +554,10 @@ var file_job_archive_proto_rawDesc = []byte{ 0x70, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x54, 0x41, 0x50, 0x45, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x50, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0d, - 0x0a, 0x08, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x48, 0x45, 0x44, 0x10, 0xff, 0x01, 0x42, 0x29, 0x5a, - 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, - 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0a, 0x08, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x48, 0x45, 0x44, 0x10, 0xff, 0x01, 0x42, 0x23, 0x5a, + 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, + 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, + 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/job_archive.proto b/entity/job_archive.proto index 25d810c..70354b4 100644 --- a/entity/job_archive.proto +++ b/entity/job_archive.proto @@ -40,8 +40,8 @@ message JobArchiveState { } message JobArchiveDisplay { - int64 copyed_bytes = 1; - int64 copyed_files = 2; + int64 copied_bytes = 1; + int64 copied_files = 2; int64 total_bytes = 3; int64 total_files = 4; diff --git a/entity/job_restore.pb.go b/entity/job_restore.pb.go index 10ca5de..7163f8a 100644 --- a/entity/job_restore.pb.go +++ b/entity/job_restore.pb.go @@ -570,8 +570,8 @@ type JobRestoreDisplay struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CopyedBytes int64 `protobuf:"varint,1,opt,name=copyed_bytes,json=copyedBytes,proto3" json:"copyed_bytes,omitempty"` - CopyedFiles int64 `protobuf:"varint,2,opt,name=copyed_files,json=copyedFiles,proto3" json:"copyed_files,omitempty"` + CopiedBytes int64 `protobuf:"varint,1,opt,name=copied_bytes,json=copiedBytes,proto3" json:"copied_bytes,omitempty"` + CopiedFiles int64 `protobuf:"varint,2,opt,name=copied_files,json=copiedFiles,proto3" json:"copied_files,omitempty"` TotalBytes int64 `protobuf:"varint,3,opt,name=total_bytes,json=totalBytes,proto3" json:"total_bytes,omitempty"` TotalFiles int64 `protobuf:"varint,4,opt,name=total_files,json=totalFiles,proto3" json:"total_files,omitempty"` Speed *int64 `protobuf:"varint,5,opt,name=speed,proto3,oneof" json:"speed,omitempty"` @@ -610,16 +610,16 @@ func (*JobRestoreDisplay) Descriptor() ([]byte, []int) { return file_job_restore_proto_rawDescGZIP(), []int{8} } -func (x *JobRestoreDisplay) GetCopyedBytes() int64 { +func (x *JobRestoreDisplay) GetCopiedBytes() int64 { if x != nil { - return x.CopyedBytes + return x.CopiedBytes } return 0 } -func (x *JobRestoreDisplay) GetCopyedFiles() int64 { +func (x *JobRestoreDisplay) GetCopiedFiles() int64 { if x != nil { - return x.CopyedFiles + return x.CopiedFiles } return 0 } @@ -718,10 +718,10 @@ var file_job_restore_proto_rawDesc = []byte{ 0x65, 0x2e, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x54, 0x61, 0x70, 0x65, 0x52, 0x05, 0x74, 0x61, 0x70, 0x65, 0x73, 0x22, 0xdf, 0x01, 0x0a, 0x11, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, - 0x70, 0x79, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0b, 0x63, 0x6f, 0x70, 0x79, 0x65, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, - 0x0c, 0x63, 0x6f, 0x70, 0x79, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x70, 0x79, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x73, + 0x70, 0x69, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0b, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, + 0x0c, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x70, 0x69, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, @@ -735,10 +735,10 @@ var file_job_restore_proto_rawDesc = []byte{ 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x57, 0x41, 0x49, 0x54, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x54, 0x41, 0x50, 0x45, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x50, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x08, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x48, 0x45, - 0x44, 0x10, 0xff, 0x01, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, - 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x10, 0xff, 0x01, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, + 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/entity/job_restore.proto b/entity/job_restore.proto index 73b3cfe..88489cd 100644 --- a/entity/job_restore.proto +++ b/entity/job_restore.proto @@ -59,8 +59,8 @@ message JobRestoreState { } message JobRestoreDisplay { - int64 copyed_bytes = 1; - int64 copyed_files = 2; + int64 copied_bytes = 1; + int64 copied_files = 2; int64 total_bytes = 3; int64 total_files = 4; diff --git a/entity/library_entity_type.pb.go b/entity/library_entity_type.pb.go index c067f56..09057b4 100644 --- a/entity/library_entity_type.pb.go +++ b/entity/library_entity_type.pb.go @@ -82,10 +82,9 @@ var file_library_entity_type_proto_rawDesc = []byte{ 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x41, 0x50, 0x45, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x10, - 0x03, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, - 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, + 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/position.pb.go b/entity/position.pb.go index 99a7ed0..5997eb9 100644 --- a/entity/position.pb.go +++ b/entity/position.pb.go @@ -149,10 +149,9 @@ var file_position_proto_rawDesc = []byte{ 0x52, 0x09, 0x77, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, - 0x61, 0x73, 0x68, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, - 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x73, 0x68, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, + 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/service.pb.go b/entity/service.pb.go index 7abfa2c..a40b9b8 100644 --- a/entity/service.pb.go +++ b/entity/service.pb.go @@ -1911,11 +1911,10 @@ var file_service_proto_rawDesc = []byte{ 0x12, 0x1d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x29, - 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, - 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, - 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x79, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x23, + 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, + 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, + 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/source.pb.go b/entity/source.pb.go index dcdf565..a260871 100644 --- a/entity/source.pb.go +++ b/entity/source.pb.go @@ -261,11 +261,10 @@ var file_source_proto_rawDesc = []byte{ 0x2e, 0x43, 0x6f, 0x70, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88, - 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x29, - 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, - 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, - 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x23, + 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, + 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, + 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/entity/tape.pb.go b/entity/tape.pb.go index 659ae8f..829756d 100644 --- a/entity/tape.pb.go +++ b/entity/tape.pb.go @@ -204,10 +204,10 @@ var file_tape_proto_rawDesc = []byte{ 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x22, 0x20, 0x01, 0x28, 0x03, 0x48, 0x01, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x42, 0x09, 0x0a, - 0x07, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, + 0x07, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x61, 0x6d, 0x75, 0x65, 0x6c, 0x6e, 0x63, 0x75, - 0x69, 0x2f, 0x74, 0x61, 0x70, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x72, 0x2f, 0x65, 0x6e, 0x74, - 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x2f, 0x79, 0x61, 0x74, 0x6d, 0x2f, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/executor/job_archive_display.go b/executor/job_archive_display.go index a5c8fbb..ebe336f 100644 --- a/executor/job_archive_display.go +++ b/executor/job_archive_display.go @@ -11,8 +11,8 @@ func (e *Executor) getArchiveDisplay(ctx context.Context, job *Job) (*entity.Job display := new(entity.JobArchiveDisplay) if exe := e.getArchiveExecutor(ctx, job); exe != nil && exe.progress != nil { - display.CopyedBytes = atomic.LoadInt64(&exe.progress.bytes) - display.CopyedFiles = atomic.LoadInt64(&exe.progress.files) + display.CopiedBytes = atomic.LoadInt64(&exe.progress.bytes) + display.CopiedFiles = atomic.LoadInt64(&exe.progress.files) display.TotalBytes = atomic.LoadInt64(&exe.progress.totalBytes) display.TotalFiles = atomic.LoadInt64(&exe.progress.totalFiles) display.StartTime = exe.progress.startTime.Unix() diff --git a/executor/job_restore_display.go b/executor/job_restore_display.go index 01214f9..0cd652d 100644 --- a/executor/job_restore_display.go +++ b/executor/job_restore_display.go @@ -11,8 +11,8 @@ func (e *Executor) getRestoreDisplay(ctx context.Context, job *Job) (*entity.Job display := new(entity.JobRestoreDisplay) if exe := e.getRestoreExecutor(ctx, job); exe != nil && exe.progress != nil { - display.CopyedBytes = atomic.LoadInt64(&exe.progress.bytes) - display.CopyedFiles = atomic.LoadInt64(&exe.progress.files) + display.CopiedBytes = atomic.LoadInt64(&exe.progress.bytes) + display.CopiedFiles = atomic.LoadInt64(&exe.progress.files) display.TotalBytes = atomic.LoadInt64(&exe.progress.totalBytes) display.TotalFiles = atomic.LoadInt64(&exe.progress.totalFiles) display.StartTime = exe.progress.startTime.Unix() diff --git a/frontend/src/entity/copy_status.ts b/frontend/src/entity/copy_status.ts index 31af268..be29dbe 100644 --- a/frontend/src/entity/copy_status.ts +++ b/frontend/src/entity/copy_status.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "copy_status.proto" (package "copy_status", syntax proto3) // tslint:disable /** diff --git a/frontend/src/entity/file.ts b/frontend/src/entity/file.ts index 42077a4..0f2ea63 100644 --- a/frontend/src/entity/file.ts +++ b/frontend/src/entity/file.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "file.proto" (package "file", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; diff --git a/frontend/src/entity/job.ts b/frontend/src/entity/job.ts index 74ff278..aa61579 100644 --- a/frontend/src/entity/job.ts +++ b/frontend/src/entity/job.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "job.proto" (package "job", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; diff --git a/frontend/src/entity/job_archive.ts b/frontend/src/entity/job_archive.ts index aea93a4..919198b 100644 --- a/frontend/src/entity/job_archive.ts +++ b/frontend/src/entity/job_archive.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "job_archive.proto" (package "job_archive", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; @@ -96,13 +96,13 @@ export interface JobArchiveState { */ export interface JobArchiveDisplay { /** - * @generated from protobuf field: int64 copyed_bytes = 1; + * @generated from protobuf field: int64 copied_bytes = 1; */ - copyedBytes: bigint; + copiedBytes: bigint; /** - * @generated from protobuf field: int64 copyed_files = 2; + * @generated from protobuf field: int64 copied_files = 2; */ - copyedFiles: bigint; + copiedFiles: bigint; /** * @generated from protobuf field: int64 total_bytes = 3; */ @@ -429,8 +429,8 @@ export const JobArchiveState = new JobArchiveState$Type(); class JobArchiveDisplay$Type extends MessageType { constructor() { super("job_archive.JobArchiveDisplay", [ - { no: 1, name: "copyed_bytes", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, - { no: 2, name: "copyed_files", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, + { no: 1, name: "copied_bytes", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, + { no: 2, name: "copied_files", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, { no: 3, name: "total_bytes", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, { no: 4, name: "total_files", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, { no: 5, name: "speed", kind: "scalar", opt: true, T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, @@ -438,7 +438,7 @@ class JobArchiveDisplay$Type extends MessageType { ]); } create(value?: PartialMessage): JobArchiveDisplay { - const message = { copyedBytes: 0n, copyedFiles: 0n, totalBytes: 0n, totalFiles: 0n, startTime: 0n }; + const message = { copiedBytes: 0n, copiedFiles: 0n, totalBytes: 0n, totalFiles: 0n, startTime: 0n }; globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this }); if (value !== undefined) reflectionMergePartial(this, message, value); @@ -449,11 +449,11 @@ class JobArchiveDisplay$Type extends MessageType { while (reader.pos < end) { let [fieldNo, wireType] = reader.tag(); switch (fieldNo) { - case /* int64 copyed_bytes */ 1: - message.copyedBytes = reader.int64().toBigInt(); + case /* int64 copied_bytes */ 1: + message.copiedBytes = reader.int64().toBigInt(); break; - case /* int64 copyed_files */ 2: - message.copyedFiles = reader.int64().toBigInt(); + case /* int64 copied_files */ 2: + message.copiedFiles = reader.int64().toBigInt(); break; case /* int64 total_bytes */ 3: message.totalBytes = reader.int64().toBigInt(); @@ -479,12 +479,12 @@ class JobArchiveDisplay$Type extends MessageType { return message; } internalBinaryWrite(message: JobArchiveDisplay, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter { - /* int64 copyed_bytes = 1; */ - if (message.copyedBytes !== 0n) - writer.tag(1, WireType.Varint).int64(message.copyedBytes); - /* int64 copyed_files = 2; */ - if (message.copyedFiles !== 0n) - writer.tag(2, WireType.Varint).int64(message.copyedFiles); + /* int64 copied_bytes = 1; */ + if (message.copiedBytes !== 0n) + writer.tag(1, WireType.Varint).int64(message.copiedBytes); + /* int64 copied_files = 2; */ + if (message.copiedFiles !== 0n) + writer.tag(2, WireType.Varint).int64(message.copiedFiles); /* int64 total_bytes = 3; */ if (message.totalBytes !== 0n) writer.tag(3, WireType.Varint).int64(message.totalBytes); diff --git a/frontend/src/entity/job_restore.ts b/frontend/src/entity/job_restore.ts index a41e765..db36026 100644 --- a/frontend/src/entity/job_restore.ts +++ b/frontend/src/entity/job_restore.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "job_restore.proto" (package "job_restore", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; @@ -145,13 +145,13 @@ export interface JobRestoreState { */ export interface JobRestoreDisplay { /** - * @generated from protobuf field: int64 copyed_bytes = 1; + * @generated from protobuf field: int64 copied_bytes = 1; */ - copyedBytes: bigint; + copiedBytes: bigint; /** - * @generated from protobuf field: int64 copyed_files = 2; + * @generated from protobuf field: int64 copied_files = 2; */ - copyedFiles: bigint; + copiedFiles: bigint; /** * @generated from protobuf field: int64 total_bytes = 3; */ @@ -636,8 +636,8 @@ export const JobRestoreState = new JobRestoreState$Type(); class JobRestoreDisplay$Type extends MessageType { constructor() { super("job_restore.JobRestoreDisplay", [ - { no: 1, name: "copyed_bytes", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, - { no: 2, name: "copyed_files", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, + { no: 1, name: "copied_bytes", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, + { no: 2, name: "copied_files", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, { no: 3, name: "total_bytes", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, { no: 4, name: "total_files", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, { no: 5, name: "speed", kind: "scalar", opt: true, T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }, @@ -645,7 +645,7 @@ class JobRestoreDisplay$Type extends MessageType { ]); } create(value?: PartialMessage): JobRestoreDisplay { - const message = { copyedBytes: 0n, copyedFiles: 0n, totalBytes: 0n, totalFiles: 0n, startTime: 0n }; + const message = { copiedBytes: 0n, copiedFiles: 0n, totalBytes: 0n, totalFiles: 0n, startTime: 0n }; globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this }); if (value !== undefined) reflectionMergePartial(this, message, value); @@ -656,11 +656,11 @@ class JobRestoreDisplay$Type extends MessageType { while (reader.pos < end) { let [fieldNo, wireType] = reader.tag(); switch (fieldNo) { - case /* int64 copyed_bytes */ 1: - message.copyedBytes = reader.int64().toBigInt(); + case /* int64 copied_bytes */ 1: + message.copiedBytes = reader.int64().toBigInt(); break; - case /* int64 copyed_files */ 2: - message.copyedFiles = reader.int64().toBigInt(); + case /* int64 copied_files */ 2: + message.copiedFiles = reader.int64().toBigInt(); break; case /* int64 total_bytes */ 3: message.totalBytes = reader.int64().toBigInt(); @@ -686,12 +686,12 @@ class JobRestoreDisplay$Type extends MessageType { return message; } internalBinaryWrite(message: JobRestoreDisplay, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter { - /* int64 copyed_bytes = 1; */ - if (message.copyedBytes !== 0n) - writer.tag(1, WireType.Varint).int64(message.copyedBytes); - /* int64 copyed_files = 2; */ - if (message.copyedFiles !== 0n) - writer.tag(2, WireType.Varint).int64(message.copyedFiles); + /* int64 copied_bytes = 1; */ + if (message.copiedBytes !== 0n) + writer.tag(1, WireType.Varint).int64(message.copiedBytes); + /* int64 copied_files = 2; */ + if (message.copiedFiles !== 0n) + writer.tag(2, WireType.Varint).int64(message.copiedFiles); /* int64 total_bytes = 3; */ if (message.totalBytes !== 0n) writer.tag(3, WireType.Varint).int64(message.totalBytes); diff --git a/frontend/src/entity/library_entity_type.ts b/frontend/src/entity/library_entity_type.ts index 4c3aeb2..dc26fe5 100644 --- a/frontend/src/entity/library_entity_type.ts +++ b/frontend/src/entity/library_entity_type.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "library_entity_type.proto" (package "library_entity_type", syntax proto3) // tslint:disable /** diff --git a/frontend/src/entity/position.ts b/frontend/src/entity/position.ts index 20e3ae4..7856659 100644 --- a/frontend/src/entity/position.ts +++ b/frontend/src/entity/position.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "position.proto" (package "position", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; diff --git a/frontend/src/entity/service.client.ts b/frontend/src/entity/service.client.ts index c3bacba..d68b161 100644 --- a/frontend/src/entity/service.client.ts +++ b/frontend/src/entity/service.client.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "service.proto" (package "service", syntax proto3) // tslint:disable import type { RpcTransport } from "@protobuf-ts/runtime-rpc"; diff --git a/frontend/src/entity/service.ts b/frontend/src/entity/service.ts index 3bc26d3..9f1c59c 100644 --- a/frontend/src/entity/service.ts +++ b/frontend/src/entity/service.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "service.proto" (package "service", syntax proto3) // tslint:disable import { ServiceType } from "@protobuf-ts/runtime-rpc"; diff --git a/frontend/src/entity/source.ts b/frontend/src/entity/source.ts index 5f7b1dc..c55bc5c 100644 --- a/frontend/src/entity/source.ts +++ b/frontend/src/entity/source.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "source.proto" (package "source", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; diff --git a/frontend/src/entity/tape.ts b/frontend/src/entity/tape.ts index 5efe61c..a25ca14 100644 --- a/frontend/src/entity/tape.ts +++ b/frontend/src/entity/tape.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.8.2 +// @generated by protobuf-ts 2.9.1 // @generated from protobuf file "tape.proto" (package "tape", syntax proto3) // tslint:disable import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; diff --git a/frontend/src/pages/jobs.tsx b/frontend/src/pages/jobs.tsx index 7ca2784..7733706 100644 --- a/frontend/src/pages/jobs.tsx +++ b/frontend/src/pages/jobs.tsx @@ -250,10 +250,10 @@ const ArchiveCard = ({ submitedBytes += Number(file.size); } - const copyedFiles = submitedFiles + Number(display?.copyedFiles || 0n); - const copyedBytes = submitedBytes + Number(display?.copyedBytes || 0n); + const copiedFiles = submitedFiles + Number(display?.copiedFiles || 0n); + const copiedBytes = submitedBytes + Number(display?.copiedBytes || 0n); const avgSpeed = (() => { - if (!display || !display.copyedBytes || !display.startTime) { + if (!display || !display.copiedBytes || !display.startTime) { return NaN; } @@ -262,17 +262,17 @@ const ArchiveCard = ({ return NaN; } - return Number(display.copyedBytes) / duration; + return Number(display.copiedBytes) / duration; })(); - const progress = (totalBytes > 0 ? copyedBytes / totalBytes : 1) * 100; + const progress = (totalBytes > 0 ? copiedBytes / totalBytes : 1) * 100; const fields = [ { name: "Current Step", value: JobArchiveStep[state.step] }, { name: "Current Speed", value: display?.speed ? `${formatFilesize(display?.speed)}/s` : "--" }, { name: "Average Speed", value: !isNaN(avgSpeed) ? `${formatFilesize(avgSpeed)}/s` : "--" }, - { name: "Estimated Time", value: !isNaN(avgSpeed) ? format(((totalBytes - copyedBytes) * 1000) / avgSpeed) : "--" }, - { name: "Copyed Files", value: copyedFiles }, - { name: "Copyed Bytes", value: formatFilesize(copyedBytes) }, + { name: "Estimated Time", value: !isNaN(avgSpeed) ? format(((totalBytes - copiedBytes) * 1000) / avgSpeed) : "--" }, + { name: "Copied Files", value: copiedFiles }, + { name: "Copied Bytes", value: formatFilesize(copiedBytes) }, { name: "Submited Files", value: submitedFiles }, { name: "Submited Bytes", value: formatFilesize(submitedBytes) }, { name: "Total Files", value: totalFiles }, @@ -396,8 +396,8 @@ const RestoreCard = ({ const totalFiles = state.tapes.reduce((count, tape) => count + tape.files.length, 0); let successFiles = 0, successBytes = 0, - copyedFiles = Number(display?.copyedFiles || 0n), - copyedBytes = Number(display?.copyedBytes || 0n), + copiedFiles = Number(display?.copiedFiles || 0n), + copiedBytes = Number(display?.copiedBytes || 0n), totalBytes = 0; for (const tape of state.tapes) { for (const file of tape.files) { @@ -409,14 +409,14 @@ const RestoreCard = ({ } if (file.status === CopyStatus.SUBMITED) { - copyedFiles++; - copyedBytes += Number(file.size); + copiedFiles++; + copiedBytes += Number(file.size); } } } const avgSpeed = (() => { - if (!display || !display.copyedBytes || !display.startTime) { + if (!display || !display.copiedBytes || !display.startTime) { return NaN; } @@ -425,17 +425,17 @@ const RestoreCard = ({ return NaN; } - return Number(display.copyedBytes) / duration; + return Number(display.copiedBytes) / duration; })(); - const progress = (totalBytes > 0 ? copyedBytes / totalBytes : 1) * 100; + const progress = (totalBytes > 0 ? copiedBytes / totalBytes : 1) * 100; const fields = [ { name: "Current Step", value: JobArchiveStep[state.step] }, { name: "Current Speed", value: display?.speed ? `${formatFilesize(display?.speed)}/s` : "--" }, { name: "Average Speed", value: !isNaN(avgSpeed) ? `${formatFilesize(avgSpeed)}/s` : "--" }, - { name: "Estimated Time", value: !isNaN(avgSpeed) ? format(((totalBytes - copyedBytes) * 1000) / avgSpeed) : "--" }, - { name: "Copyed Files", value: copyedFiles }, - { name: "Copyed Bytes", value: formatFilesize(copyedBytes) }, + { name: "Estimated Time", value: !isNaN(avgSpeed) ? format(((totalBytes - copiedBytes) * 1000) / avgSpeed) : "--" }, + { name: "Copied Files", value: copiedFiles }, + { name: "Copied Bytes", value: formatFilesize(copiedBytes) }, { name: "Success Files", value: successFiles }, { name: "Success Bytes", value: formatFilesize(successBytes) }, { name: "Total Files", value: totalFiles }, diff --git a/sgtape/tools.go b/sgtape/tools.go index 3651d11..8ff6c83 100644 --- a/sgtape/tools.go +++ b/sgtape/tools.go @@ -22,10 +22,10 @@ func parseLogPage(buf []byte) (map[uint16][]byte, error) { } value := buf[i+LOG_PAGE_PARAM_OFFSET : end] - copyed := make([]byte, len(value)) - copy(copyed, value) + copied := make([]byte, len(value)) + copy(copied, value) - result[key] = copyed + result[key] = copied i += valueLen + LOG_PAGE_PARAM_OFFSET }