Add scan date on libraries

Cargo.toml

@@ -35,12 +35,12 @@ overflow-checks = true
 strip = "debuginfo"
 
 [workspace.dependencies]
-flix = { path = "crates/flix", version = "=0.0.13", default-features = false }
+flix = { path = "crates/flix", version = "=0.0.14", default-features = false }
-flix-cli = { path = "crates/cli", version = "=0.0.13", default-features = false }
+flix-cli = { path = "crates/cli", version = "=0.0.14", default-features = false }
-flix-db = { path = "crates/db", version = "=0.0.13", default-features = false }
+flix-db = { path = "crates/db", version = "=0.0.14", default-features = false }
-flix-fs = { path = "crates/fs", version = "=0.0.13", default-features = false }
+flix-fs = { path = "crates/fs", version = "=0.0.14", default-features = false }
-flix-model = { path = "crates/model", version = "=0.0.13", default-features = false }
+flix-model = { path = "crates/model", version = "=0.0.14", default-features = false }
-flix-tmdb = { path = "crates/tmdb", version = "=0.0.13", default-features = false }
+flix-tmdb = { path = "crates/tmdb", version = "=0.0.14", default-features = false }
 
 seamantic = { version = "0.0.10", default-features = false }
 

crates/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flix-cli"
-version = "0.0.13"
+version = "0.0.14"
 
 categories = ["command-line-utilities"]
 description = "CLI for interacting with a flix database"

crates/cli/src/run/tmdb.rs

@@ -49,7 +49,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 						entity::tmdb::collections::ActiveModel {
 							tmdb_id: Set(id),
 							flix_id: Set(flix.id),
-							last_update: Set(Utc::now().date_naive()),
+							last_update: Set(Utc::now().naive_utc().date()),
 							movie_count: Set(collection.movies.len().try_into().unwrap_or(0)),
 						}
 						.insert(txn)
@@ -99,7 +99,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 						entity::tmdb::movies::ActiveModel {
 							tmdb_id: Set(id),
 							flix_id: Set(flix.id),
-							last_update: Set(Utc::now().date_naive()),
+							last_update: Set(Utc::now().naive_utc().date()),
 							runtime: Set(movie.runtime.into()),
 							collection_id: Set(movie.collection.map(|c| c.id)),
 						}
@@ -144,7 +144,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 					.with_context(|| {
 						format!("seasons().get_details({}, {})", id.into_raw(), season)
 					})?;
-				if season.air_date > Utc::now().date_naive() {
+				if season.air_date > Utc::now().naive_utc().date() {
 					eprintln!(
 						"skipping season ({}, {})",
 						id.into_raw(),
@@ -198,7 +198,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 						entity::tmdb::shows::ActiveModel {
 							tmdb_id: Set(id),
 							flix_id: Set(flix.id),
-							last_update: Set(Utc::now().date_naive()),
+							last_update: Set(Utc::now().naive_utc().date()),
 							number_of_seasons: Set(show.number_of_seasons),
 						}
 						.insert(txn)
@@ -220,7 +220,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 								tmdb_season: Set(season.season_number),
 								flix_show: Set(flix.id),
 								flix_season: Set(season.season_number),
-								last_update: Set(Utc::now().date_naive()),
+								last_update: Set(Utc::now().naive_utc().date()),
 							}
 							.insert(txn)
 							.await?;
@@ -246,7 +246,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 									flix_show: Set(flix.id),
 									flix_season: Set(season),
 									flix_episode: Set(episode.episode_number),
-									last_update: Set(Utc::now().date_naive()),
+									last_update: Set(Utc::now().naive_utc().date()),
 									runtime: Set(episode.runtime.into()),
 								}
 								.insert(txn)
@@ -338,7 +338,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 							tmdb_season: Set(season_number),
 							flix_show: Set(show.flix_id),
 							flix_season: Set(season_number),
-							last_update: Set(Utc::now().date_naive()),
+							last_update: Set(Utc::now().naive_utc().date()),
 						}
 						.insert(txn)
 						.await?;
@@ -362,7 +362,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 								flix_show: Set(show.flix_id),
 								flix_season: Set(season_number),
 								flix_episode: Set(episode.episode_number),
-								last_update: Set(Utc::now().date_naive()),
+								last_update: Set(Utc::now().naive_utc().date()),
 								runtime: Set(episode.runtime.into()),
 							}
 							.insert(txn)
@@ -453,7 +453,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 								flix_show: Set(flix_id),
 								flix_season: Set(season),
 								flix_episode: Set(episode_number),
-								last_update: Set(Utc::now().date_naive()),
+								last_update: Set(Utc::now().naive_utc().date()),
 								runtime: Set(episode.runtime.into()),
 							}
 							.insert(txn)

crates/db/Cargo.toml

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

crates/db/src/entity/content.rs

@@ -6,6 +6,7 @@ pub mod libraries {
 
 	use seamantic::model::path::PathBytes;
 
+	use chrono::NaiveDateTime;
 	use sea_orm::entity::prelude::*;
 
 	/// The database representation of a library media folder
@@ -18,6 +19,8 @@ pub mod libraries {
 		pub id: LibraryId,
 		/// The library's directory
 		pub directory: PathBytes,
+		/// The library's last scan data
+		pub last_scan: Option<NaiveDateTime>,
 
 		/// Collections that are part of this library
 		#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
@@ -312,6 +315,7 @@ pub mod test {
 			$crate::entity::content::libraries::ActiveModel {
 				id: Set(::flix_model::id::LibraryId::from_raw($id)),
 				directory: Set(::std::path::PathBuf::new().into()),
+				last_scan: Set(None),
 			}
 			.insert($db)
 			.await
@@ -427,6 +431,7 @@ mod tests {
 
 	use flix_model::id::{CollectionId, LibraryId, MovieId, ShowId};
 
+	use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
 	use sea_orm::ActiveValue::{NotSet, Set};
 	use sea_orm::entity::prelude::*;
 	use sea_orm::sqlx::error::ErrorKind;
@@ -466,6 +471,7 @@ mod tests {
 
 				assert_eq!(model.id, LibraryId::from_raw($id));
 				assert_eq!(model.directory, Path::new(concat!("L Directory ", $id)).to_owned().into());
+				assert_eq!(model.last_scan, noneable!(last_scan, NaiveDateTime::new(NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt"), NaiveTime::from_hms_opt(1, 1, 1).expect("from_yo_opt")) $(, $($skip),+)?));
 			};
 			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
 				let model = assert_library!(@insert, $db, $id $(; $($skip),+)?)
@@ -477,6 +483,7 @@ mod tests {
 				super::libraries::ActiveModel {
 					id: notsettable!(id, LibraryId::from_raw($id) $(, $($skip),+)?),
 					directory: notsettable!(directory, Path::new(concat!("L Directory ", $id)).to_owned().into() $(, $($skip),+)?),
+					last_scan: notsettable!(last_scan, Some(NaiveDateTime::new(NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt"), NaiveTime::from_hms_opt(1, 1, 1).expect("from_yo_opt"))) $(, $($skip),+)?),
 				}.insert($db).await
 			};
 		}
@@ -486,6 +493,7 @@ mod tests {
 		assert_library!(&db, 2, Success);
 		assert_library!(&db, 3, Success; id);
 		assert_library!(&db, 4, NotNullViolation; directory);
+		assert_library!(&db, 5, Success; last_scan);
 	}
 
 	#[tokio::test]

crates/flix/Cargo.toml

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

crates/fs/Cargo.toml

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

crates/model/Cargo.toml

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

crates/tmdb/Cargo.toml

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