From a69556c33b3d16d0526019b5091b7abc748130d5 Mon Sep 17 00:00:00 2001 From: Cutieguwu Date: Thu, 27 Mar 2025 13:04:02 -0400 Subject: [PATCH] MASSIVE REFACTOR --- .gitignore => gamelog/.gitignore | 0 gamelog/Cargo.lock | 104 ++++++++++++++++++++++++ {src/gamelog => gamelog}/Cargo.toml | 0 {src => gamelog/src}/error.rs | 2 +- {src/gamelog => gamelog}/src/file.rs | 0 {src/gamelog => gamelog}/src/lib.rs | 1 + {src/gamelog => gamelog}/src/period.rs | 0 {src/gamelog => gamelog}/src/play.rs | 0 {src/gamelog => gamelog}/src/terrain.rs | 0 miller/.gitignore | 1 + Cargo.lock => miller/Cargo.lock | 67 +++++++++++++++ Cargo.toml => miller/Cargo.toml | 0 {src => miller/src}/calculator.rs | 0 {src => miller/src}/main.rs | 1 - 14 files changed, 174 insertions(+), 2 deletions(-) rename .gitignore => gamelog/.gitignore (100%) create mode 100644 gamelog/Cargo.lock rename {src/gamelog => gamelog}/Cargo.toml (100%) rename {src => gamelog/src}/error.rs (94%) rename {src/gamelog => gamelog}/src/file.rs (100%) rename {src/gamelog => gamelog}/src/lib.rs (95%) rename {src/gamelog => gamelog}/src/period.rs (100%) rename {src/gamelog => gamelog}/src/play.rs (100%) rename {src/gamelog => gamelog}/src/terrain.rs (100%) create mode 100644 miller/.gitignore rename Cargo.lock => miller/Cargo.lock (63%) rename Cargo.toml => miller/Cargo.toml (100%) rename {src => miller/src}/calculator.rs (100%) rename {src => miller/src}/main.rs (98%) diff --git a/.gitignore b/gamelog/.gitignore similarity index 100% rename from .gitignore rename to gamelog/.gitignore diff --git a/gamelog/Cargo.lock b/gamelog/Cargo.lock new file mode 100644 index 0000000..a94f63e --- /dev/null +++ b/gamelog/Cargo.lock @@ -0,0 +1,104 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +dependencies = [ + "serde", +] + +[[package]] +name = "gamelog" +version = "0.3.0" +dependencies = [ + "ron", + "semver", + "serde", +] + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ron" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63f3aa105dea217ef30d89581b65a4d527a19afc95ef5750be3890e8d3c5b837" +dependencies = [ + "base64", + "bitflags", + "serde", + "serde_derive", + "unicode-ident", +] + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" diff --git a/src/gamelog/Cargo.toml b/gamelog/Cargo.toml similarity index 100% rename from src/gamelog/Cargo.toml rename to gamelog/Cargo.toml diff --git a/src/error.rs b/gamelog/src/error.rs similarity index 94% rename from src/error.rs rename to gamelog/src/error.rs index d7f47f0..7816ff0 100644 --- a/src/error.rs +++ b/gamelog/src/error.rs @@ -14,7 +14,7 @@ impl fmt::Display for LogFileError { Self::CompatibilityCheck(ver) => write!( f, "GameLogs cannot be older than {}, but {} was found in logfile.", - crate::gamelog::MIN_VER.to_string(), + crate::MIN_VER.to_string(), ver.to_string() ), Self::RonSpannedError(err) => write!(f, "{}", err), diff --git a/src/gamelog/src/file.rs b/gamelog/src/file.rs similarity index 100% rename from src/gamelog/src/file.rs rename to gamelog/src/file.rs diff --git a/src/gamelog/src/lib.rs b/gamelog/src/lib.rs similarity index 95% rename from src/gamelog/src/lib.rs rename to gamelog/src/lib.rs index ca35ba7..fc2a82e 100644 --- a/src/gamelog/src/lib.rs +++ b/gamelog/src/lib.rs @@ -1,3 +1,4 @@ +mod error; mod file; mod period; mod play; diff --git a/src/gamelog/src/period.rs b/gamelog/src/period.rs similarity index 100% rename from src/gamelog/src/period.rs rename to gamelog/src/period.rs diff --git a/src/gamelog/src/play.rs b/gamelog/src/play.rs similarity index 100% rename from src/gamelog/src/play.rs rename to gamelog/src/play.rs diff --git a/src/gamelog/src/terrain.rs b/gamelog/src/terrain.rs similarity index 100% rename from src/gamelog/src/terrain.rs rename to gamelog/src/terrain.rs diff --git a/miller/.gitignore b/miller/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/miller/.gitignore @@ -0,0 +1 @@ +/target diff --git a/Cargo.lock b/miller/Cargo.lock similarity index 63% rename from Cargo.lock rename to miller/Cargo.lock index 160d671..1916530 100644 --- a/Cargo.lock +++ b/miller/Cargo.lock @@ -8,6 +8,21 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +dependencies = [ + "serde", +] + [[package]] name = "clap" version = "4.5.32" @@ -47,6 +62,15 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +[[package]] +name = "gamelog" +version = "0.3.0" +dependencies = [ + "ron", + "semver", + "serde", +] + [[package]] name = "heck" version = "0.5.0" @@ -58,6 +82,7 @@ name = "miller" version = "0.1.0" dependencies = [ "clap", + "gamelog", ] [[package]] @@ -78,6 +103,48 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "ron" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63f3aa105dea217ef30d89581b65a4d527a19afc95ef5750be3890e8d3c5b837" +dependencies = [ + "base64", + "bitflags", + "serde", + "serde_derive", + "unicode-ident", +] + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "strsim" version = "0.11.1" diff --git a/Cargo.toml b/miller/Cargo.toml similarity index 100% rename from Cargo.toml rename to miller/Cargo.toml diff --git a/src/calculator.rs b/miller/src/calculator.rs similarity index 100% rename from src/calculator.rs rename to miller/src/calculator.rs diff --git a/src/main.rs b/miller/src/main.rs similarity index 98% rename from src/main.rs rename to miller/src/main.rs index 4f4b2df..e69f17b 100644 --- a/src/main.rs +++ b/miller/src/main.rs @@ -1,5 +1,4 @@ mod calculator; -mod error; use clap::Parser; use core::panic;