Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions Cargo.lock

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

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ edition = "2021"
[dependencies]
structopt = "^0.3"
dirs = "^5.0"
crossterm = "^0.26"
rust-embed = "^6.4"
toml = "^0.7"
serde_json = "1.0"

[dependencies.crossterm]
version = "^0.26"
features = ["serde"]

[dependencies.ratatui]
version = "^0.21"
Expand Down
4 changes: 4 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ use crossterm::{
use rand::{seq::SliceRandom, thread_rng};
use ratatui::{backend::CrosstermBackend, terminal::Terminal};
use rust_embed::RustEmbed;
use serde::Serialize;
use serde_json;
use std::{
ffi::OsString,
fs,
Expand Down Expand Up @@ -261,6 +263,8 @@ fn main() -> crossterm::Result<()> {
if let Event::Key(key) = event {
test.handle_key(key);
if test.complete {
let data = serde_json::to_string(&test.words).unwrap();
fs::write("export.json", data).expect("Unable to write file");
state = State::Results(Results::from(&*test));
}
}
Expand Down
16 changes: 15 additions & 1 deletion src/test/mod.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
pub mod results;

use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
use serde::{Serialize, Serializer};
use std::fmt;
use std::time::Instant;

pub fn serialize_instant<S>(instant: &Instant, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
let duration = instant.elapsed();
duration.serialize(serializer)
}

#[derive(Clone, Serialize)]
pub struct TestEvent {
#[serde(
serialize_with = "serialize_instant",
deserialize_with = "deserialize_instant"
)]
pub time: Instant,
pub key: KeyEvent,
pub correct: Option<bool>,
Expand All @@ -19,7 +33,7 @@ impl fmt::Debug for TestEvent {
}
}

#[derive(Debug)]
#[derive(Clone, Debug, Serialize)]
pub struct TestWord {
pub text: String,
pub progress: String,
Expand Down