Compare commits
20 Commits
4d9280bea2
...
serde-rena
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ed31deb14 | |||
| ea4d48625d | |||
| 41f9382b83 | |||
| 5a26c80b2b | |||
| dbec402e18 | |||
| 423ef695ef | |||
| 77270886fa | |||
| ead9b4f688 | |||
| 5dfbc67886 | |||
| 067aed97f4 | |||
| 871d9c3cd5 | |||
| 20516bab8d | |||
| ed18723ac9 | |||
| f7f9376b4e | |||
| 65a9abe6d3 | |||
| db2e2e990f | |||
| 91df514bd6 | |||
| 3412dc34c1 | |||
| 39955e5171 | |||
| 6b59e649ff |
40
.drone.yml
40
.drone.yml
@@ -36,6 +36,46 @@ trigger:
|
|||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/master
|
||||||
|
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: generate-rust-grpc
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: clone-external
|
||||||
|
image: alpine/git
|
||||||
|
commands:
|
||||||
|
- git clone https://${GIT_USER}:${GIT_PASS}@git.itzana.me/StrafesNET/rust-grpc.git
|
||||||
|
environment:
|
||||||
|
GIT_USER:
|
||||||
|
from_secret: GIT_USER
|
||||||
|
GIT_PASS:
|
||||||
|
from_secret: GIT_PASS
|
||||||
|
|
||||||
|
- name: generate
|
||||||
|
image: registry.itzana.me/strafesnet/tools/grpc-rust:latest
|
||||||
|
commands:
|
||||||
|
- scripts/rust-gen.sh
|
||||||
|
|
||||||
|
- name: commit
|
||||||
|
image: alpine/git
|
||||||
|
commands:
|
||||||
|
- cd rust-grpc
|
||||||
|
- git add *
|
||||||
|
- 'git commit -m "Autogenerated update for ${DRONE_COMMIT_LINK}" || true'
|
||||||
|
- git push https://$GIT_USER:$GIT_PASS@git.itzana.me/StrafesNET/rust-grpc.git --all
|
||||||
|
environment:
|
||||||
|
GIT_USER:
|
||||||
|
from_secret: GIT_USER
|
||||||
|
GIT_PASS:
|
||||||
|
from_secret: GIT_PASS
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
ref:
|
||||||
|
- refs/heads/master
|
||||||
|
|
||||||
image_pull_secrets:
|
image_pull_secrets:
|
||||||
- dockerconfigjson
|
- dockerconfigjson
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ message GetRequest {
|
|||||||
int32 StyleID = 2;
|
int32 StyleID = 2;
|
||||||
int32 GameID = 3;
|
int32 GameID = 3;
|
||||||
int32 ModeID = 4;
|
int32 ModeID = 4;
|
||||||
|
repeated int32 StateID = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
message ListRequest {
|
message ListRequest {
|
||||||
@@ -28,7 +29,8 @@ message ListRequest {
|
|||||||
int32 GameID = 2;
|
int32 GameID = 2;
|
||||||
int32 ModeID = 3;
|
int32 ModeID = 3;
|
||||||
int64 Sort = 4;
|
int64 Sort = 4;
|
||||||
Pagination Page = 5;
|
repeated int32 StateID = 5;
|
||||||
|
Pagination Page = 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
message RankList {
|
message RankList {
|
||||||
|
|||||||
24
scripts/rust-gen.sh
Executable file
24
scripts/rust-gen.sh
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
for f in *.proto
|
||||||
|
do
|
||||||
|
name=$(basename $f .proto)
|
||||||
|
mkdir -p ./rust-grpc/$name
|
||||||
|
protoc \
|
||||||
|
--prost_out=./rust-grpc/$name \
|
||||||
|
--tonic_out=./rust-grpc/$name \
|
||||||
|
$f
|
||||||
|
#I couldn't figure out how to configure protoc to do this
|
||||||
|
sed -i "s/#\[derive(Clone, PartialEq, ::prost::Message)\]/#\[derive(Clone, PartialEq, ::prost::Message, serde::Serialize, serde::Deserialize)\]\n#\[serde(rename_all = \"PascalCase\")\]/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub id:/ #\[serde(rename = \"ID\")\]\n pub id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub map_id:/ #\[serde(rename = \"MapID\")\]\n pub map_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub time_id:/ #\[serde(rename = \"TimeID\")\]\n pub time_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub file_id:/ #\[serde(rename = \"FileID\")\]\n pub file_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub game_id:/ #\[serde(rename = \"GameID\")\]\n pub game_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub user_id:/ #\[serde(rename = \"UserID\")\]\n pub user_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub mode_id:/ #\[serde(rename = \"ModeID\")\]\n pub mode_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub style_id:/ #\[serde(rename = \"StyleID\")\]\n pub style_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub state_id:/ #\[serde(rename = \"StateID\")\]\n pub state_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub place_id:/ #\[serde(rename = \"PlaceID\")\]\n pub place_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
sed -i "s/ pub vip_server_id:/ #\[serde(rename = \"VipServerID\")\]\n pub vip_server_id:/g" "./rust-grpc/$name/$name.rs"
|
||||||
|
done
|
||||||
@@ -68,6 +68,13 @@ message ListRequest {
|
|||||||
TimeFilter Filter = 1;
|
TimeFilter Filter = 1;
|
||||||
bool Blacklisted = 2;
|
bool Blacklisted = 2;
|
||||||
Pagination Page = 3;
|
Pagination Page = 3;
|
||||||
|
/*
|
||||||
|
0 - time ASC
|
||||||
|
1 - time DSC
|
||||||
|
2 - date ASC
|
||||||
|
3 - date DSC
|
||||||
|
*/
|
||||||
|
uint32 Sort = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
message Pagination {
|
message Pagination {
|
||||||
|
|||||||
@@ -17,10 +17,11 @@ service TransactionsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
message TransactionCreate {
|
message TransactionCreate {
|
||||||
int64 UserID = 1;
|
string ID = 1;
|
||||||
int64 Value = 2;
|
int64 UserID = 2;
|
||||||
int32 StateID = 3;
|
int64 Value = 3;
|
||||||
google.protobuf.Struct Data = 4;
|
int32 StateID = 4;
|
||||||
|
google.protobuf.Struct Data = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
message TransactionUpdate {
|
message TransactionUpdate {
|
||||||
|
|||||||
Reference in New Issue
Block a user