Implement Current Comparison Component

Resolves #31

Author: CryZe

capi/bind_gen/src/emscripten.rs

@@ -298,6 +298,11 @@ export interface DeltaComponentStateJson {
     color: Color;
 }
 
+export interface CurrentComparisonComponentStateJson {
+    text: string;
+    comparison: string;
+}
+
 export interface RunEditorStateJson {
     icon_change?: string,
     game: string,

capi/bind_gen/src/node.rs

@@ -312,6 +312,11 @@ export interface DeltaComponentStateJson {
     color: Color;
 }
 
+export interface CurrentComparisonComponentStateJson {
+    text: string;
+    comparison: string;
+}
+
 export interface RunEditorStateJson {
     icon_change?: string,
     game: string,

capi/src/current_comparison_component.rs

@@ -0,0 +1,29 @@
+use livesplit_core::component::current_comparison::Component as CurrentComparisonComponent;
+use livesplit_core::Timer;
+use super::{Json, alloc, own_drop, acc, output_vec, acc_mut};
+use current_comparison_component_state::OwnedCurrentComparisonComponentState;
+
+pub type OwnedCurrentComparisonComponent = *mut CurrentComparisonComponent;
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponent_new() -> OwnedCurrentComparisonComponent {
+    alloc(CurrentComparisonComponent::new())
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponent_drop(this: OwnedCurrentComparisonComponent) {
+    own_drop(this);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponent_state_as_json(this: *mut CurrentComparisonComponent, timer: *const Timer)-> Json{
+    output_vec(|o| { acc_mut(this).state(acc(timer)).write_json(o).unwrap(); })
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponent_state
+    (this: *mut CurrentComparisonComponent,
+     timer: *const Timer)
+     -> OwnedCurrentComparisonComponentState {
+    alloc(acc_mut(this).state(acc(timer)))
+}

capi/src/current_comparison_component_state.rs

@@ -0,0 +1,22 @@
+use livesplit_core::component::current_comparison::State as CurrentComparisonComponentState;
+use super::{own_drop, acc, output_str};
+use libc::c_char;
+
+pub type OwnedCurrentComparisonComponentState = *mut CurrentComparisonComponentState;
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponentState_drop(this: OwnedCurrentComparisonComponentState){
+    own_drop(this);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponentState_text(this: *const CurrentComparisonComponentState)
+-> *const c_char{
+    output_str(&acc(this).text)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn CurrentComparisonComponentState_comparison(this: *const CurrentComparisonComponentState)
+-> *const c_char{
+    output_str(&acc(this).comparison)
+}

capi/src/lib.rs

@@ -44,6 +44,8 @@ pub mod current_pace_component;
 pub mod current_pace_component_state;
 pub mod delta_component;
 pub mod delta_component_state;
+pub mod current_comparison_component;
+pub mod current_comparison_component_state;
 pub mod run_editor;
 pub mod shared_timer;
 pub mod timer_read_lock;

src/component/current_comparison.rs

@@ -0,0 +1,33 @@
+use Timer;
+use serde_json::{to_writer, Result};
+use std::io::Write;
+
+#[derive(Default)]
+pub struct Component;
+
+#[derive(Serialize, Deserialize)]
+pub struct State {
+    pub text: String,
+    pub comparison: String,
+}
+
+impl State {
+    pub fn write_json<W>(&self, mut writer: W) -> Result<()>
+        where W: Write
+    {
+        to_writer(&mut writer, self)
+    }
+}
+
+impl Component {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    pub fn state(&self, timer: &Timer) -> State {
+        State {
+            text: String::from("Comparing Against"),
+            comparison: timer.current_comparison().to_string(),
+        }
+    }
+}

src/component/mod.rs

@@ -1,3 +1,4 @@
+pub mod current_comparison;
 pub mod current_pace;
 pub mod delta;
 pub mod graph;