Skip to content

remove prototype trait #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IGN-Styly merged 6 commits into from
Nov 30, 2025
Merged

remove prototype trait #39

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f337a1c
remove prototype trait
IGN-Styly Aug 14, 2025
db94ac6
fix authentication issues
IGN-Styly Aug 14, 2025
519ebbd
fix conflict
IGN-Styly Nov 30, 2025
bf372a7
Merge pull request #38 from GrandEngineering/dev2
IGN-Styly Nov 30, 2025
4d6f50a
fix conflict
IGN-Styly Nov 30, 2025
3c88a49
Merge pull request #40 from GrandEngineering/dev3
IGN-Styly Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions engine/proto/engine.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ service Engine {
rpc CreateTask(Task) returns (Task);
rpc DeleteTask(TaskSelector) returns (empty);
rpc GetTasks(TaskPageRequest) returns (TaskPage);
rpc CheckAuth(empty) returns (empty);
}
message TaskSelector {
TaskState state = 1;
Expand Down
194 changes: 146 additions & 48 deletions engine/src/bin/packer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,69 +110,167 @@ async fn main() {
buf.push(unw);
}
let ns = buf.join("\n");
let mut file = File::create("schema.rustforge.toml").unwrap();
file.write_all(ns.as_bytes()).unwrap();
match File::create("schema.rustforge.toml") {
Ok(mut file) => {
if let Err(e) = file.write_all(ns.as_bytes()) {
error!("Failed to write schema file: {}", e);
} else {
info!("Wrote schema.rustforge.toml");
}
}
Err(e) => {
error!("Failed to create schema file: {}", e);
}
}
}
Commands::Unpack(input) => {
if input.input.exists() {
let mut final_out: Vec<String> = Vec::new();
info!("Unpacking File: {}", input.input.to_string_lossy());
let mut buf = Vec::new();
File::open(input.input)
.unwrap()
.read_to_end(&mut buf)
.unwrap();
let k: TaskQueue = bincode::deserialize(&buf).unwrap();
for tasks in k.tasks {
let tt = api.task_registry.tasks.get(&tasks.0.clone()).unwrap();
for task in tasks.1 {
if tt.verify(task.bytes.clone()) {
let tmp_nt = tt.from_bytes(&task.bytes);
final_out.push(format![
r#"[["{}:{}"]]"#,
tasks.0.0.clone(),
tasks.0.1.clone()
]);
final_out.push(tmp_nt.to_toml());
info!("{:?}", tmp_nt);
};
match File::open(&input.input) {
Ok(mut f) => {
if let Err(e) = f.read_to_end(&mut buf) {
error!(
"Failed to read input file {}: {}",
input.input.display(),
e
);
} else {
match bincode::deserialize::<TaskQueue>(&buf) {
Ok(k) => {
for tasks in k.tasks {
match api.task_registry.tasks.get(&tasks.0.clone()) {
Some(tt) => {
for task in tasks.1 {
if tt.verify(task.bytes.clone()) {
let tmp_nt = tt.from_bytes(&task.bytes);
final_out.push(format![
r#"[["{}:{}"]]"#,
tasks.0.0.clone(),
tasks.0.1.clone()
]);
final_out.push(tmp_nt.to_toml());
info!("{:?}", tmp_nt);
}
}
}
None => {
error!(
"Unknown template for {}:{}",
tasks.0.0, tasks.0.1
);
}
}
}
}
Err(e) => {
error!("Failed to deserialize task queue: {}", e);
}
}
}
}
Err(e) => {
error!("Failed to open input file {}: {}", input.input.display(), e);
}
}
let ns = final_out.join("\n");
let mut file = File::create("output.rustforge.toml").unwrap();
file.write_all(ns.as_bytes()).unwrap();
match File::create("output.rustforge.toml") {
Ok(mut file) => {
if let Err(e) = file.write_all(ns.as_bytes()) {
error!("Failed to write output.rustforge.toml: {}", e);
} else {
info!("Wrote output.rustforge.toml");
}
}
Err(e) => {
error!("Failed to create output.rustforge.toml: {}", e);
}
}
}
}
Commands::Pack(input) => {
if input.input.exists() {
info!("Packing File: {}", input.input.to_string_lossy());
let toml_str = std::fs::read_to_string(input.input).unwrap();
let raw: RawDoc = toml::from_str(&toml_str).unwrap();
let entries = parse_entries(raw);
for entry in entries {
let template = api
.task_registry
.get(&ID(entry.namespace.as_str(), entry.id.as_str()))
.unwrap();
let toml_string = toml::to_string(&entry.data).unwrap();
let t = template.from_toml(toml_string);
let mut tmp = api
.task_queue
.tasks
.get(&ID(entry.namespace.as_str(), entry.id.as_str()))
.unwrap()
.clone();
tmp.push(StoredTask {
id: "".into(), //ids are minted on the server
bytes: t.to_bytes(),
});
api.task_queue
.tasks
.insert(ID(entry.namespace.as_str(), entry.id.as_str()), tmp);
match std::fs::read_to_string(&input.input) {
Ok(toml_str) => {
match toml::from_str::<RawDoc>(&toml_str) {
Ok(raw) => {
let entries = parse_entries(raw);
for entry in entries {
match api
.task_registry
.get(&ID(entry.namespace.as_str(), entry.id.as_str()))
{
Some(template) => {
match toml::to_string(&entry.data) {
Ok(toml_string) => {
let t = template.from_toml(toml_string);
let key = ID(
entry.namespace.as_str(),
entry.id.as_str(),
);
let mut vec = api
.task_queue
.tasks
.get(&key)
.cloned()
.unwrap_or_default();
vec.push(StoredTask {
id: "".into(), //ids are minted on the server
bytes: t.to_bytes(),
});
api.task_queue.tasks.insert(key, vec);
}
Err(e) => {
error!(
"Failed to convert entry data to TOML string: {}",
e
);
}
}
}
None => {
error!(
"Template not found for {}:{}",
entry.namespace, entry.id
);
}
}
}
match bincode::serialize(&api.task_queue) {
Ok(data) => match File::create("output.rustforge.bin") {
Ok(mut file) => {
if let Err(e) = file.write_all(&data) {
error!(
"Failed to write output.rustforge.bin: {}",
e
);
} else {
info!("Wrote output.rustforge.bin");
}
}
Err(e) => {
error!(
"Failed to create output.rustforge.bin: {}",
e
);
}
},
Err(e) => {
error!("Failed to serialize task queue: {}", e);
}
}
}
Err(e) => {
error!("Failed to parse input TOML: {}", e);
}
}
}
Err(e) => {
error!("Failed to read input file {}: {}", input.input.display(), e);
}
}
let data = bincode::serialize(&api.task_queue).unwrap();
let mut file = File::create("output.rustforge.bin").unwrap();
file.write_all(&data).unwrap();
} else {
error!("File does not exist: {}", input.input.to_string_lossy())
}
Expand Down
Loading
Loading