start working on website code

Author: mattbruv

Cargo.toml

@@ -8,6 +8,6 @@ objdiff-core = { git = "https://github.com/encounter/objdiff", tag = "v3.3.1", s
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 argp = "0.4"
-ts-rs = "10.1"
+ts-rs = "11.1"
 tabled = "0.20.0"
 

src/args.rs

@@ -9,10 +9,6 @@ pub struct OKArgs {
     #[argp(option)]
     pub changes: String,
 
-    /// Path to the current Objdiff report file
-    // #[argp(option)]
-    // pub report: String,
-
     #[argp(subcommand)]
     pub action: Option<OKAction>,
 }
@@ -21,6 +17,7 @@ pub struct OKArgs {
 #[argp(subcommand)]
 pub enum OKAction {
     PullRequest(PullRequest),
+    BuildWebsite(BuildWebsite),
     PostToDiscord(PostToDiscord),
 }
 
@@ -42,7 +39,15 @@ pub struct PostToDiscord {
     pub add_commentary: bool,
 }
 
-// 1. compare two reports and create a struct containing differences
-//      a) save differences to a file?
-//      b) post differences to discord?
-// 2. load and save progress report to a sensible json format, we only care about game
+/// Build the files needed for the progress website
+#[derive(FromArgs, Debug)]
+#[argp(subcommand, name = "website")]
+pub struct BuildWebsite {
+    /// Path to the latest Objdiff report file
+    #[argp(option)]
+    pub report: String,
+
+    /// Path to the cached assembly metadata
+    #[argp(option)]
+    pub asm_json: String,
+}

src/main.rs

@@ -1,6 +1,7 @@
 mod args;
 mod commit;
 mod pr;
+mod website;
 
 use std::{
     fs::File,
@@ -11,7 +12,7 @@ use args::{OKAction, OKArgs};
 use commit::Commit;
 use objdiff_core::bindings::report::{Changes, Report};
 
-use crate::pr::generate_pr_report;
+use crate::{pr::generate_pr_report, website::AsmInfo};
 
 fn main() {
     let args: OKArgs = argp::parse_args_or_exit(argp::DEFAULT);
@@ -33,6 +34,12 @@ fn main() {
                 // let commit = load_commit(&post_to_discord.commit);
                 // println!("commit: {:?}", commit);
             }
+            OKAction::BuildWebsite(args) => {
+                let report = load_report_json(&args.report);
+                let asm_info = load_asm_json(&args.asm_json);
+                let first = asm_info.iter().nth(0).unwrap();
+                println!("{:?}", first);
+            }
         }
     }
 }
@@ -47,6 +54,11 @@ fn load_report_json(path: &str) -> Report {
     serde_json::from_str(&json).unwrap()
 }
 
+fn load_asm_json(path: &str) -> Vec<AsmInfo> {
+    let json = std::fs::read_to_string(path).expect("Unable to read ASM json");
+    serde_json::from_str(&json).unwrap()
+}
+
 fn load_commit(path: &str) -> Commit {
     let file = File::open(path).expect("Can't find progress commit file");
     let reader = BufReader::new(file);

src/website.rs

@@ -0,0 +1,15 @@
+// We need to do some extra processing on the progress report
+// before we build the website.
+// We mostly use the objdiff report types, but with some added fields.
+
+use objdiff_core::bindings::report::Report;
+use serde::{Deserialize, Serialize};
+// use ts_rs::TS;
+
+#[derive(Debug, Deserialize)]
+// #[ts(export)]
+pub struct AsmInfo {
+    name: String,
+    opcodes: Vec<String>,
+    labels: Option<u32>,
+}