From f20294c1ff9046c0ad7d7f9173ab2b8762e99fa8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 十二月 2019 20:07:53 +0800
Subject: [PATCH] fix fileSetting
---
fileanalysis.pb.go | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/fileanalysis.pb.go b/fileanalysis.pb.go
index 67e81cb..eb04661 100644
--- a/fileanalysis.pb.go
+++ b/fileanalysis.pb.go
@@ -163,9 +163,9 @@
}
type FileAnalysisSetting struct {
- VideoFileEnable bool `protobuf:"varint,1,opt,name=videoFileEnable,proto3" json:"videoFileEnable,omitempty"`
- VideoDirectory string `protobuf:"bytes,2,opt,name=videoDirectory,proto3" json:"videoDirectory,omitempty"`
- ChannelCount int32 `protobuf:"varint,3,opt,name=channelCount,proto3" json:"channelCount,omitempty"`
+ VideoEnable bool `protobuf:"varint,1,opt,name=videoEnable,proto3" json:"videoEnable,omitempty"`
+ FileDirectory string `protobuf:"bytes,2,opt,name=fileDirectory,proto3" json:"fileDirectory,omitempty"`
+ ChannelCount int32 `protobuf:"varint,3,opt,name=channelCount,proto3" json:"channelCount,omitempty"`
}
func (m *FileAnalysisSetting) Reset() { *m = FileAnalysisSetting{} }
@@ -201,16 +201,16 @@
var xxx_messageInfo_FileAnalysisSetting proto.InternalMessageInfo
-func (m *FileAnalysisSetting) GetVideoFileEnable() bool {
+func (m *FileAnalysisSetting) GetVideoEnable() bool {
if m != nil {
- return m.VideoFileEnable
+ return m.VideoEnable
}
return false
}
-func (m *FileAnalysisSetting) GetVideoDirectory() string {
+func (m *FileAnalysisSetting) GetFileDirectory() string {
if m != nil {
- return m.VideoDirectory
+ return m.FileDirectory
}
return ""
}
@@ -230,30 +230,29 @@
func init() { proto.RegisterFile("fileanalysis.proto", fileDescriptor_4bee17140da7bca9) }
var fileDescriptor_4bee17140da7bca9 = []byte{
- // 356 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x4f, 0x6e, 0xe2, 0x30,
- 0x14, 0xc6, 0x71, 0x86, 0x30, 0xe1, 0x91, 0x61, 0x24, 0xcf, 0xa8, 0xb2, 0x2a, 0x35, 0xa2, 0x2c,
- 0xaa, 0xac, 0xba, 0xe9, 0x09, 0xfa, 0xf7, 0x00, 0x29, 0x5d, 0x23, 0x43, 0x5e, 0xc1, 0x92, 0xb1,
- 0x23, 0xdb, 0xa9, 0xc4, 0x19, 0xba, 0xe9, 0xb1, 0xba, 0x64, 0x55, 0x75, 0x59, 0xc1, 0x45, 0x2a,
- 0x3b, 0xd0, 0x52, 0x56, 0xf9, 0xbe, 0xdf, 0x2f, 0x51, 0x5e, 0xfc, 0x02, 0xf4, 0x51, 0x48, 0xe4,
- 0x8a, 0xcb, 0xa5, 0x15, 0xf6, 0xbc, 0x32, 0xda, 0x69, 0x9a, 0x84, 0xcb, 0xc2, 0xce, 0x86, 0x6f,
- 0x11, 0xa4, 0x77, 0x42, 0xe2, 0xe5, 0xf6, 0x06, 0xda, 0x87, 0x48, 0x94, 0x8c, 0x0c, 0x48, 0xde,
- 0x2d, 0x22, 0x51, 0x52, 0x0a, 0x6d, 0xc5, 0x17, 0xc8, 0xa2, 0x40, 0x42, 0xf6, 0xac, 0xe2, 0x6e,
- 0xce, 0x7e, 0x35, 0xcc, 0x67, 0xcf, 0xdc, 0xb2, 0x42, 0xd6, 0x1e, 0x90, 0x3c, 0x2e, 0x42, 0xf6,
- 0xcc, 0x6a, 0xe3, 0x58, 0xdc, 0x30, 0x9f, 0xe9, 0x7f, 0x88, 0xb9, 0x14, 0xdc, 0xb2, 0x4e, 0x78,
- 0xb8, 0x29, 0xf4, 0x14, 0x52, 0xab, 0x78, 0x65, 0xe7, 0xda, 0x8d, 0x6b, 0x23, 0xd9, 0xef, 0x20,
- 0x7b, 0x3b, 0xf6, 0x60, 0x24, 0x3d, 0x01, 0x10, 0x76, 0x6c, 0x6a, 0xa5, 0x84, 0x9a, 0xb1, 0x64,
- 0x40, 0xf2, 0xa4, 0xe8, 0x0a, 0x5b, 0x34, 0x80, 0x1e, 0x83, 0xff, 0xa8, 0x99, 0x41, 0x6b, 0x59,
- 0x37, 0xbc, 0xef, 0xab, 0x7b, 0x67, 0x6a, 0x89, 0x23, 0x3f, 0x1f, 0x34, 0x6e, 0xd7, 0xe9, 0x11,
- 0x74, 0xac, 0xe3, 0xae, 0xb6, 0xac, 0x17, 0xcc, 0xb6, 0xd1, 0x0c, 0x60, 0x6a, 0x90, 0x3b, 0x1c,
- 0x89, 0x05, 0xb2, 0x34, 0xcc, 0xb3, 0x47, 0xbc, 0xaf, 0xab, 0x72, 0xe7, 0xff, 0x34, 0xfe, 0x9b,
- 0x0c, 0x9f, 0x09, 0xfc, 0xdb, 0x3f, 0xd8, 0x7b, 0x74, 0xce, 0xcf, 0x99, 0xc3, 0xdf, 0x27, 0x51,
- 0xa2, 0xf6, 0xee, 0x56, 0xf1, 0x89, 0xc4, 0x70, 0xd8, 0x49, 0x71, 0x88, 0xe9, 0x19, 0xf4, 0x03,
- 0xba, 0x11, 0x06, 0xa7, 0x4e, 0x9b, 0xe5, 0x76, 0x07, 0x07, 0x94, 0x0e, 0x21, 0x9d, 0xce, 0xb9,
- 0x52, 0x28, 0xaf, 0x75, 0xad, 0x5c, 0xd8, 0x4a, 0x5c, 0xfc, 0x60, 0x57, 0xec, 0x75, 0x9d, 0x91,
- 0xd5, 0x3a, 0x23, 0x1f, 0xeb, 0x8c, 0xbc, 0x6c, 0xb2, 0xd6, 0x6a, 0x93, 0xb5, 0xde, 0x37, 0x59,
- 0x6b, 0xd2, 0x09, 0xbf, 0xc2, 0xc5, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x8d, 0x74, 0x6a,
- 0x27, 0x02, 0x00, 0x00,
+ // 352 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xcf, 0x4e, 0x32, 0x31,
+ 0x14, 0xc5, 0xe9, 0x7c, 0x0c, 0xdf, 0x70, 0x19, 0x5c, 0x54, 0x63, 0x1a, 0x13, 0x27, 0x23, 0x71,
+ 0xc1, 0xca, 0x8d, 0x4f, 0xe0, 0xdf, 0x07, 0x18, 0x71, 0x4d, 0x0a, 0x73, 0x85, 0x26, 0xa5, 0x9d,
+ 0xb4, 0x1d, 0x13, 0x96, 0xbe, 0x81, 0x8f, 0xe5, 0x92, 0x95, 0x71, 0x69, 0xe0, 0x45, 0x4c, 0x3b,
+ 0xa0, 0xb0, 0xea, 0x39, 0xbf, 0xd3, 0xa6, 0xb7, 0xf7, 0x16, 0xe8, 0x8b, 0x90, 0xc8, 0x15, 0x97,
+ 0x4b, 0x2b, 0xec, 0x55, 0x65, 0xb4, 0xd3, 0x34, 0x09, 0xcb, 0xc2, 0xce, 0x06, 0x9f, 0x11, 0xa4,
+ 0x8f, 0x42, 0xe2, 0xcd, 0x76, 0x03, 0x3d, 0x82, 0x48, 0x94, 0x8c, 0xe4, 0x64, 0xd8, 0x2d, 0x22,
+ 0x51, 0x52, 0x0a, 0x6d, 0xc5, 0x17, 0xc8, 0xa2, 0x40, 0x82, 0xf6, 0xac, 0xe2, 0x6e, 0xce, 0xfe,
+ 0x35, 0xcc, 0x6b, 0xcf, 0xdc, 0xb2, 0x42, 0xd6, 0xce, 0xc9, 0x30, 0x2e, 0x82, 0xf6, 0xcc, 0x6a,
+ 0xe3, 0x58, 0xdc, 0x30, 0xaf, 0xe9, 0x09, 0xc4, 0x5c, 0x0a, 0x6e, 0x59, 0x27, 0x1c, 0x6e, 0x0c,
+ 0xbd, 0x80, 0xd4, 0x2a, 0x5e, 0xd9, 0xb9, 0x76, 0xe3, 0xda, 0x48, 0xf6, 0x3f, 0x84, 0xbd, 0x1d,
+ 0x7b, 0x36, 0x92, 0x9e, 0x03, 0x08, 0x3b, 0x36, 0xb5, 0x52, 0x42, 0xcd, 0x58, 0x92, 0x93, 0x61,
+ 0x52, 0x74, 0x85, 0x2d, 0x1a, 0x40, 0xcf, 0xc0, 0x3f, 0x6a, 0x66, 0xd0, 0x5a, 0xd6, 0x0d, 0xf7,
+ 0xfd, 0x7a, 0x9f, 0x99, 0x5a, 0xe2, 0xc8, 0xd7, 0x07, 0x4d, 0xb6, 0xf3, 0xf4, 0x14, 0x3a, 0xd6,
+ 0x71, 0x57, 0x5b, 0xd6, 0x0b, 0xc9, 0xd6, 0xd1, 0x0c, 0x60, 0x6a, 0x90, 0x3b, 0x1c, 0x89, 0x05,
+ 0xb2, 0x34, 0xd4, 0xb3, 0x47, 0x7c, 0x5e, 0x57, 0xe5, 0x2e, 0xef, 0x37, 0xf9, 0x1f, 0x19, 0xbc,
+ 0x11, 0x38, 0xde, 0x6f, 0xec, 0x13, 0x3a, 0xe7, 0xeb, 0xcc, 0xa1, 0xf7, 0x2a, 0x4a, 0xd4, 0x0f,
+ 0x8a, 0x4f, 0x24, 0x86, 0x46, 0x27, 0xc5, 0x3e, 0xa2, 0x97, 0xd0, 0xf7, 0x23, 0xbb, 0x17, 0x06,
+ 0xa7, 0x4e, 0x9b, 0xe5, 0xb6, 0xf5, 0x87, 0x90, 0x0e, 0x20, 0x9d, 0xce, 0xb9, 0x52, 0x28, 0xef,
+ 0x74, 0xad, 0x5c, 0x98, 0x45, 0x5c, 0x1c, 0xb0, 0x5b, 0xf6, 0xb1, 0xce, 0xc8, 0x6a, 0x9d, 0x91,
+ 0xef, 0x75, 0x46, 0xde, 0x37, 0x59, 0x6b, 0xb5, 0xc9, 0x5a, 0x5f, 0x9b, 0xac, 0x35, 0xe9, 0x84,
+ 0x0f, 0x70, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x5d, 0x1e, 0xec, 0x1d, 0x02, 0x00, 0x00,
}
func (m *FileAnalysis) Marshal() (dAtA []byte, err error) {
@@ -366,21 +365,21 @@
_ = i
var l int
_ = l
- if m.VideoFileEnable {
+ if m.VideoEnable {
dAtA[i] = 0x8
i++
- if m.VideoFileEnable {
+ if m.VideoEnable {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
i++
}
- if len(m.VideoDirectory) > 0 {
+ if len(m.FileDirectory) > 0 {
dAtA[i] = 0x12
i++
- i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.VideoDirectory)))
- i += copy(dAtA[i:], m.VideoDirectory)
+ i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.FileDirectory)))
+ i += copy(dAtA[i:], m.FileDirectory)
}
if m.ChannelCount != 0 {
dAtA[i] = 0x18
@@ -460,10 +459,10 @@
}
var l int
_ = l
- if m.VideoFileEnable {
+ if m.VideoEnable {
n += 2
}
- l = len(m.VideoDirectory)
+ l = len(m.FileDirectory)
if l > 0 {
n += 1 + l + sovFileanalysis(uint64(l))
}
@@ -902,7 +901,7 @@
switch fieldNum {
case 1:
if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field VideoFileEnable", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field VideoEnable", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
@@ -919,10 +918,10 @@
break
}
}
- m.VideoFileEnable = bool(v != 0)
+ m.VideoEnable = bool(v != 0)
case 2:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field VideoDirectory", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field FileDirectory", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -950,7 +949,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.VideoDirectory = string(dAtA[iNdEx:postIndex])
+ m.FileDirectory = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {
--
Gitblit v1.8.0