quantumshade/flix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to Zed and add proper newtypes

Browse Source
This commit is contained in:
David Skrundz
2026-01-04 20:00:13 -07:00
parent dd2cf5c942
commit 994a80c45c
18 changed files with 828 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/cli/Cargo.toml
+28 -31
View File
@@ -1,15 +1,12 @@
[package]
name = "flix-cli"
version = "0.0.15"
categories = ["command-line-utilities"]
version = "0.0.16"
edition.workspace = true
rust-version.workspace = true
description = "CLI for interacting with a flix database"
repository = "https://github.com/QuantumShade/flix"
authors.workspace = true
edition.workspace = true
license-file.workspace = true
rust-version.workspace = true
categories = ["command-line-utilities"]
[package.metadata.docs.rs]
all-features = true
@@ -20,9 +17,26 @@ doc = false
name = "flix"
path = "src/main.rs"
[lints.rust]
arithmetic_overflow = "forbid"
unsafe_code = "forbid"
[dependencies]
anyhow = { workspace = true }
chrono = { workspace = true, features = ["now"] }
clap = { workspace = true, features = [
"color",
"derive",
"error-context",
"help",
"std",
"suggestions",
"usage",
] }
flix = { workspace = true, features = ["tmdb"] }
futures = { workspace = true }
sea-orm = { workspace = true, features = ["debug-print", "runtime-tokio"] }
serde = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["fs", "macros", "rt"] }
toml = { workspace = true, features = ["parse", "serde"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
[lints.clippy]
arithmetic_side_effects = "deny"
@@ -34,26 +48,9 @@ indexing_slicing = "deny"
integer_division = "deny"
integer_division_remainder_used = "deny"
transmute_undefined_repr = "deny"
unchecked_duration_subtraction = "deny"
unchecked_time_subtraction = "deny"
unwrap_used = "deny"
[dependencies]
flix = { workspace = true, features = ["tmdb"] }
anyhow = { workspace = true }
chrono = { workspace = true, features = ["now"] }
clap = { workspace = true, features = [
"derive",
"color",
"error-context",
"help",
"suggestions",
"usage",
] }
futures = { workspace = true }
sea-orm = { workspace = true, features = ["runtime-tokio", "debug-print"] }
serde = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["rt", "fs", "macros"] }
toml = { workspace = true, features = ["parse", "serde"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
[lints.rust]
arithmetic_overflow = "forbid"
unsafe_code = "forbid"
crates/cli/src/run/tmdb.rs
+13 -4
View File
@@ -150,13 +150,20 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
let year = show.first_air_date.year();
for season in 1..=show.number_of_seasons {
let season = client
let season = SeasonNumber::new(season);
let season = match client
.seasons()
.get_details(id, season, None)
.await
.with_context(|| {
format!("seasons().get_details({}, {})", id.into_raw(), season)
})?;
}) {
Ok(season) => season,
Err(err) => {
eprintln!("{err:?}");
continue;
}
};
if season.air_date > Utc::now().naive_utc().date() {
eprintln!(
"skipping season ({}, {})",
@@ -166,7 +173,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
break;
}
let Ok(number_of_episodes) = EpisodeNumber::try_from(season.episodes.len()) else {
let Ok(number_of_episodes) = u32::try_from(season.episodes.len()) else {
bail!(
"could not convert {} to an EpisodeNumber",
season.episodes.len()
@@ -175,6 +182,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
let mut season_episodes = Vec::new();
for episode in 1..=number_of_episodes {
let episode = EpisodeNumber::new(episode);
let Ok(episode) = client
.episodes()
.get_details(id, season.season_number, episode, None)
@@ -314,7 +322,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
})?;
let mut episodes = Vec::new();
let Ok(number_of_episodes) = EpisodeNumber::try_from(season.episodes.len()) else {
let Ok(number_of_episodes) = u32::try_from(season.episodes.len()) else {
bail!(
"could not convert {} to an EpisodeNumber",
season.episodes.len()
@@ -322,6 +330,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
};
for episode in 1..=number_of_episodes {
let episode = EpisodeNumber::new(episode);
let Ok(episode) = client
.episodes()
.get_details(id, season.season_number, episode, None)