diff --git a/.gitignore b/.gitignore index adf8f72..cff626a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ # Go workspace file go.work +.idea diff --git a/formatter.go b/formatter.go index 4e78ef3..7cf5592 100644 --- a/formatter.go +++ b/formatter.go @@ -5,63 +5,63 @@ import ( "strings" ) -type FSummery struct { - Name string - Category []string - Description string - Id string - Lang string - Created string - Copyright string - Tags []string -} - -type TSummery struct { - Files []FSummery - Tags map[string]int - Categories map[string]int -} - -type FileContent struct { - File zord_tree.File - Content string -} - -func FormatTreeSummery(tree zord_tree.Tree) TSummery { - ts := TSummery{Tags: map[string]int{}, Categories: map[string]int{}} +func FormatTreeSummery(tree zord_tree.Tree) Tree { + ts := Tree{} readTree(tree, &ts, true) return ts } -func readTree(tree zord_tree.Tree, ts *TSummery, isRoot bool) { +func readTree(tree zord_tree.Tree, ts *Tree, isRoot bool) { for _, subtree := range tree.Dirs { readTree(subtree, ts, false) category := strings.Replace(subtree.Path, tree.Path, "", 1) category = strings.Replace(category, "/", "", 1) if isRoot { - ts.Categories[category]++ + if ts.Categories == nil { + ts.Categories = make(map[string]int32) + } + if _, ok := ts.Categories[category]; ok { + ts.Categories[category]++ + } else { + ts.Categories[category] = 1 + } } } for _, file := range tree.Files { - ts.Files = append(ts.Files, FSummery{ - Name: file.Name, - Category: file.Category, - Description: file.Meta["description"], - Id: file.Id, - Lang: file.Meta["lang"], - Created: file.Meta["created"], - Copyright: file.Meta["copyright"], - Tags: file.Tags, - }) + newFile := TreeFile{} + populateTreeFileData(&newFile, file) + + ts.Files = append(ts.Files, &newFile) for _, tag := range file.Tags { - ts.Tags[tag]++ + if ts.Tags == nil { + ts.Tags = make(map[string]int32) + } + if _, ok := ts.Tags[tag]; ok { + ts.Tags[tag]++ + } else { + ts.Tags[tag] = 1 + } } } } +func populateTreeFileData(newFile *TreeFile, file zord_tree.File) { + newFile.Name = file.Name + newFile.Category = file.Category + newFile.Description = file.Meta["description"] + newFile.Id = file.Id + newFile.Lang = file.Meta["lang"] + newFile.Created = file.Meta["created"] + newFile.Copyright = file.Meta["copyright"] + newFile.Tags = file.Tags +} + func GetContent(file zord_tree.File) FileContent { content, _ := zord_tree.ReadFileContent(file) - return FileContent{File: file, Content: content} + newFile := TreeFile{} + populateTreeFileData(&newFile, file) + + return FileContent{File: &newFile, Content: content} } diff --git a/go.mod b/go.mod index 401d551..8711b28 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,19 @@ module g.arns.lt/zordsdavini/arns-lt-tree-push-service -go 1.18 +go 1.19 -require g.arns.lt/zordsdavini/zord-tree v0.2.1 +require ( + g.arns.lt/zordsdavini/zord-tree v0.2.1 + google.golang.org/grpc v1.48.0 + google.golang.org/protobuf v1.28.1 +) require ( g.arns.lt/zordsdavini/abcex v1.0.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/otiai10/copy v1.6.0 // indirect + golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect + golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect + golang.org/x/text v0.3.3 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect ) diff --git a/go.sum b/go.sum index 2d07b66..776ce74 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,54 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= g.arns.lt/zordsdavini/abcex v1.0.0 h1:qQqlZ4DMfethCGK4I6yGaLqMrTzKNIshqpINd1l3t0E= g.arns.lt/zordsdavini/abcex v1.0.0/go.mod h1:YRcJgts3XZwI+LEkngpfUab3DkUAW387Irpr43hIym8= -g.arns.lt/zordsdavini/zord-tree v0.1.5 h1:BVb4vll3ZfDPKvzo5yfL5RqU14UqVAzFZ9y2x6nukHs= -g.arns.lt/zordsdavini/zord-tree v0.1.5/go.mod h1:TfZmt224elDnfsLoHQHqFhleLOOsKDQMkyvzJYOA+zo= -g.arns.lt/zordsdavini/zord-tree v0.2.0 h1:FI0QO9qVjDW7GEwjmB4aHwxr0JHws0Ukl/+XWDG8cgE= -g.arns.lt/zordsdavini/zord-tree v0.2.0/go.mod h1:R9VMBwVwW6pu8yFIIgsMUv7YuWa48dj6DglkyXeTPik= g.arns.lt/zordsdavini/zord-tree v0.2.1 h1:GYbwojTqCTcr/e4oYNxTUCP7V/2cD8xn/AYOecYGnxo= g.arns.lt/zordsdavini/zord-tree v0.2.1/go.mod h1:R9VMBwVwW6pu8yFIIgsMUv7YuWa48dj6DglkyXeTPik= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= @@ -13,3 +56,84 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E= github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/server.go b/server.go index eb0b2d8..bcdb81d 100644 --- a/server.go +++ b/server.go @@ -1,81 +1,91 @@ package main import ( - "bufio" - "encoding/json" - "fmt" + "context" + "google.golang.org/grpc" + "log" "net" "os" - "strings" - zord_tree "g.arns.lt/zordsdavini/zord-tree" + zordTree "g.arns.lt/zordsdavini/zord-tree" ) -type Request struct { - Id string - Path []string - Filter []Filter +type server struct { + UnimplementedTreeManagerServer } -type Filter struct { - Key string - Value string +func (TreeManagerServer *server) GetSummery(_ context.Context, in *TreeRequest) (*Tree, error) { + tree, err := zordTree.BuildTree(dest, meta) + if err != nil { + log.Fatal(err) + return nil, err + } + + if *in.Path != "" { + ntree, err := tree.Slice(dest + *in.Path) + if err != nil { + log.Fatal(err) + return &Tree{}, err + } + + tree = ntree + } + + if len(in.Filter) != 0 { + ntree, found := tree.Filter(simplifyFilter(in.Filter)) + if !found { + return &Tree{}, err + } + + tree = ntree + } + + formattedTree := FormatTreeSummery(tree) + + return &formattedTree, nil +} + +func (TreeManagerServer *server) GetFile(_ context.Context, in *FileRequest) (*FileContent, error) { + tree, err := zordTree.BuildTree(dest, meta) + if err != nil { + log.Fatal(err) + return nil, err + } + + file, err := tree.FileById(in.Id) + if err != nil { + return nil, err + } + + fileContent := GetContent(file) + + return &fileContent, nil +} + +func simplifyFilter(filter []*TreeRequest_Filter) map[string]string { + simpleFilter := make(map[string]string) + for _, f := range filter { + simpleFilter[f.Key] = f.Value + } + + return simpleFilter } func Run() { if _, err := os.Stat(dest); os.IsNotExist(err) { - panic("Destination directory does not exist.") - } - - tree, err := zord_tree.BuildTree(dest, meta) - if err != nil { - panic(err) + log.Fatalf("Destination directory does not exist.") } ln, err := net.Listen("tcp", ":8301") if err != nil { - fmt.Println("Error starting server: " + err.Error()) + log.Fatalf("Failed to listen: " + err.Error()) } - for { - conn, err := ln.Accept() - if err != nil { - fmt.Println("Error listening to client: " + err.Error()) - continue - } - message, err := bufio.NewReader(conn).ReadString('\n') - if err != nil { - conn.Close() - } else { - go sendData(conn, message, tree) - } - } -} - -func sendData(conn net.Conn, message string, tree zord_tree.Tree) { - message = strings.ReplaceAll(message, "\n", "") - if message == "" { - response, err := json.Marshal(FormatTreeSummery(tree)) - writtenBytes, err := fmt.Fprintf(conn, string(response)+"\n") - if err != nil { - return - } - fmt.Printf("sent %d bytes\n", writtenBytes) - return - } - - var request Request - err := json.Unmarshal([]byte(message), &request) + var opts []grpc.ServerOption + grpcServer := grpc.NewServer(opts...) + RegisterTreeManagerServer(grpcServer, &server{}) + err = grpcServer.Serve(ln) if err != nil { - return + log.Fatalf("failed to serve: %v", err) } - - if request.Id != "" { - fmt.Println("servynam faila") - return - } - - // einam i tree path - fmt.Fprintf(conn, "qq\n") - return } diff --git a/tree.go b/tree.go deleted file mode 100644 index 65153d1..0000000 --- a/tree.go +++ /dev/null @@ -1,100 +0,0 @@ -package main - -import ( - "bufio" - "io/fs" - "io/ioutil" - "log" - "os" - "path" - "strings" -) - -type File struct { - name string - fullPath string - category []string - description string - id string - lang string - tags []string -} - -type Tree struct { - path string - dirs []Tree - files []File -} - -func BuildTree(dirPath string) Tree { - return readPath(dirPath, []string{}) -} - -func readPath(dirPath string, category []string) Tree { - tree := Tree{} - - tree.path = dirPath - - files, err := ioutil.ReadDir(dirPath) - if err != nil { - log.Fatal(err) - } - - for _, file := range files { - fullPath := path.Join(dirPath, file.Name()) - if file.IsDir() { - tree.dirs = append(tree.dirs, readPath(fullPath, append(category, file.Name()))) - continue - } - - _, err := ioutil.ReadFile(fullPath) - if err == nil { - tree.files = append(tree.files, readFile(file, fullPath, category)) - } - } - - return tree -} - -func readFile(file fs.FileInfo, fullPath string, category []string) File { - f := File{ - name: file.Name(), - fullPath: fullPath, - category: category, - } - - osf, err := os.Open(fullPath) - if err != nil { - log.Fatalf("failed to open %s", fullPath) - } - scanner := bufio.NewScanner(osf) - scanner.Split(bufio.ScanLines) - for scanner.Scan() { - line := scanner.Text() - if line == "---" { - break - } - - if strings.HasPrefix(line, "tags:") { - line = strings.TrimPrefix(line, "tags:") - t := strings.Split(line, ",") - tags := []string{} - for _, tag := range t { - tags = append(tags, strings.Trim(tag, " ")) - } - - f.tags = tags - } - if strings.HasPrefix(line, "description:") { - line = strings.TrimPrefix(line, "description:") - f.description = strings.Trim(line, " ") - } - if strings.HasPrefix(line, "lang:") { - line = strings.TrimPrefix(line, "lang:") - f.lang = strings.Trim(line, " ") - } - } - osf.Close() - - return f -} diff --git a/tree.pb.go b/tree.pb.go new file mode 100644 index 0000000..aa4bf5d --- /dev/null +++ b/tree.pb.go @@ -0,0 +1,599 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.21.4 +// source: tree.proto + +package main + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type FileRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` +} + +func (x *FileRequest) Reset() { + *x = FileRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_tree_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FileRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FileRequest) ProtoMessage() {} + +func (x *FileRequest) ProtoReflect() protoreflect.Message { + mi := &file_tree_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FileRequest.ProtoReflect.Descriptor instead. +func (*FileRequest) Descriptor() ([]byte, []int) { + return file_tree_proto_rawDescGZIP(), []int{0} +} + +func (x *FileRequest) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +type TreeRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Path *string `protobuf:"bytes,1,opt,name=path,proto3,oneof" json:"path,omitempty"` + Filter []*TreeRequest_Filter `protobuf:"bytes,2,rep,name=filter,proto3" json:"filter,omitempty"` +} + +func (x *TreeRequest) Reset() { + *x = TreeRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_tree_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TreeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TreeRequest) ProtoMessage() {} + +func (x *TreeRequest) ProtoReflect() protoreflect.Message { + mi := &file_tree_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TreeRequest.ProtoReflect.Descriptor instead. +func (*TreeRequest) Descriptor() ([]byte, []int) { + return file_tree_proto_rawDescGZIP(), []int{1} +} + +func (x *TreeRequest) GetPath() string { + if x != nil && x.Path != nil { + return *x.Path + } + return "" +} + +func (x *TreeRequest) GetFilter() []*TreeRequest_Filter { + if x != nil { + return x.Filter + } + return nil +} + +type TreeFile struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Category []string `protobuf:"bytes,2,rep,name=category,proto3" json:"category,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + Id string `protobuf:"bytes,4,opt,name=id,proto3" json:"id,omitempty"` + Lang string `protobuf:"bytes,5,opt,name=lang,proto3" json:"lang,omitempty"` + Copyright string `protobuf:"bytes,6,opt,name=copyright,proto3" json:"copyright,omitempty"` + Tags []string `protobuf:"bytes,7,rep,name=tags,proto3" json:"tags,omitempty"` + Created string `protobuf:"bytes,8,opt,name=created,proto3" json:"created,omitempty"` +} + +func (x *TreeFile) Reset() { + *x = TreeFile{} + if protoimpl.UnsafeEnabled { + mi := &file_tree_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TreeFile) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TreeFile) ProtoMessage() {} + +func (x *TreeFile) ProtoReflect() protoreflect.Message { + mi := &file_tree_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TreeFile.ProtoReflect.Descriptor instead. +func (*TreeFile) Descriptor() ([]byte, []int) { + return file_tree_proto_rawDescGZIP(), []int{2} +} + +func (x *TreeFile) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *TreeFile) GetCategory() []string { + if x != nil { + return x.Category + } + return nil +} + +func (x *TreeFile) GetDescription() string { + if x != nil { + return x.Description + } + return "" +} + +func (x *TreeFile) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *TreeFile) GetLang() string { + if x != nil { + return x.Lang + } + return "" +} + +func (x *TreeFile) GetCopyright() string { + if x != nil { + return x.Copyright + } + return "" +} + +func (x *TreeFile) GetTags() []string { + if x != nil { + return x.Tags + } + return nil +} + +func (x *TreeFile) GetCreated() string { + if x != nil { + return x.Created + } + return "" +} + +type Tree struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Files []*TreeFile `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"` + Tags map[string]int32 `protobuf:"bytes,2,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Categories map[string]int32 `protobuf:"bytes,3,rep,name=categories,proto3" json:"categories,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` +} + +func (x *Tree) Reset() { + *x = Tree{} + if protoimpl.UnsafeEnabled { + mi := &file_tree_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Tree) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Tree) ProtoMessage() {} + +func (x *Tree) ProtoReflect() protoreflect.Message { + mi := &file_tree_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Tree.ProtoReflect.Descriptor instead. +func (*Tree) Descriptor() ([]byte, []int) { + return file_tree_proto_rawDescGZIP(), []int{3} +} + +func (x *Tree) GetFiles() []*TreeFile { + if x != nil { + return x.Files + } + return nil +} + +func (x *Tree) GetTags() map[string]int32 { + if x != nil { + return x.Tags + } + return nil +} + +func (x *Tree) GetCategories() map[string]int32 { + if x != nil { + return x.Categories + } + return nil +} + +type FileContent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + File *TreeFile `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` + Content string `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` +} + +func (x *FileContent) Reset() { + *x = FileContent{} + if protoimpl.UnsafeEnabled { + mi := &file_tree_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FileContent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FileContent) ProtoMessage() {} + +func (x *FileContent) ProtoReflect() protoreflect.Message { + mi := &file_tree_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FileContent.ProtoReflect.Descriptor instead. +func (*FileContent) Descriptor() ([]byte, []int) { + return file_tree_proto_rawDescGZIP(), []int{4} +} + +func (x *FileContent) GetFile() *TreeFile { + if x != nil { + return x.File + } + return nil +} + +func (x *FileContent) GetContent() string { + if x != nil { + return x.Content + } + return "" +} + +type TreeRequest_Filter struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` +} + +func (x *TreeRequest_Filter) Reset() { + *x = TreeRequest_Filter{} + if protoimpl.UnsafeEnabled { + mi := &file_tree_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TreeRequest_Filter) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TreeRequest_Filter) ProtoMessage() {} + +func (x *TreeRequest_Filter) ProtoReflect() protoreflect.Message { + mi := &file_tree_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TreeRequest_Filter.ProtoReflect.Descriptor instead. +func (*TreeRequest_Filter) Descriptor() ([]byte, []int) { + return file_tree_proto_rawDescGZIP(), []int{1, 0} +} + +func (x *TreeRequest_Filter) GetKey() string { + if x != nil { + return x.Key + } + return "" +} + +func (x *TreeRequest_Filter) GetValue() string { + if x != nil { + return x.Value + } + return "" +} + +var File_tree_proto protoreflect.FileDescriptor + +var file_tree_proto_rawDesc = []byte{ + 0x0a, 0x0a, 0x74, 0x72, 0x65, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x6d, 0x61, + 0x69, 0x6e, 0x22, 0x1d, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x22, 0x93, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x06, 0x66, 0x69, + 0x6c, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x61, 0x69, + 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x69, + 0x6c, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x1a, 0x30, 0x0a, 0x06, + 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, + 0x0a, 0x05, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x22, 0xcc, 0x01, 0x0a, 0x08, 0x54, 0x72, 0x65, 0x65, + 0x46, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, + 0x67, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, + 0x67, 0x6f, 0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, + 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, + 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, + 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x22, 0x8a, 0x02, 0x0a, 0x04, 0x54, 0x72, 0x65, 0x65, 0x12, + 0x24, 0x0a, 0x05, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, + 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x05, + 0x66, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x2e, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, + 0x3a, 0x0a, 0x0a, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x2e, + 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0a, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x54, + 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3d, 0x0a, 0x0f, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, + 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x4b, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0e, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x46, 0x69, 0x6c, 0x65, + 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x32, 0x6f, 0x0a, 0x0b, 0x54, 0x72, 0x65, 0x65, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, + 0x2d, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x75, 0x6d, 0x6d, 0x65, 0x72, 0x79, 0x12, 0x11, 0x2e, + 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x0a, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x22, 0x00, 0x12, 0x31, + 0x0a, 0x07, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, + 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, + 0x61, 0x69, 0x6e, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, + 0x00, 0x42, 0x03, 0x5a, 0x01, 0x2e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_tree_proto_rawDescOnce sync.Once + file_tree_proto_rawDescData = file_tree_proto_rawDesc +) + +func file_tree_proto_rawDescGZIP() []byte { + file_tree_proto_rawDescOnce.Do(func() { + file_tree_proto_rawDescData = protoimpl.X.CompressGZIP(file_tree_proto_rawDescData) + }) + return file_tree_proto_rawDescData +} + +var file_tree_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_tree_proto_goTypes = []interface{}{ + (*FileRequest)(nil), // 0: main.FileRequest + (*TreeRequest)(nil), // 1: main.TreeRequest + (*TreeFile)(nil), // 2: main.TreeFile + (*Tree)(nil), // 3: main.Tree + (*FileContent)(nil), // 4: main.FileContent + (*TreeRequest_Filter)(nil), // 5: main.TreeRequest.Filter + nil, // 6: main.Tree.TagsEntry + nil, // 7: main.Tree.CategoriesEntry +} +var file_tree_proto_depIdxs = []int32{ + 5, // 0: main.TreeRequest.filter:type_name -> main.TreeRequest.Filter + 2, // 1: main.Tree.files:type_name -> main.TreeFile + 6, // 2: main.Tree.tags:type_name -> main.Tree.TagsEntry + 7, // 3: main.Tree.categories:type_name -> main.Tree.CategoriesEntry + 2, // 4: main.FileContent.file:type_name -> main.TreeFile + 1, // 5: main.TreeManager.GetSummery:input_type -> main.TreeRequest + 0, // 6: main.TreeManager.GetFile:input_type -> main.FileRequest + 3, // 7: main.TreeManager.GetSummery:output_type -> main.Tree + 4, // 8: main.TreeManager.GetFile:output_type -> main.FileContent + 7, // [7:9] is the sub-list for method output_type + 5, // [5:7] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name +} + +func init() { file_tree_proto_init() } +func file_tree_proto_init() { + if File_tree_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_tree_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FileRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_tree_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TreeRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_tree_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TreeFile); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_tree_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Tree); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_tree_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FileContent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_tree_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TreeRequest_Filter); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_tree_proto_msgTypes[1].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_tree_proto_rawDesc, + NumEnums: 0, + NumMessages: 8, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_tree_proto_goTypes, + DependencyIndexes: file_tree_proto_depIdxs, + MessageInfos: file_tree_proto_msgTypes, + }.Build() + File_tree_proto = out.File + file_tree_proto_rawDesc = nil + file_tree_proto_goTypes = nil + file_tree_proto_depIdxs = nil +} diff --git a/tree.proto b/tree.proto new file mode 100644 index 0000000..8c33958 --- /dev/null +++ b/tree.proto @@ -0,0 +1,49 @@ +syntax = "proto3"; + +// TODO: couldn't solve out how to set "main" package. Needs to fix by hand after export +// export: +// protoc --proto_path=./ --go_out=./ --go-grpc_out=./ --go_opt=paths=source_relative tree.proto +option go_package = "."; + +package main; + +service TreeManager { + rpc GetSummery(TreeRequest) returns (Tree) {} + rpc GetFile(FileRequest) returns (FileContent) {} +} + +message FileRequest { + string id = 1; +} + +message TreeRequest { + message Filter { + string key = 1; + string value = 2; + } + + optional string path = 1; + repeated Filter filter = 2; +} + +message TreeFile { + string name = 1; + repeated string category = 2; + string description = 3; + string id = 4; + string lang = 5; + string copyright = 6; + repeated string tags = 7; + string created = 8; +} + +message Tree { + repeated TreeFile files = 1; + map tags = 2; + map categories = 3; +} + +message FileContent { + TreeFile file = 1; + string content = 2; +} diff --git a/tree_grpc.pb.go b/tree_grpc.pb.go new file mode 100644 index 0000000..0890eea --- /dev/null +++ b/tree_grpc.pb.go @@ -0,0 +1,141 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.4 +// source: tree.proto + +package main + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 + +// TreeManagerClient is the client API for TreeManager service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type TreeManagerClient interface { + GetSummery(ctx context.Context, in *TreeRequest, opts ...grpc.CallOption) (*Tree, error) + GetFile(ctx context.Context, in *FileRequest, opts ...grpc.CallOption) (*FileContent, error) +} + +type treeManagerClient struct { + cc grpc.ClientConnInterface +} + +func NewTreeManagerClient(cc grpc.ClientConnInterface) TreeManagerClient { + return &treeManagerClient{cc} +} + +func (c *treeManagerClient) GetSummery(ctx context.Context, in *TreeRequest, opts ...grpc.CallOption) (*Tree, error) { + out := new(Tree) + err := c.cc.Invoke(ctx, "/main.TreeManager/GetSummery", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *treeManagerClient) GetFile(ctx context.Context, in *FileRequest, opts ...grpc.CallOption) (*FileContent, error) { + out := new(FileContent) + err := c.cc.Invoke(ctx, "/main.TreeManager/GetFile", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// TreeManagerServer is the server API for TreeManager service. +// All implementations must embed UnimplementedTreeManagerServer +// for forward compatibility +type TreeManagerServer interface { + GetSummery(context.Context, *TreeRequest) (*Tree, error) + GetFile(context.Context, *FileRequest) (*FileContent, error) + mustEmbedUnimplementedTreeManagerServer() +} + +// UnimplementedTreeManagerServer must be embedded to have forward compatible implementations. +type UnimplementedTreeManagerServer struct { +} + +func (UnimplementedTreeManagerServer) GetSummery(context.Context, *TreeRequest) (*Tree, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetSummery not implemented") +} +func (UnimplementedTreeManagerServer) GetFile(context.Context, *FileRequest) (*FileContent, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetFile not implemented") +} +func (UnimplementedTreeManagerServer) mustEmbedUnimplementedTreeManagerServer() {} + +// UnsafeTreeManagerServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to TreeManagerServer will +// result in compilation errors. +type UnsafeTreeManagerServer interface { + mustEmbedUnimplementedTreeManagerServer() +} + +func RegisterTreeManagerServer(s grpc.ServiceRegistrar, srv TreeManagerServer) { + s.RegisterService(&TreeManager_ServiceDesc, srv) +} + +func _TreeManager_GetSummery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TreeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TreeManagerServer).GetSummery(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/main.TreeManager/GetSummery", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TreeManagerServer).GetSummery(ctx, req.(*TreeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _TreeManager_GetFile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FileRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(TreeManagerServer).GetFile(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/main.TreeManager/GetFile", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(TreeManagerServer).GetFile(ctx, req.(*FileRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// TreeManager_ServiceDesc is the grpc.ServiceDesc for TreeManager service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var TreeManager_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "main.TreeManager", + HandlerType: (*TreeManagerServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetSummery", + Handler: _TreeManager_GetSummery_Handler, + }, + { + MethodName: "GetFile", + Handler: _TreeManager_GetFile_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "tree.proto", +}