Bump gamelog to 0.3.0 and migrate to own library.
This commit is contained in:
60
Cargo.lock
generated
60
Cargo.lock
generated
@@ -8,21 +8,6 @@ version = "1.0.10"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
|
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]]
|
[[package]]
|
||||||
name = "clap"
|
name = "clap"
|
||||||
version = "4.5.32"
|
version = "4.5.32"
|
||||||
@@ -73,9 +58,6 @@ name = "miller"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap",
|
"clap",
|
||||||
"ron",
|
|
||||||
"semver",
|
|
||||||
"serde",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -96,48 +78,6 @@ dependencies = [
|
|||||||
"proc-macro2",
|
"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]]
|
[[package]]
|
||||||
name = "strsim"
|
name = "strsim"
|
||||||
version = "0.11.1"
|
version = "0.11.1"
|
||||||
|
|||||||
12
Cargo.toml
12
Cargo.toml
@@ -5,13 +5,6 @@ edition = "2024"
|
|||||||
license = "MIT"
|
license = "MIT"
|
||||||
license-file = "LICENSE"
|
license-file = "LICENSE"
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
ron = "0.9"
|
|
||||||
|
|
||||||
[dependencies.semver]
|
|
||||||
version = "1.0"
|
|
||||||
features = ["serde"]
|
|
||||||
|
|
||||||
[dependencies.clap]
|
[dependencies.clap]
|
||||||
version = "4.5"
|
version = "4.5"
|
||||||
default-features = false
|
default-features = false
|
||||||
@@ -28,6 +21,5 @@ features = [
|
|||||||
"string",
|
"string",
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependencies.serde]
|
[dependencies.gamelog]
|
||||||
version = "1.0"
|
path = "./gamelog"
|
||||||
features = ["derive"]
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ impl fmt::Display for LogFileError {
|
|||||||
Self::CompatibilityCheck(ver) => write!(
|
Self::CompatibilityCheck(ver) => write!(
|
||||||
f,
|
f,
|
||||||
"GameLogs cannot be older than {}, but {} was found in logfile.",
|
"GameLogs cannot be older than {}, but {} was found in logfile.",
|
||||||
crate::gamelog::GAMELOG_MIN_VER.to_string(),
|
crate::gamelog::MIN_VER.to_string(),
|
||||||
ver.to_string()
|
ver.to_string()
|
||||||
),
|
),
|
||||||
Self::RonSpannedError(err) => write!(f, "{}", err),
|
Self::RonSpannedError(err) => write!(f, "{}", err),
|
||||||
|
|||||||
15
src/gamelog/Cargo.toml
Normal file
15
src/gamelog/Cargo.toml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[package]
|
||||||
|
name = "gamelog"
|
||||||
|
version = "0.3.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
ron = "0.9"
|
||||||
|
|
||||||
|
[dependencies.semver]
|
||||||
|
version = "1.0"
|
||||||
|
features = ["serde"]
|
||||||
|
|
||||||
|
[dependencies.serde]
|
||||||
|
version = "1.0"
|
||||||
|
features = ["derive"]
|
||||||
@@ -49,7 +49,7 @@ impl LogFile {
|
|||||||
fn is_compatible(&self) -> bool {
|
fn is_compatible(&self) -> bool {
|
||||||
self.clone()
|
self.clone()
|
||||||
.get_min_ver()
|
.get_min_ver()
|
||||||
.cmp_precedence(&super::GAMELOG_MIN_VER)
|
.cmp_precedence(&super::MIN_VER)
|
||||||
.is_lt()
|
.is_lt()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3,7 +3,8 @@ mod period;
|
|||||||
mod play;
|
mod play;
|
||||||
mod terrain;
|
mod terrain;
|
||||||
|
|
||||||
pub const GAMELOG_MIN_VER: semver::Version = semver::Version::new(0, 2, 0);
|
#[allow(unused)]
|
||||||
|
pub const MIN_VER: semver::Version = semver::Version::new(0, 2, 0);
|
||||||
|
|
||||||
pub use file::LogFile;
|
pub use file::LogFile;
|
||||||
pub use period::*;
|
pub use period::*;
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
#[deprecated(since = "0.2.0", note = "Migrated to Game")]
|
||||||
|
type GameRecord = Game;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Clone)]
|
#[derive(Debug, Deserialize, Clone)]
|
||||||
pub struct Game {
|
pub struct Game {
|
||||||
pub version: semver::Version,
|
pub version: semver::Version,
|
||||||
@@ -19,4 +22,5 @@ pub enum Quarter {
|
|||||||
Second,
|
Second,
|
||||||
Third,
|
Third,
|
||||||
Fourth,
|
Fourth,
|
||||||
|
Overtime(u8),
|
||||||
}
|
}
|
||||||
@@ -7,4 +7,5 @@ pub enum TerrainState {
|
|||||||
Yards(u8),
|
Yards(u8),
|
||||||
GoalLine,
|
GoalLine,
|
||||||
Inches,
|
Inches,
|
||||||
|
Unknown,
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
mod calculator;
|
mod calculator;
|
||||||
mod error;
|
mod error;
|
||||||
mod gamelog;
|
|
||||||
|
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use core::panic;
|
use core::panic;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
[
|
[
|
||||||
GameRecord(
|
GameRecord(
|
||||||
version: "0.2.0",
|
version: "0.3.0",
|
||||||
periods: [
|
periods: [
|
||||||
Period(
|
Period(
|
||||||
start: First,
|
start: First,
|
||||||
|
|||||||
Reference in New Issue
Block a user