Remove home dependency

Cargo.toml

@@ -35,17 +35,17 @@ overflow-checks = true
 strip = "debuginfo"
 
 [workspace.dependencies]
-flix = { path = "crates/flix", version = "=0.0.10", default-features = false }
+flix = { path = "crates/flix", version = "=0.0.12", default-features = false }
-flix-cli = { path = "crates/cli", version = "=0.0.10", default-features = false }
+flix-cli = { path = "crates/cli", version = "=0.0.12", default-features = false }
-flix-db = { path = "crates/db", version = "=0.0.10", default-features = false }
+flix-db = { path = "crates/db", version = "=0.0.12", default-features = false }
-flix-fs = { path = "crates/fs", version = "=0.0.10", default-features = false }
+flix-fs = { path = "crates/fs", version = "=0.0.12", default-features = false }
-flix-model = { path = "crates/model", version = "=0.0.10", default-features = false }
+flix-model = { path = "crates/model", version = "=0.0.12", default-features = false }
-flix-tmdb = { path = "crates/tmdb", version = "=0.0.10", default-features = false }
+flix-tmdb = { path = "crates/tmdb", version = "=0.0.12", default-features = false }
 
-seamantic = { version = "0.0.6", default-features = false }
+seamantic = { version = "0.0.9", default-features = false }
 
-sea-orm = { version = "2.0.0-rc.7", default-features = false }
+sea-orm = { version = "2.0.0-rc.16", default-features = false }
-sea-orm-migration = { version = "2.0.0-rc.7", default-features = false }
+sea-orm-migration = { version = "2.0.0-rc.16", default-features = false }
 
 anyhow = { version = "^1", default-features = false }
 async-stream = { version = "^0.3", default-features = false }
@@ -53,7 +53,6 @@ chrono = { version = "^0.4", default-features = false }
 clap = { version = "^4", default-features = false, features = ["std"] }
 futures = { version = "^0.3", default-features = false }
 governor = { version = "^0.10", default-features = false }
-home = { version = "^0.5", default-features = false }
 nonzero_ext = { version = "^0.3", default-features = false }
 regex = { version = "^1", default-features = false }
 reqwest = { version = "^0.12", default-features = false }

crates/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix-cli"
-version = "0.0.10"
+version = "0.0.12"
 
 categories = ["command-line-utilities"]
 description = "CLI for interacting with a flix database"
@@ -51,7 +51,6 @@ clap = { workspace = true, features = [
 	"usage",
 ] }
 futures = { workspace = true }
-home = { workspace = true }
 sea-orm = { workspace = true, features = ["runtime-tokio"] }
 serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["rt", "fs", "macros"] }

crates/cli/src/cli/mod.rs

@@ -24,7 +24,7 @@ impl Cli {
 	pub fn config_path(&self) -> PathBuf {
 		fn expect_home_dir() -> PathBuf {
 			#[allow(clippy::expect_used)]
-			home::home_dir().expect("you do not have a home directory")
+			std::env::home_dir().expect("you do not have a home directory")
 		}
 
 		match self.config.strip_prefix("~/") {

crates/db/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix-db"
-version = "0.0.10"
+version = "0.0.12"
 
 categories = []
 description = "Types for storing persistent data about media"

crates/db/src/connection.rs

@@ -7,7 +7,7 @@ use sea_orm_migration::MigratorTrait as _;
 pub struct Connection(DatabaseConnection);
 
 impl Connection {
-	/// Helper function for apllying database migrations while wrapping a
+	/// Helper function for applying database migrations while wrapping a
 	/// [DatabaseConnection] in a newtype
 	pub async fn try_from(database: DatabaseConnection) -> Result<Self, DbErr> {
 		crate::migration::Migrator::up(&database, None).await?;

crates/db/src/entity/content/episodes.rs

@@ -53,9 +53,9 @@ pub enum Relation {
 	Library,
 	/// The media info for this episode
 	#[sea_orm(
-		belongs_to = "super::super::info::seasons::Entity",
+		belongs_to = "super::super::info::episodes::Entity",
-		from = "(Column::Show, Column::Season)",
+		from = "(Column::Show, Column::Season, Column::Episode)",
-		to = "(super::super::info::seasons::Column::Show, super::super::info::seasons::Column::Season)",
+		to = "(super::super::info::episodes::Column::Show, super::super::info::episodes::Column::Season, super::super::info::episodes::Column::Episode)",
 		on_update = "Cascade",
 		on_delete = "Cascade"
 	)]

crates/db/src/entity/info/collections.rs

@@ -3,8 +3,8 @@
 use flix_model::id::CollectionId;
 
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a flix collection

crates/db/src/entity/info/movies.rs

@@ -4,8 +4,8 @@ use flix_model::id::MovieId;
 
 use chrono::NaiveDate;
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a flix movie

crates/db/src/entity/tmdb/episodes.rs

@@ -7,8 +7,8 @@ use seamantic::model::duration::Seconds;
 
 use chrono::NaiveDate;
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a tmdb episode

crates/db/src/entity/watched/collections.rs

@@ -3,8 +3,8 @@
 use flix_model::id::{CollectionId, RawId};
 
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a watched movie

crates/db/src/entity/watched/episodes.rs

@@ -5,8 +5,8 @@ use flix_model::numbers::{EpisodeNumber, SeasonNumber};
 
 use chrono::NaiveDate;
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a watched movie

crates/db/src/entity/watched/movies.rs

@@ -4,8 +4,8 @@ use flix_model::id::{MovieId, RawId};
 
 use chrono::NaiveDate;
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a watched movie

crates/db/src/entity/watched/seasons.rs

@@ -5,8 +5,8 @@ use flix_model::numbers::SeasonNumber;
 
 use chrono::NaiveDate;
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a watched movie

crates/db/src/entity/watched/shows.rs

@@ -4,8 +4,8 @@ use flix_model::id::{RawId, ShowId};
 
 use chrono::NaiveDate;
 use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	PrimaryKeyTrait,
+	EnumIter, PrimaryKeyTrait,
 };
 
 /// The database representation of a watched movie

crates/flix/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix"
-version = "0.0.10"
+version = "0.0.12"
 
 categories = []
 description = "Mechanisms for interacting with flix media"

crates/fs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix-fs"
-version = "0.0.10"
+version = "0.0.12"
 
 categories = []
 description = "Filesystem scanner for flix media"

crates/model/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix-model"
-version = "0.0.10"
+version = "0.0.12"
 
 categories = []
 description = "Core types for flix data"

crates/tmdb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix-tmdb"
-version = "0.0.10"
+version = "0.0.12"
 
 categories = []
 description = "Clients and models for fetching data from TMDB"

crates/tmdb/src/model/id.rs

@@ -150,8 +150,8 @@ mod tests {
 	#[cfg(feature = "sea-orm")]
 	fn test_sea_orm() {
 		use sea_orm::{
-			ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
+			ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-			PrimaryKeyTrait,
+			EnumIter, PrimaryKeyTrait,
 		};
 
 		use super::Id;
@@ -184,7 +184,7 @@ mod tests {
 /// Type alias for the raw ID representation
 pub use self::TmdbRepr as RawId;
 
-/// A placeholder type used for CollectionId
+#[doc(hidden)]
 pub enum Collection {}
 /// Type alias for a collection ID
 pub type CollectionId = Id<Collection>;
@@ -203,7 +203,7 @@ impl TryFrom<flix_model::id::CollectionId> for CollectionId {
 	}
 }
 
-/// A placeholder type used for MovieId
+#[doc(hidden)]
 pub enum Movie {}
 /// Type alias for a movie ID
 pub type MovieId = Id<Movie>;
@@ -222,7 +222,7 @@ impl TryFrom<flix_model::id::MovieId> for MovieId {
 	}
 }
 
-/// A placeholder type used for ShowId
+#[doc(hidden)]
 pub enum Show {}
 /// Type alias for a show ID
 pub type ShowId = Id<Show>;