Update readme and contributing

.gitignore

@@ -5,3 +5,7 @@
 
 # Rust
 /target
+
+# Flix
+flix.db
+flix.redb

.vscode/extensions.json

@@ -1,9 +0,0 @@
-{
-	"recommendations": [
-		"vadimcn.vscode-lldb",
-		"barbosshack.crates-io",
-		"usernamehw.errorlens",
-		"tamasfe.even-better-toml",
-		"rust-lang.rust-analyzer",
-	]
-}

.vscode/settings.json

@@ -1,33 +0,0 @@
-{
-	// VSCode
-	"editor.detectIndentation": false,
-	"editor.insertSpaces": false,
-	"editor.tabSize": 4,
-	"files.exclude": {
-		"**/target": true,
-		"**/Cargo.lock": true,
-	},
-	"files.insertFinalNewline": true,
-	"files.trimFinalNewlines": true,
-	"files.trimTrailingWhitespace": true,
-	"files.watcherExclude": {
-		"**/.git/**": true,
-		"**/target/**": true,
-	},
-	// Extensions
-	"crates.listPreReleases": true,
-	"evenBetterToml.formatter.alignComments": true,
-	"evenBetterToml.formatter.alignEntries": false,
-	"evenBetterToml.formatter.allowedBlankLines": 1,
-	"evenBetterToml.formatter.arrayAutoExpand": true,
-	"evenBetterToml.formatter.arrayTrailingComma": true,
-	"evenBetterToml.formatter.columnWidth": 80,
-	"evenBetterToml.formatter.reorderKeys": true,
-	"evenBetterToml.formatter.trailingNewline": true,
-	"rust-analyzer.imports.granularity.enforce": true,
-	"rust-analyzer.imports.granularity.group": "module",
-	"rust-analyzer.imports.group.enable": true,
-	"rust-analyzer.imports.merge.glob": false,
-	"rust-analyzer.imports.preferNoStd": true,
-	"rust-analyzer.showUnlinkedFileNotification": false,
-}

.zed/settings.json

@@ -0,0 +1,25 @@
+{
+	"languages": {
+		"TOML": {
+			"format_on_save": "on",
+			"formatter": { "language_server": { "name": "tombi" } },
+		},
+	},
+	"lsp": {
+		"rust-analyzer": {
+			"initialization_options": {
+				"imports": {
+					"granularity": { "enforce": true, "group": "module" },
+					"group": { "enable": true },
+					"merge": { "glob": false },
+					"preferNoStd": true,
+				},
+				"server": {
+					"extraEnv": {
+						"RUSTUP_TOOLCHAIN": "stable",
+					},
+				},
+			},
+		},
+	},
+}

CONTRIBUTING.md

@@ -3,4 +3,5 @@ How to Contribute
 
 We'd love to accept your patches and contributions to this project.
 We just need you to follow the Contributor License Agreement outlined
-in the latest v0.0.x of https://github.com/Skrunix/license
+in the latest v0.0.x of https://git.skrundz.dev/skrunix/license
+(mirrored to https://github.com/skrunix/license)

Cargo.toml

@@ -1,18 +1,55 @@
 [workspace]
-members = ["crates/*"]
 resolver = "2"
+members = ["crates/*"]
 
 [workspace.package]
-authors = []
-edition = "2024"
 license-file = "LICENSE.md"
-rust-version = "1.88.0"
 
-[workspace.lints.rust]
-arithmetic_overflow = "forbid"
-missing_docs = "forbid"
-unsafe_code = "forbid"
-unused_doc_comments = "forbid"
+edition = "2024"
+rust-version = "1.89.0"
+
+[workspace.dependencies]
+flix = { path = "crates/flix", version = "=0.0.19", default-features = false }
+flix-cli = { path = "crates/cli", version = "=0.0.19", default-features = false }
+flix-db = { path = "crates/db", version = "=0.0.19", default-features = false }
+flix-fs = { path = "crates/fs", version = "=0.0.19", default-features = false }
+flix-model = { path = "crates/model", version = "=0.0.19", default-features = false }
+flix-mux = { path = "crates/cli-mux", version = "=0.0.19", default-features = false }
+flix-tmdb = { path = "crates/tmdb", version = "=0.0.19", default-features = false }
+
+seamantic = { version = "^0.0.14", default-features = false }
+
+sea-orm = { version = "=2.0.0-rc.38", default-features = false }
+sea-orm-migration = { version = "=2.0.0-rc.38", default-features = false }
+
+anyhow = { version = "^1", default-features = false }
+async-stream = { version = "^0.3", default-features = false }
+bytes = { version = "^1", default-features = false }
+chrono = { version = "^0.4", default-features = false }
+clap = { version = "^4", default-features = false }
+console = { version = "^0.16", default-features = false }
+dialoguer = { version = "^0.12", default-features = false }
+either = { version = "^1", default-features = false }
+futures = { version = "^0.3", default-features = false }
+governor = { version = "^0.10", default-features = false }
+indicatif = { version = "^0.18", default-features = false }
+itertools = { version = "^0.14", default-features = false }
+nonzero_ext = { version = "^0.3", default-features = false }
+redb = { version = "^4", default-features = false }
+regex = { version = "^1", default-features = false }
+reqwest = { version = "^0.13", default-features = false }
+serde = { version = "^1", default-features = false }
+serde_json = { version = "^1", default-features = false }
+serde_test = { version = "^1", default-features = false }
+thiserror = { version = "^2", default-features = false }
+tokio = { version = "^1", default-features = false }
+tokio-stream = { version = "^0.1", default-features = false }
+toml = { version = "^1", default-features = false }
+tracing = { version = "^0.1", default-features = false }
+tracing-subscriber = { version = "^0.3", default-features = false }
+url = { version = "^2", default-features = false }
+url-macro = { version = "^0.2", default-features = false }
+walkdir = { version = "^2", default-features = false }
 
 [workspace.lints.clippy]
 arithmetic_side_effects = "forbid"
@@ -24,44 +61,18 @@ indexing_slicing = "forbid"
 integer_division = "forbid"
 integer_division_remainder_used = "forbid"
 transmute_undefined_repr = "forbid"
-unchecked_duration_subtraction = "forbid"
+unchecked_time_subtraction = "forbid"
 unwrap_used = "forbid"
 
+[workspace.lints.rust]
+arithmetic_overflow = "forbid"
+missing_docs = "forbid"
+unsafe_code = "forbid"
+unused_doc_comments = "forbid"
+
 [profile.release]
-codegen-units = 1
-lto = "fat"
 opt-level = 3
-overflow-checks = true
 strip = "debuginfo"
-
-[workspace.dependencies]
-flix = { path = "crates/flix", version = "=0.0.12", default-features = false }
-flix-cli = { path = "crates/cli", version = "=0.0.12", default-features = false }
-flix-db = { path = "crates/db", version = "=0.0.12", default-features = false }
-flix-fs = { path = "crates/fs", version = "=0.0.12", default-features = false }
-flix-model = { path = "crates/model", version = "=0.0.12", default-features = false }
-flix-tmdb = { path = "crates/tmdb", version = "=0.0.12", default-features = false }
-
-seamantic = { version = "0.0.9", default-features = false }
-
-sea-orm = { version = "2.0.0-rc.16", 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 }
-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 }
-serde = { version = "^1", default-features = false }
-serde_test = { version = "^1", default-features = false }
-thiserror = { version = "^2", default-features = false }
-tokio = { version = "^1", default-features = false }
-tokio-stream = { version = "^0.1", default-features = false }
-toml = { version = "^0.9", default-features = false }
-url = { version = "^2", default-features = false }
-url-macro = { version = "^0.2", default-features = false }
+overflow-checks = true
+lto = "fat"
+codegen-units = 1

README.md

@@ -7,9 +7,14 @@ Libraries and tools for dealing with media metadata
 - build: `cargo hack --feature-powerset build`
 - clippy: `cargo hack --feature-powerset clippy -- -D warnings`
 - test: `cargo hack --feature-powerset test`
-- test old: `cargo +1.88 hack --feature-powerset test`
+- test old: `cargo +1.89 hack --feature-powerset test`
 - fmt: `cargo fmt --check`
 - docs: `RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features`
 - install: `cargo install --path crates/cli`
+- install: `cargo install --path crates/cli-mux`
 - semver: `cargo semver-checks --all-features`
 - publish: `cargo publish --dry-run --workspace`
+
+## Building flix.db
+
+`./flix.sh`

crates/cli-mux/Cargo.toml

@@ -0,0 +1,57 @@
+[package]
+name = "flix-mux"
+version = "0.0.19"
+license-file.workspace = true
+
+description = "CLI for bulk media muxing"
+repository = "https://github.com/QuantumShade/flix"
+categories = ["command-line-utilities"]
+
+edition.workspace = true
+rust-version.workspace = true
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[[bin]]
+doc = false
+name = "flix-mux"
+path = "src/main.rs"
+
+[dependencies]
+anyhow = { workspace = true }
+clap = { workspace = true, features = [
+	"color",
+	"derive",
+	"error-context",
+	"help",
+	"std",
+	"suggestions",
+	"usage",
+] }
+console = { workspace = true }
+dialoguer = { workspace = true }
+indicatif = { workspace = true }
+serde = { workspace = true, features = ["derive", "std"] }
+serde_json = { workspace = true, features = ["alloc"] }
+walkdir = { workspace = true }
+
+[lints.clippy]
+arithmetic_side_effects = "deny"
+as_conversions = "deny"
+checked_conversions = "deny"
+default_union_representation = "deny"
+expect_used = "deny"
+indexing_slicing = "deny"
+integer_division = "deny"
+integer_division_remainder_used = "deny"
+transmute_undefined_repr = "deny"
+unchecked_time_subtraction = "deny"
+unwrap_used = "deny"
+
+[lints.rust]
+arithmetic_overflow = "forbid"
+missing_docs = "forbid"
+unsafe_code = "forbid"
+unused_doc_comments = "forbid"

crates/cli-mux/README.md

@@ -0,0 +1,11 @@
+# flix-mux
+
+[![Crates Version](https://img.shields.io/crates/v/flix-mux.svg)](https://crates.io/crates/flix-mux)
+
+CLI for bulk media muxing
+
+## Commands
+
+```sh
+flix-mux -s 'v:0>eng;a:eng;s:eng:forced?;s:eng?;s:eng:sdh?' <DIR>
+```

crates/cli-mux/src/cli.rs

@@ -0,0 +1,49 @@
+use std::path::PathBuf;
+
+use clap::Parser;
+
+use crate::parser::Selector;
+
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+pub struct Cli {
+	/// Dry run and print commands
+	#[arg(short, long)]
+	dry_run: bool,
+
+	/// Stream selectors
+	#[arg(
+		short,
+		long,
+		required = true,
+		value_name = "SEL",
+		value_delimiter = ';'
+	)]
+	selectors: Vec<Selector>,
+
+	/// The path to the directory to scan
+	#[arg(value_name = "DIR")]
+	scan_dir: PathBuf,
+}
+
+impl Cli {
+	pub fn is_dry(&self) -> bool {
+		self.dry_run
+	}
+
+	pub fn selectors(&self) -> &[Selector] {
+		&self.selectors
+	}
+
+	pub fn scan_dir_path(&self) -> PathBuf {
+		fn expect_home_dir() -> PathBuf {
+			#[allow(clippy::expect_used)]
+			std::env::home_dir().expect("you do not have a home directory")
+		}
+
+		match self.scan_dir.strip_prefix("~/") {
+			Ok(path) => expect_home_dir().join(path),
+			Err(_) => self.scan_dir.to_owned(),
+		}
+	}
+}

crates/cli-mux/src/main.rs

@@ -0,0 +1,66 @@
+//! flix-mux
+
+use core::time::Duration;
+
+use clap::Parser;
+use console::style;
+use indicatif::{HumanBytes, ProgressBar, ProgressStyle};
+
+use crate::mux::mux_files;
+use crate::scan::scan_directory;
+
+mod cli;
+mod model;
+mod mux;
+mod parser;
+mod probe;
+mod scan;
+
+fn main() {
+	let cli = cli::Cli::parse();
+
+	let (files, size) = scan_directory(
+		&cli.scan_dir_path(),
+		|| {
+			let progress = ProgressBar::new_spinner();
+			progress.set_message(format!("Scanning {:?}", &cli.scan_dir_path()));
+			progress.enable_steady_tick(Duration::from_millis(50));
+			progress
+		},
+		|progress| progress.finish(),
+		|len| {
+			let progress = ProgressBar::new(u64::try_from(len).unwrap_or(0));
+			progress.set_style(
+				#[expect(clippy::expect_used)]
+				ProgressStyle::with_template("[{elapsed_precise}] {wide_bar} {pos}/{len} ({msg})")
+					.expect("static template"),
+			);
+			progress
+		},
+		|progress| progress.inc(1),
+		|progress| progress.finish_and_clear(),
+		|progress, msg| {
+			progress.suspend(|| eprintln!("{} {}", style("[WARN]").bold().yellow(), msg))
+		},
+	);
+	println!("Found {} files ({})", files.len(), HumanBytes(size));
+
+	mux_files(
+		cli.is_dry(),
+		&files,
+		cli.selectors(),
+		|len| {
+			let progress = ProgressBar::new(u64::try_from(len).unwrap_or(0));
+			progress.set_style(
+				#[expect(clippy::expect_used)]
+				ProgressStyle::with_template("[{elapsed_precise}] {wide_bar} {pos}/{len} ({msg})")
+					.expect("static template"),
+			);
+			progress.enable_steady_tick(Duration::from_secs(1));
+			progress
+		},
+		|progress| progress.inc(1),
+		|progress| progress.finish_with_message("done"),
+		|progress, msg| progress.suspend(|| eprintln!("{} {}", style("[ERR]").bold().red(), msg)),
+	);
+}

crates/cli-mux/src/model.rs

@@ -0,0 +1,101 @@
+use std::path::PathBuf;
+
+use serde::Deserialize;
+
+#[derive(Debug, Clone)]
+pub struct MediaFile {
+	pub path: PathBuf,
+	pub byte_size: u64,
+	pub streams: Streams,
+}
+
+#[derive(Debug, Clone)]
+pub struct Streams {
+	pub video: Vec<VideoStream>,
+	pub audio: Vec<AudioStream>,
+	pub subtitle: Vec<SubtitleStream>,
+}
+
+pub trait FFStream: serde::de::DeserializeOwned {
+	const FF_TYPE_NAME: &str;
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct VideoStream {
+	codec_name: String,
+	tags: Option<VideoTags>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct VideoTags {
+	language: Option<String>,
+}
+
+impl VideoStream {
+	pub fn codec(&self) -> &str {
+		&self.codec_name
+	}
+
+	pub fn language(&self) -> Option<&str> {
+		self.tags.as_ref()?.language.as_deref()
+	}
+}
+
+impl FFStream for VideoStream {
+	const FF_TYPE_NAME: &str = "v";
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct AudioStream {
+	codec_name: String,
+	tags: Option<AudioTags>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct AudioTags {
+	language: Option<String>,
+}
+
+impl AudioStream {
+	pub fn codec(&self) -> &str {
+		&self.codec_name
+	}
+
+	pub fn language(&self) -> Option<&str> {
+		self.tags.as_ref()?.language.as_deref()
+	}
+}
+
+impl FFStream for AudioStream {
+	const FF_TYPE_NAME: &str = "a";
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct SubtitleStream {
+	codec_name: String,
+	tags: Option<SubtitleTags>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct SubtitleTags {
+	language: Option<String>,
+	title: Option<String>,
+}
+
+impl SubtitleStream {
+	pub fn codec(&self) -> &str {
+		&self.codec_name
+	}
+
+	pub fn language(&self) -> Option<&str> {
+		self.tags.as_ref()?.language.as_deref()
+	}
+
+	pub fn title(&self) -> Option<&str> {
+		self.tags.as_ref()?.title.as_deref()
+	}
+}
+
+impl FFStream for SubtitleStream {
+	const FF_TYPE_NAME: &str = "s";
+}

crates/cli-mux/src/mux.rs

@@ -0,0 +1,227 @@
+use std::process::Command;
+
+use anyhow::{Context as _, Result};
+
+use crate::model::MediaFile;
+use crate::parser::{Matcher, Selector, StreamFlag, StreamType};
+
+pub fn mux_files<T>(
+	dry_run: bool,
+	files: &[MediaFile],
+	selectors: &[Selector],
+	fixed_length_start: impl FnOnce(usize) -> T,
+	fixed_length_update: impl Fn(&mut T),
+	fixed_length_end: impl FnOnce(T),
+	print_fn: impl Fn(&T, &str),
+) {
+	let mut progress = fixed_length_start(files.len());
+	for file in files {
+		if let Err(err) = mux(dry_run, file, selectors) {
+			print_fn(&progress, &format!("{:?}", err));
+		}
+		fixed_length_update(&mut progress);
+	}
+	fixed_length_end(progress);
+}
+
+#[expect(clippy::expect_used)]
+fn mux(dry_run: bool, file: &MediaFile, selectors: &[Selector]) -> Result<()> {
+	let mut command = Command::new("ffmpeg");
+	let mut command = command.args(["-v", "error"]);
+
+	command = command.arg("-i");
+	command = command.arg(file.path.as_os_str());
+
+	for selector in selectors {
+		command = command.args(
+			make_map_args(file, selector)
+				.with_context(|| format!("Failed to mux {:?}", file.path))?,
+		);
+	}
+
+	command = command.args(["-c:v", "copy", "-c:a", "copy", "-c:s", "mov_text"]);
+	command = command.args(["-movflags", "faststart+disable_chpl+write_colr"]);
+	command = command.args(["-map_chapters", "-1"]);
+	command = command.args(["-map_metadata", "-1"]);
+	command = command.args(["-metadata:g", "encoding_tool=Skrundzflix"]);
+
+	for selector in selectors {
+		command = command.args(
+			make_metadata_args(file, selector)
+				.with_context(|| format!("Failed to mux {:?}", file.path))?,
+		);
+	}
+
+	let temp_path = file.path.with_extension("mp4");
+	command = command.arg(temp_path.file_name().expect("file name exists"));
+
+	if dry_run {
+		print_command(command);
+	} else {
+		let output = command
+			.output()
+			.with_context(|| format!("Failed to mux {:?}", file.path))?;
+
+		if !output.status.success() {
+			anyhow::bail!(
+				"ffmpeg failed for {:?}:\n\n{}",
+				file.path,
+				String::from_utf8_lossy(&output.stderr)
+			);
+		}
+	}
+
+	Ok(())
+}
+
+fn make_map_args(file: &MediaFile, selector: &Selector) -> Result<Vec<String>> {
+	let source_index = 0;
+	let stream_type = selector.stream_type.as_ref();
+	let Some(stream_index) = find_stream_index(file, selector) else {
+		if selector.optional {
+			return Ok(vec![]);
+		} else {
+			anyhow::bail!("unsatisfied stream selection");
+		}
+	};
+
+	Ok(vec![
+		String::from("-map"),
+		format!("{}:{}:{}", source_index, stream_type, stream_index),
+	])
+}
+
+fn make_metadata_args(file: &MediaFile, selector: &Selector) -> Result<Vec<String>> {
+	let stream_type = selector.stream_type.as_ref();
+	let Some(stream_index) = find_stream_index(file, selector) else {
+		if selector.optional {
+			return Ok(vec![]);
+		} else {
+			anyhow::bail!("unsatisfied stream selection");
+		}
+	};
+
+	let stream_language = selector.language();
+
+	let mut args = vec![
+		format!("-metadata:s:{}:{}", stream_type, stream_index),
+		format!("language={}", stream_language),
+	];
+
+	if selector.stream_type == StreamType::Subtitle {
+		let sub_title = match selector.flag {
+			Some(StreamFlag::Forced) => "Forced",
+			Some(StreamFlag::Sdh) => "SDH",
+			None => match stream_language {
+				"eng" => "English",
+				"jpn" => "Japanese",
+				_ => anyhow::bail!("Unhandled subtitle language: {}", stream_language),
+			},
+		};
+
+		args.push(format!("-metadata:s:s:{}", stream_index));
+		args.push(format!("title={}", sub_title));
+	}
+
+	Ok(args)
+}
+
+fn find_stream_index(file: &MediaFile, selector: &Selector) -> Option<usize> {
+	let needs_forced = selector.flag == Some(StreamFlag::Forced);
+	let needs_sdh = selector.flag == Some(StreamFlag::Sdh);
+
+	match selector.stream_type {
+		StreamType::Video => match selector.matcher {
+			Matcher::Index(index) => (file.streams.video.len() > index).then_some(index),
+			Matcher::Language(ref language) => file
+				.streams
+				.video
+				.iter()
+				.enumerate()
+				.filter(|(_, c)| c.language() == Some(language.as_str()))
+				.map(|(i, _)| i)
+				.next(),
+			Matcher::Codec(ref codec) => file
+				.streams
+				.video
+				.iter()
+				.enumerate()
+				.filter(|(_, c)| c.codec() == codec)
+				.map(|(i, _)| i)
+				.next(),
+		},
+		StreamType::Audio => match selector.matcher {
+			Matcher::Index(index) => (file.streams.audio.len() > index).then_some(index),
+			Matcher::Language(ref language) => file
+				.streams
+				.audio
+				.iter()
+				.enumerate()
+				.filter(|(_, c)| c.language() == Some(language.as_str()))
+				.map(|(i, _)| i)
+				.next(),
+			Matcher::Codec(ref codec) => file
+				.streams
+				.audio
+				.iter()
+				.enumerate()
+				.filter(|(_, c)| c.codec() == codec)
+				.map(|(i, _)| i)
+				.next(),
+		},
+		StreamType::Subtitle => match selector.matcher {
+			Matcher::Index(index) => (file.streams.subtitle.len() > index).then_some(index),
+			Matcher::Language(ref language) => {
+				file.streams
+					.subtitle
+					.iter()
+					.enumerate()
+					.filter(|(_, c)| c.language() == Some(language.as_str()))
+					.filter(|(_, c)| {
+						c.title()
+							.unwrap_or_default()
+							.to_ascii_lowercase()
+							.contains("forced") == needs_forced
+					})
+					.filter(|(_, c)| {
+						c.title()
+							.unwrap_or_default()
+							.to_ascii_lowercase()
+							.contains("sdh") == needs_sdh
+					})
+					.map(|(i, _)| i)
+					.next()
+			}
+			Matcher::Codec(ref codec) => file
+				.streams
+				.subtitle
+				.iter()
+				.enumerate()
+				.filter(|(_, c)| c.codec() == codec)
+				.map(|(i, _)| i)
+				.next(),
+		},
+	}
+}
+
+fn print_command(cmd: &Command) {
+	let program = cmd.get_program().to_string_lossy();
+
+	let args = cmd
+		.get_args()
+		.map(|a| shell_escape(a.to_string_lossy().as_ref()))
+		.collect::<Vec<_>>()
+		.join(" ");
+
+	println!("{} {}", program, args);
+}
+
+fn shell_escape(s: &str) -> String {
+	if s.chars()
+		.all(|c| c.is_ascii_alphanumeric() || "-_./".contains(c))
+	{
+		s.to_string()
+	} else {
+		format!("{:?}", s)
+	}
+}

crates/cli-mux/src/parser.rs

@@ -0,0 +1,159 @@
+use core::error::Error;
+use core::fmt;
+use core::str::FromStr;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum StreamType {
+	Video,
+	Audio,
+	Subtitle,
+}
+
+impl AsRef<str> for StreamType {
+	fn as_ref(&self) -> &str {
+		match self {
+			StreamType::Video => "v",
+			StreamType::Audio => "a",
+			StreamType::Subtitle => "s",
+		}
+	}
+}
+
+impl FromStr for StreamType {
+	type Err = ParseSelectorError;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		match s {
+			"v" => Ok(StreamType::Video),
+			"a" => Ok(StreamType::Audio),
+			"s" => Ok(StreamType::Subtitle),
+			other => Err(ParseSelectorError::InvalidStreamType(other.to_string())),
+		}
+	}
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Matcher {
+	Index(usize),
+	Language(String),
+	Codec(String),
+}
+
+impl FromStr for Matcher {
+	type Err = ParseSelectorError;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		if let Ok(idx) = s.parse::<usize>() {
+			return Ok(Matcher::Index(idx));
+		}
+
+		if s.len() == 3 {
+			return Ok(Matcher::Language(s.to_ascii_lowercase()));
+		}
+		Ok(Matcher::Codec(s.to_ascii_lowercase()))
+	}
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum StreamFlag {
+	Forced,
+	Sdh,
+}
+
+impl FromStr for StreamFlag {
+	type Err = ParseSelectorError;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		match s.to_ascii_lowercase().as_str() {
+			"forced" => Ok(StreamFlag::Forced),
+			"sdh" => Ok(StreamFlag::Sdh),
+			other => Err(ParseSelectorError::InvalidFlag(other.to_string())),
+		}
+	}
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Selector {
+	pub stream_type: StreamType,
+	pub matcher: Matcher,
+	pub flag: Option<StreamFlag>,
+	pub optional: bool,
+	pub out_lang: String,
+}
+
+impl Selector {
+	pub fn language(&self) -> &str {
+		&self.out_lang
+	}
+}
+
+impl FromStr for Selector {
+	type Err = ParseSelectorError;
+
+	fn from_str(input: &str) -> Result<Self, Self::Err> {
+		if input.is_empty() {
+			return Err(ParseSelectorError::Empty);
+		}
+
+		let (input, optional) = input
+			.strip_suffix('?')
+			.map_or((input, false), |s| (s, true));
+
+		let (left, out_lang) = input.split_once('>').unwrap_or((input, ""));
+
+		let mut parts = left.splitn(3, ':');
+
+		let stream_type: StreamType = parts
+			.next()
+			.ok_or(ParseSelectorError::InvalidFormat)?
+			.parse()?;
+
+		let matcher: Matcher = parts
+			.next()
+			.ok_or(ParseSelectorError::InvalidFormat)?
+			.parse()?;
+
+		let flag = parts
+			.next()
+			.filter(|s| !s.is_empty())
+			.map(str::parse)
+			.transpose()?;
+
+		let out_lang = match (out_lang.is_empty(), &matcher) {
+			(false, _) => out_lang.to_owned(),
+			(true, Matcher::Language(language)) => language.clone(),
+			(true, _) => return Err(ParseSelectorError::UnspecifiedLanguage),
+		};
+
+		Ok(Selector {
+			stream_type,
+			matcher,
+			flag,
+			optional,
+			out_lang,
+		})
+	}
+}
+
+#[derive(Debug)]
+pub enum ParseSelectorError {
+	Empty,
+	InvalidFormat,
+	InvalidStreamType(String),
+	InvalidFlag(String),
+	UnspecifiedLanguage,
+}
+
+impl Error for ParseSelectorError {}
+
+impl fmt::Display for ParseSelectorError {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		match self {
+			Self::Empty => write!(f, "selector was empty"),
+			Self::InvalidFormat => write!(f, "invalid selector format"),
+			Self::InvalidStreamType(s) => write!(f, "invalid stream type '{}'", s),
+			Self::InvalidFlag(s) => write!(f, "invalid stream flag '{}'", s),
+			Self::UnspecifiedLanguage => write!(f, "unspecified output language"),
+		}
+	}
+}

crates/cli-mux/src/probe.rs

@@ -0,0 +1,53 @@
+use std::os::unix::fs::MetadataExt;
+use std::process::Command;
+
+use anyhow::{Context as _, Result};
+use serde::Deserialize;
+use walkdir::DirEntry;
+
+use crate::model::{FFStream, MediaFile, Streams};
+
+#[derive(Debug, Deserialize)]
+struct FFProbeOutput<S> {
+	streams: Vec<S>,
+}
+
+fn probe_file_streams<S: FFStream>(entry: &DirEntry) -> Result<Vec<S>> {
+	let output = Command::new("ffprobe")
+		.args([
+			"-v",
+			"error",
+			"-output_format",
+			"json",
+			"-show_streams",
+			"-select_streams",
+			S::FF_TYPE_NAME,
+			#[expect(clippy::expect_used)]
+			entry.path().to_str().expect("path should be utf8"),
+		])
+		.output()
+		.with_context(|| format!("Failed to run ffprobe on {:?}", entry.path()))?;
+
+	if !output.status.success() {
+		anyhow::bail!(
+			"ffprobe failed for {:?}:\n\n{}",
+			entry.path(),
+			String::from_utf8_lossy(&output.stderr)
+		);
+	}
+
+	let parsed: FFProbeOutput<S> = serde_json::from_slice(&output.stdout)?;
+	Ok(parsed.streams)
+}
+
+pub fn probe_file(entry: &DirEntry) -> Result<MediaFile> {
+	Ok(MediaFile {
+		path: entry.path().to_path_buf(),
+		byte_size: entry.metadata()?.size(),
+		streams: Streams {
+			video: probe_file_streams(entry)?,
+			audio: probe_file_streams(entry)?,
+			subtitle: probe_file_streams(entry)?,
+		},
+	})
+}

crates/cli-mux/src/scan.rs

@@ -0,0 +1,58 @@
+use std::path::Path;
+
+use walkdir::WalkDir;
+
+use crate::model::MediaFile;
+use crate::probe::probe_file;
+
+pub fn scan_directory<T>(
+	path: &Path,
+	unknown_length_start: impl FnOnce() -> T,
+	unknown_length_end: impl FnOnce(T),
+	fixed_length_start: impl FnOnce(usize) -> T,
+	fixed_length_update: impl Fn(&mut T),
+	fixed_length_end: impl FnOnce(T),
+	print_fn: impl Fn(&T, &str),
+) -> (Vec<MediaFile>, u64) {
+	let spinner = unknown_length_start();
+	let files: Vec<_> = WalkDir::new(path)
+		.into_iter()
+		.filter_map(Result::ok)
+		.filter(|e| e.file_type().is_file())
+		.filter(|e| {
+			let is_mkv = e
+				.path()
+				.extension()
+				.unwrap_or_default()
+				.eq_ignore_ascii_case("mkv");
+			let is_mp4 = e
+				.path()
+				.extension()
+				.unwrap_or_default()
+				.eq_ignore_ascii_case("mp4");
+			is_mkv || is_mp4
+		})
+		.collect();
+	unknown_length_end(spinner);
+
+	let mut progress = fixed_length_start(files.len());
+	let mut total_byte_size = 0u64;
+	let files: Vec<_> = files
+		.iter()
+		.filter_map(|entry| {
+			let file = match probe_file(entry) {
+				Ok(file) => Some(file),
+				Err(err) => {
+					print_fn(&progress, &format!("{:?}", err));
+					None
+				}
+			};
+			let size = file.as_ref().map(|r| r.byte_size).unwrap_or_default();
+			total_byte_size = total_byte_size.saturating_add(size);
+			fixed_length_update(&mut progress);
+			file
+		})
+		.collect();
+	fixed_length_end(progress);
+	(files, total_byte_size)
+}

crates/cli/Cargo.toml

@@ -1,14 +1,13 @@
 [package]
 name = "flix-cli"
-version = "0.0.12"
+version = "0.0.19"
+license-file.workspace = true
 
-categories = ["command-line-utilities"]
 description = "CLI for interacting with a flix database"
 repository = "https://github.com/QuantumShade/flix"
+categories = ["command-line-utilities"]
 
-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
@@ -20,9 +19,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,25 +50,11 @@ 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 }
-home = { workspace = true }
-sea-orm = { workspace = true, features = ["runtime-tokio"] }
-serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["rt", "fs", "macros"] }
-toml = { workspace = true, features = ["parse", "serde"] }
+[lints.rust]
+arithmetic_overflow = "forbid"
+missing_docs = "forbid"
+unsafe_code = "forbid"
+unused_doc_comments = "forbid"

crates/cli/README.md

@@ -5,7 +5,8 @@
 CLI for interacting with a flix database
 
 ## Commands
+
 ```sh
-cargo run -- init
-cargo run -- add tmdb movie <id>
+flix init
+flix add tmdb movie <id>
 ```

crates/cli/src/cli/flix.rs

@@ -0,0 +1,30 @@
+use flix::model::numbers::{EpisodeNumber, SeasonNumber};
+
+use chrono::NaiveDate;
+use clap::Subcommand;
+
+#[derive(Subcommand)]
+pub enum AddCommand {
+	/// Add a flix collection
+	Collection {
+		#[arg(value_name = "TITLE")]
+		title: String,
+		#[arg(value_name = "OVERVIEW")]
+		overview: String,
+	},
+	/// Add a flix episode
+	Episode {
+		#[arg(value_name = "SHOW_WEB_SLUG")]
+		show_slug: String,
+		#[arg(value_name = "NUMBER")]
+		season_number: SeasonNumber,
+		#[arg(value_name = "NUMBER")]
+		episode_number: EpisodeNumber,
+		#[arg(value_name = "TITLE")]
+		title: String,
+		#[arg(value_name = "OVERVIEW")]
+		overview: String,
+		#[arg(value_name = "DATE")]
+		air_date: NaiveDate,
+	},
+}

crates/cli/src/cli/mod.rs

@@ -1,21 +1,35 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use anyhow::{Result, anyhow};
-use clap::{Parser, Subcommand};
+use clap::{Args, Parser, Subcommand};
 
+pub mod flix;
 pub mod tmdb;
 
 #[derive(Parser)]
 #[command(version, about, long_about = None)]
 pub struct Cli {
 	/// Use a custom config file
-	#[arg(short, long, value_name = "FILE", default_value = "~/.flix")]
+	#[arg(
+		short,
+		long,
+		value_name = "FILE",
+		default_value = "~/.config/flix/config.toml"
+	)]
 	config: PathBuf,
 
+	/// Use a custom cache file
+	#[arg(short = 'C', long, value_name = "FILE", default_value = "./flix.redb")]
+	cache: PathBuf,
+
 	/// Use a custom database file
-	#[arg(short, long, value_name = "DATABASE", default_value = "./flix.db")]
+	#[arg(short, long, value_name = "FILE", default_value = "./flix.db")]
 	database: PathBuf,
 
+	/// Enable tracing
+	#[arg(short, long)]
+	pub trace: bool,
+
 	#[command(subcommand)]
 	command: Command,
 }
@@ -24,7 +38,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("~/") {
@@ -33,6 +47,10 @@ impl Cli {
 		}
 	}
 
+	pub fn cache_path(&self) -> &Path {
+		&self.cache
+	}
+
 	pub fn database_path(&self) -> Result<String> {
 		self.database
 			.as_os_str()
@@ -46,41 +64,43 @@ impl Cli {
 	}
 }
 
+#[derive(Args)]
+pub struct AddOverrides {
+	#[arg(long)]
+	pub title: Option<String>,
+	#[arg(long)]
+	pub sort_title: Option<String>,
+	#[arg(long)]
+	pub fs_slug: Option<String>,
+	#[arg(long)]
+	pub web_slug: Option<String>,
+}
+
 #[derive(Subcommand)]
 pub enum Command {
 	/// Initialize a new database
 	Init,
 	/// Add new items to the database
 	Add {
+		#[command(flatten)]
+		overrides: AddOverrides,
 		#[command(subcommand)]
-		command: BackendCommand,
+		command: AddCommand,
 	},
 	/// Update an existing item in the database
 	Update {
 		#[command(subcommand)]
-		command: BackendCommand,
-	},
-	/// Delete an existing item in the database
-	Delete {
-		#[command(subcommand)]
-		command: BackendCommand,
-	},
-	/// Create a toml backup of the database
-	Backup {
-		/// Change the destination
-		#[arg(short, long, value_name = "FILE", default_value = "./flix.toml")]
-		output: PathBuf,
-	},
-	/// Create a database from a toml backup
-	Restore {
-		/// Change the source
-		#[arg(short, long, value_name = "FILE", default_value = "./flix.toml")]
-		input: PathBuf,
+		command: UpdateCommand,
 	},
 }
 
 #[derive(Subcommand)]
-pub enum BackendCommand {
+pub enum AddCommand {
+	/// Use the flix backend
+	Flix {
+		#[command(subcommand)]
+		command: flix::AddCommand,
+	},
 	/// Use the TMDB backend
 	Tmdb {
 		#[command(subcommand)]
@@ -88,7 +108,28 @@ pub enum BackendCommand {
 	},
 }
 
-impl From<tmdb::Command> for BackendCommand {
+impl From<flix::AddCommand> for AddCommand {
+	fn from(value: flix::AddCommand) -> Self {
+		Self::Flix { command: value }
+	}
+}
+
+impl From<tmdb::Command> for AddCommand {
+	fn from(value: tmdb::Command) -> Self {
+		Self::Tmdb { command: value }
+	}
+}
+
+#[derive(Subcommand)]
+pub enum UpdateCommand {
+	/// Use the TMDB backend
+	Tmdb {
+		#[command(subcommand)]
+		command: tmdb::Command,
+	},
+}
+
+impl From<tmdb::Command> for UpdateCommand {
 	fn from(value: tmdb::Command) -> Self {
 		Self::Tmdb { command: value }
 	}

crates/cli/src/lib.rs

@@ -1,3 +0,0 @@
-//! Placeholder
-
-#![cfg_attr(docsrs, feature(doc_cfg))]

crates/cli/src/main.rs

@@ -1,17 +1,21 @@
-use std::path::PathBuf;
+//! flix-cli
 
-use flix::tmdb::Client;
+use std::rc::Rc;
+
+use flix::tmdb::{self, CachePolicy, Client, RedbCache};
 
 use anyhow::{Context, Result};
 use clap::Parser;
 use tokio::fs;
 
 mod cli;
-use cli::{BackendCommand, Cli, Command};
+use cli::{AddCommand, Cli, Command, UpdateCommand};
 
 mod config;
 use config::Config;
 
+use crate::cli::AddOverrides;
+
 mod db;
 mod run;
 
@@ -26,15 +30,23 @@ async fn main() -> Result<()> {
 
 	let database_path = cli.database_path()?;
 
-	let client = Client::new(config.tmdb().bearer_token().to_owned());
+	let config = tmdb::Config::new(config.tmdb().bearer_token().to_owned());
+	let cache = Rc::new(RedbCache::new(cli.cache_path())?);
+	let client = Client::new(config, cache, CachePolicy::Full);
+
+	if cli.trace {
+		tracing_subscriber::fmt()
+			.with_max_level(tracing::Level::DEBUG)
+			.with_test_writer()
+			.init();
+	}
 
 	match cli.command() {
 		Command::Init => exec_init(database_path).await?,
-		Command::Add { command } => exec_add(client, database_path, command).await?,
+		Command::Add { command, overrides } => {
+			exec_add(client, database_path, command, overrides).await?
+		}
 		Command::Update { command } => exec_update(client, database_path, command).await?,
-		Command::Delete { command } => exec_delete(client, database_path, command).await?,
-		Command::Backup { output } => exec_backup(database_path, output).await?,
-		Command::Restore { input } => exec_restore(database_path, input).await?,
 	}
 
 	Ok(())
@@ -46,50 +58,34 @@ async fn exec_init(database_path: String) -> Result<()> {
 	Ok(())
 }
 
-async fn exec_add(client: Client, database_path: String, command: BackendCommand) -> Result<()> {
+async fn exec_add(
+	client: Client,
+	database_path: String,
+	command: AddCommand,
+	overrides: AddOverrides,
+) -> Result<()> {
 	let database = db::open(database_path).await?;
 
 	match command {
-		BackendCommand::Tmdb { command } => {
-			run::tmdb::add(client, database.as_ref(), command).await?;
+		AddCommand::Flix { command } => {
+			run::flix::add(database.as_ref(), command, overrides).await?;
+		}
+		AddCommand::Tmdb { command } => {
+			run::tmdb::add(client, database.as_ref(), command, overrides).await?;
 		}
 	}
 
 	Ok(())
 }
 
-async fn exec_update(client: Client, database_path: String, command: BackendCommand) -> Result<()> {
+async fn exec_update(client: Client, database_path: String, command: UpdateCommand) -> Result<()> {
 	let database = db::open(database_path).await?;
 
 	match command {
-		BackendCommand::Tmdb { command } => {
+		UpdateCommand::Tmdb { command } => {
 			run::tmdb::update(client, database.as_ref(), command).await?;
 		}
 	}
 
 	Ok(())
 }
-
-async fn exec_delete(client: Client, database_path: String, command: BackendCommand) -> Result<()> {
-	let database = db::open(database_path).await?;
-
-	match command {
-		BackendCommand::Tmdb { command } => {
-			run::tmdb::delete(client, database.as_ref(), command).await?;
-		}
-	}
-
-	Ok(())
-}
-
-async fn exec_backup(database_path: String, output: PathBuf) -> Result<()> {
-	_ = database_path;
-	_ = output;
-	unimplemented!()
-}
-
-async fn exec_restore(database_path: String, input: PathBuf) -> Result<()> {
-	_ = database_path;
-	_ = input;
-	unimplemented!()
-}

crates/cli/src/run/flix.rs

@@ -0,0 +1,106 @@
+use flix::db::entity;
+use flix::model::id::{CollectionId, ShowId};
+use flix::model::numbers::{EpisodeNumber, SeasonNumber};
+use flix::model::text;
+
+use anyhow::Result;
+use sea_orm::ActiveValue::{NotSet, Set};
+use sea_orm::{ActiveModelTrait, DatabaseConnection, DbErr, TransactionError, TransactionTrait};
+
+use crate::cli::AddOverrides;
+use crate::cli::flix::AddCommand;
+
+pub async fn add(
+	db: &DatabaseConnection,
+	command: AddCommand,
+	overrides: AddOverrides,
+) -> Result<()> {
+	match command {
+		AddCommand::Collection { title, overview } => {
+			let result: Result<CollectionId, TransactionError<DbErr>> = db
+				.transaction(|txn| {
+					let title = overrides.title.unwrap_or_else(|| title.clone());
+
+					let sort_title = overrides
+						.sort_title
+						.unwrap_or_else(|| text::make_sortable_title(&title));
+					let fs_slug = overrides
+						.fs_slug
+						.unwrap_or_else(|| text::make_fs_slug(&title));
+					let web_slug = overrides
+						.web_slug
+						.unwrap_or_else(|| text::make_web_slug(&title));
+
+					Box::pin(async move {
+						let flix = entity::info::collections::ActiveModel {
+							id: NotSet,
+							title: Set(title),
+							overview: Set(overview),
+							sort_title: Set(sort_title),
+							fs_slug: Set(fs_slug),
+							web_slug: Set(web_slug),
+						}
+						.insert(txn)
+						.await?;
+
+						Ok(flix.id)
+					})
+				})
+				.await;
+
+			match result {
+				Ok(_) => {}
+				Err(TransactionError::Connection(err)) => Err(err)?,
+				Err(TransactionError::Transaction(err)) => Err(err)?,
+			};
+			println!("Created Collection: {}", title);
+
+			Ok(())
+		}
+		AddCommand::Episode {
+			show_slug,
+			season_number,
+			episode_number,
+			title,
+			overview,
+			air_date,
+		} => {
+			let result: Result<(ShowId, SeasonNumber, EpisodeNumber), TransactionError<DbErr>> = db
+				.transaction(|txn| {
+					let title = overrides.title.unwrap_or_else(|| title.clone());
+
+					Box::pin(async move {
+						let show = entity::info::shows::Entity::find_by_web_slug(&show_slug)
+							.one(txn)
+							.await?
+							.ok_or_else(|| {
+								DbErr::Custom(format!("show '{}' does not exist", show_slug))
+							})?;
+
+						let flix = entity::info::episodes::ActiveModel {
+							show_id: Set(show.id),
+							season_number: Set(season_number),
+							episode_number: Set(episode_number),
+							title: Set(title),
+							overview: Set(overview),
+							date: Set(air_date),
+						}
+						.insert(txn)
+						.await?;
+
+						Ok((flix.show_id, flix.season_number, flix.episode_number))
+					})
+				})
+				.await;
+
+			match result {
+				Ok(_) => {}
+				Err(TransactionError::Connection(err)) => Err(err)?,
+				Err(TransactionError::Transaction(err)) => Err(err)?,
+			};
+			println!("Created Episode: {}", title);
+
+			Ok(())
+		}
+	}
+}

crates/cli/src/run/mod.rs

@@ -1 +1,2 @@
+pub mod flix;
 pub mod tmdb;

crates/cli/src/run/tmdb.rs

@@ -3,21 +3,28 @@ use std::collections::HashMap;
 use flix::db::entity;
 use flix::model::id::{CollectionId, MovieId, ShowId};
 use flix::model::numbers::{EpisodeNumber, SeasonNumber};
+use flix::model::text;
 use flix::tmdb::Client;
 use flix::tmdb::model::id::{
 	CollectionId as TmdbCollectionId, MovieId as TmdbMovieId, ShowId as TmdbShowId,
 };
 
 use anyhow::{Context, Result, bail};
-use chrono::Utc;
+use chrono::{Datelike, Utc};
 use sea_orm::ActiveValue::{NotSet, Set};
 use sea_orm::{
 	ActiveModelTrait, DatabaseConnection, DbErr, EntityTrait, TransactionError, TransactionTrait,
 };
 
+use crate::cli::AddOverrides;
 use crate::cli::tmdb::Command;
 
-pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> Result<()> {
+pub async fn add(
+	client: Client,
+	db: &DatabaseConnection,
+	command: Command,
+	overrides: AddOverrides,
+) -> Result<()> {
 	match command {
 		Command::Collection { id } => {
 			let id = TmdbCollectionId::from_raw(id);
@@ -35,13 +42,29 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				.await
 				.with_context(|| format!("collections().get_details({})", id.into_raw()))?;
 
+			let title = overrides.title.unwrap_or(collection.title);
+
+			let sort_title = overrides
+				.sort_title
+				.unwrap_or_else(|| text::make_sortable_title(&title));
+			let fs_slug = overrides
+				.fs_slug
+				.unwrap_or_else(|| text::make_fs_slug(&title));
+			let web_slug = overrides
+				.web_slug
+				.unwrap_or_else(|| text::make_web_slug(&title));
+
 			let result: Result<CollectionId, TransactionError<DbErr>> = db
 				.transaction(|txn| {
+					let title = title.clone();
 					Box::pin(async move {
 						let flix = entity::info::collections::ActiveModel {
 							id: NotSet,
-							title: Set(collection.title),
+							title: Set(title),
 							overview: Set(collection.overview),
+							sort_title: Set(sort_title),
+							fs_slug: Set(fs_slug),
+							web_slug: Set(web_slug),
 						}
 						.insert(txn)
 						.await?;
@@ -49,7 +72,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()),
 							movie_count: Set(collection.movies.len().try_into().unwrap_or(0)),
 						}
 						.insert(txn)
@@ -60,12 +83,12 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				})
 				.await;
 
-			let flix_id = match result {
-				Ok(id) => id,
+			match result {
+				Ok(_) => {}
 				Err(TransactionError::Connection(err)) => Err(err)?,
 				Err(TransactionError::Transaction(err)) => Err(err)?,
 			};
-			println!("Created Collection: {}", flix_id.into_raw());
+			println!("Created Collection: {}", title);
 
 			Ok(())
 		}
@@ -83,15 +106,32 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				.await
 				.with_context(|| format!("movies().get_details({})", id.into_raw()))?;
 
+			let title = overrides.title.unwrap_or(movie.title);
+			let year = movie.release_date.year();
+
+			let sort_title = overrides
+				.sort_title
+				.unwrap_or_else(|| text::make_sortable_title(&title));
+			let fs_slug = overrides
+				.fs_slug
+				.unwrap_or_else(|| text::make_fs_slug_year(&title, year));
+			let web_slug = overrides
+				.web_slug
+				.unwrap_or_else(|| text::make_web_slug_year(&title, year));
+
 			let result: Result<MovieId, TransactionError<DbErr>> = db
 				.transaction(|txn| {
+					let title = title.clone();
 					Box::pin(async move {
 						let flix = entity::info::movies::ActiveModel {
 							id: NotSet,
-							title: Set(movie.title),
+							title: Set(title),
 							tagline: Set(movie.tagline),
 							overview: Set(movie.overview),
 							date: Set(movie.release_date),
+							sort_title: Set(sort_title),
+							fs_slug: Set(fs_slug),
+							web_slug: Set(web_slug),
 						}
 						.insert(txn)
 						.await?;
@@ -99,9 +139,9 @@ 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()),
 							runtime: Set(movie.runtime.into()),
-							collection: Set(movie.collection.map(|c| c.id)),
+							collection_id: Set(movie.collection.map(|c| c.id)),
 						}
 						.insert(txn)
 						.await?;
@@ -111,12 +151,12 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				})
 				.await;
 
-			let flix_id = match result {
-				Ok(id) => id,
+			match result {
+				Ok(_) => {}
 				Err(TransactionError::Connection(err)) => Err(err)?,
 				Err(TransactionError::Transaction(err)) => Err(err)?,
 			};
-			println!("Created Movie: {}", flix_id.into_raw());
+			println!("Created Movie: {} ({})", title, year);
 
 			Ok(())
 		}
@@ -137,14 +177,21 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 			let mut episodes = HashMap::new();
 
 			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)
-					})?;
-				if season.air_date > Utc::now().date_naive() {
+					}) {
+					Ok(season) => season,
+					Err(err) => {
+						eprintln!("{err:?}");
+						continue;
+					}
+				};
+				if season.air_date > Utc::now().naive_utc().date() {
 					eprintln!(
 						"skipping season ({}, {})",
 						id.into_raw(),
@@ -153,7 +200,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()
@@ -162,18 +209,23 @@ 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 Ok(episode) = client
+					let episode = EpisodeNumber::new(episode);
+					let episode = match client
 						.episodes()
 						.get_details(id, season.season_number, episode, None)
 						.await
-					else {
+					{
+						Ok(value) => value,
+						Err(err) => {
 							eprintln!(
-							"skipping episode ({}, {}, {})",
+								"skipping episode ({}, {}, {}) - {}",
 								id.into_raw(),
 								season.season_number,
-							episode
+								episode,
+								err
 							);
 							break;
+						}
 					};
 					season_episodes.push(episode);
 				}
@@ -182,15 +234,32 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				seasons.push(season);
 			}
 
+			let title = overrides.title.unwrap_or(show.title);
+			let year = show.first_air_date.year();
+
+			let sort_title = overrides
+				.sort_title
+				.unwrap_or_else(|| text::make_sortable_title(&title));
+			let fs_slug = overrides
+				.fs_slug
+				.unwrap_or_else(|| text::make_fs_slug_year(&title, year));
+			let web_slug = overrides
+				.web_slug
+				.unwrap_or_else(|| text::make_web_slug_year(&title, year));
+
 			let result: Result<ShowId, TransactionError<DbErr>> = db
 				.transaction(|txn| {
+					let title = title.clone();
 					Box::pin(async move {
 						let flix = entity::info::shows::ActiveModel {
 							id: NotSet,
-							title: Set(show.title),
+							title: Set(title),
 							tagline: Set(show.tagline),
 							overview: Set(show.overview),
 							date: Set(show.first_air_date),
+							sort_title: Set(sort_title),
+							fs_slug: Set(fs_slug),
+							web_slug: Set(web_slug),
 						}
 						.insert(txn)
 						.await?;
@@ -198,7 +267,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()),
 							number_of_seasons: Set(show.number_of_seasons),
 						}
 						.insert(txn)
@@ -206,8 +275,8 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 
 						for season in seasons {
 							entity::info::seasons::ActiveModel {
-								show: Set(flix.id),
-								season: Set(season.season_number),
+								show_id: Set(flix.id),
+								season_number: Set(season.season_number),
 								title: Set(season.title),
 								overview: Set(season.overview),
 								date: Set(season.air_date),
@@ -220,7 +289,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()),
 							}
 							.insert(txn)
 							.await?;
@@ -229,9 +298,9 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 						for (season, episodes) in episodes {
 							for episode in episodes {
 								entity::info::episodes::ActiveModel {
-									show: Set(flix.id),
-									season: Set(season),
-									episode: Set(episode.episode_number),
+									show_id: Set(flix.id),
+									season_number: Set(season),
+									episode_number: Set(episode.episode_number),
 									title: Set(episode.title),
 									overview: Set(episode.overview),
 									date: Set(episode.air_date),
@@ -246,7 +315,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()),
 									runtime: Set(episode.runtime.into()),
 								}
 								.insert(txn)
@@ -259,12 +328,12 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				})
 				.await;
 
-			let flix_id = match result {
-				Ok(id) => id,
+			match result {
+				Ok(_) => {}
 				Err(TransactionError::Connection(err)) => Err(err)?,
 				Err(TransactionError::Transaction(err)) => Err(err)?,
 			};
-			println!("Created Show: {}", flix_id.into_raw());
+			println!("Created Show: {} ({})", title, year);
 
 			Ok(())
 		}
@@ -296,7 +365,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()
@@ -304,18 +373,23 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 			};
 
 			for episode in 1..=number_of_episodes {
-				let Ok(episode) = client
+				let episode = EpisodeNumber::new(episode);
+				let episode = match client
 					.episodes()
 					.get_details(id, season.season_number, episode, None)
 					.await
-				else {
+				{
+					Ok(value) => value,
+					Err(err) => {
 						eprintln!(
-						"skipping episode ({}, {}, {})",
+							"skipping episode ({}, {}, {}) - {}",
 							id.into_raw(),
 							season.season_number,
-						episode
+							episode,
+							err
 						);
 						break;
+					}
 				};
 				episodes.push(episode);
 			}
@@ -324,8 +398,8 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				.transaction(|txn| {
 					Box::pin(async move {
 						entity::info::seasons::ActiveModel {
-							show: Set(show.flix_id),
-							season: Set(season_number),
+							show_id: Set(show.flix_id),
+							season_number: Set(season_number),
 							title: Set(season.title),
 							overview: Set(season.overview),
 							date: Set(season.air_date),
@@ -338,16 +412,16 @@ 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()),
 						}
 						.insert(txn)
 						.await?;
 
 						for episode in episodes {
 							entity::info::episodes::ActiveModel {
-								show: Set(show.flix_id),
-								season: Set(season_number),
-								episode: Set(episode.episode_number),
+								show_id: Set(show.flix_id),
+								season_number: Set(season_number),
+								episode_number: Set(episode.episode_number),
 								title: Set(episode.title),
 								overview: Set(episode.overview),
 								date: Set(episode.air_date),
@@ -362,7 +436,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()),
 								runtime: Set(episode.runtime.into()),
 							}
 							.insert(txn)
@@ -375,7 +449,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 				.await;
 
 			match result {
-				Ok(_) => (),
+				Ok(_) => {}
 				Err(TransactionError::Connection(err)) => Err(err)?,
 				Err(TransactionError::Transaction(err)) => Err(err)?,
 			};
@@ -436,9 +510,9 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 					.transaction(|txn| {
 						Box::pin(async move {
 							entity::info::episodes::ActiveModel {
-								show: Set(flix_id),
-								season: Set(season),
-								episode: Set(episode_number),
+								show_id: Set(flix_id),
+								season_number: Set(season),
+								episode_number: Set(episode_number),
 								title: Set(episode.title),
 								overview: Set(episode.overview),
 								date: Set(episode.air_date),
@@ -453,7 +527,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()),
 								runtime: Set(episode.runtime.into()),
 							}
 							.insert(txn)
@@ -465,7 +539,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 					.await;
 
 				match result {
-					Ok(_) => (),
+					Ok(_) => {}
 					Err(TransactionError::Connection(err)) => Err(err)?,
 					Err(TransactionError::Transaction(err)) => Err(err)?,
 				};
@@ -492,16 +566,551 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
 	}
 }
 
-pub async fn update(client: Client, database: &DatabaseConnection, command: Command) -> Result<()> {
+pub async fn update(client: Client, db: &DatabaseConnection, command: Command) -> Result<()> {
 	_ = client;
-	_ = database;
+	_ = db;
 	_ = command;
 	unimplemented!("updates")
-}
 
-pub async fn delete(client: Client, database: &DatabaseConnection, command: Command) -> Result<()> {
-	_ = client;
-	_ = database;
-	_ = command;
-	unimplemented!("deletions")
+	// match command {
+	// 	Command::Collection { id } => {
+	// 		let id = TmdbCollectionId::from_raw(id);
+
+	// 		let collection = entity::tmdb::collections::Entity::find_by_id(id)
+	// 			.one(db)
+	// 			.await?;
+	// 		if collection.is_some() {
+	// 			bail!("collection already exists");
+	// 		}
+
+	// 		let collection = client
+	// 			.collections()
+	// 			.get_details(id, None)
+	// 			.await
+	// 			.with_context(|| format!("collections().get_details({})", id.into_raw()))?;
+
+	// 		let title = overrides.title.unwrap_or(collection.title);
+
+	// 		let sort_title = overrides
+	// 			.sort_title
+	// 			.unwrap_or_else(|| text::make_sortable_title(&title));
+	// 		let fs_slug = overrides
+	// 			.fs_slug
+	// 			.unwrap_or_else(|| text::make_fs_slug(&title));
+	// 		let web_slug = overrides
+	// 			.web_slug
+	// 			.unwrap_or_else(|| text::make_web_slug(&title));
+
+	// 		let result: Result<CollectionId, TransactionError<DbErr>> = db
+	// 			.transaction(|txn| {
+	// 				let title = title.clone();
+	// 				Box::pin(async move {
+	// 					let flix = entity::info::collections::ActiveModel {
+	// 						id: NotSet,
+	// 						title: Set(title),
+	// 						overview: Set(collection.overview),
+	// 						sort_title: Set(sort_title),
+	// 						fs_slug: Set(fs_slug),
+	// 						web_slug: Set(web_slug),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					entity::tmdb::collections::ActiveModel {
+	// 						tmdb_id: Set(id),
+	// 						flix_id: Set(flix.id),
+	// 						last_update: Set(Utc::now()),
+	// 						movie_count: Set(collection.movies.len().try_into().unwrap_or(0)),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					Ok(flix.id)
+	// 				})
+	// 			})
+	// 			.await;
+
+	// 		let flix_id = match result {
+	// 			Ok(id) => id,
+	// 			Err(TransactionError::Connection(err)) => Err(err)?,
+	// 			Err(TransactionError::Transaction(err)) => Err(err)?,
+	// 		};
+	// 		println!("Created Collection: {}", title, flix_id.into_raw());
+
+	// 		Ok(())
+	// 	}
+	// 	Command::Movie { id } => {
+	// 		let id = TmdbMovieId::from_raw(id);
+
+	// 		let movie = entity::tmdb::movies::Entity::find_by_id(id).one(db).await?;
+	// 		if movie.is_some() {
+	// 			bail!("movie already exists");
+	// 		}
+
+	// 		let movie = client
+	// 			.movies()
+	// 			.get_details(id, None)
+	// 			.await
+	// 			.with_context(|| format!("movies().get_details({})", id.into_raw()))?;
+
+	// 		let title = overrides.title.unwrap_or(movie.title);
+	// 		let year = movie.release_date.year();
+
+	// 		let sort_title = overrides
+	// 			.sort_title
+	// 			.unwrap_or_else(|| text::make_sortable_title(&title));
+	// 		let fs_slug = overrides
+	// 			.fs_slug
+	// 			.unwrap_or_else(|| text::make_fs_slug_year(&title, year));
+	// 		let web_slug = overrides
+	// 			.web_slug
+	// 			.unwrap_or_else(|| text::make_web_slug_year(&title, year));
+
+	// 		let result: Result<MovieId, TransactionError<DbErr>> = db
+	// 			.transaction(|txn| {
+	// 				let title = title.clone();
+	// 				Box::pin(async move {
+	// 					let flix = entity::info::movies::ActiveModel {
+	// 						id: NotSet,
+	// 						title: Set(title),
+	// 						tagline: Set(movie.tagline),
+	// 						overview: Set(movie.overview),
+	// 						date: Set(movie.release_date),
+	// 						sort_title: Set(sort_title),
+	// 						fs_slug: Set(fs_slug),
+	// 						web_slug: Set(web_slug),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					entity::tmdb::movies::ActiveModel {
+	// 						tmdb_id: Set(id),
+	// 						flix_id: Set(flix.id),
+	// 						last_update: Set(Utc::now()),
+	// 						runtime: Set(movie.runtime.into()),
+	// 						collection_id: Set(movie.collection.map(|c| c.id)),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					Ok(flix.id)
+	// 				})
+	// 			})
+	// 			.await;
+
+	// 		let flix_id = match result {
+	// 			Ok(id) => id,
+	// 			Err(TransactionError::Connection(err)) => Err(err)?,
+	// 			Err(TransactionError::Transaction(err)) => Err(err)?,
+	// 		};
+	// 		println!(
+	// 			"Created Movie: {} ({})",
+	// 			title,
+	// 			year,
+	// 			flix_id.into_raw(),
+	// 		);
+
+	// 		Ok(())
+	// 	}
+	// 	Command::Show { id } => {
+	// 		let id = TmdbShowId::from_raw(id);
+
+	// 		let show = entity::tmdb::shows::Entity::find_by_id(id).one(db).await?;
+	// 		if show.is_some() {
+	// 			bail!("show already exists");
+	// 		}
+
+	// 		let show = client
+	// 			.shows()
+	// 			.get_details(id, None)
+	// 			.await
+	// 			.with_context(|| format!("shows().get_details({})", id.into_raw()))?;
+	// 		let mut seasons = Vec::new();
+	// 		let mut episodes = HashMap::new();
+
+	// 		for season in 1..=show.number_of_seasons {
+	// 			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 ({}, {})",
+	// 					id.into_raw(),
+	// 					season.season_number
+	// 				);
+	// 				break;
+	// 			}
+
+	// 			let Ok(number_of_episodes) = u32::try_from(season.episodes.len()) else {
+	// 				bail!(
+	// 					"could not convert {} to an EpisodeNumber",
+	// 					season.episodes.len()
+	// 				)
+	// 			};
+
+	// 			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)
+	// 					.await
+	// 				else {
+	// 					eprintln!(
+	// 						"skipping episode ({}, {}, {})",
+	// 						id.into_raw(),
+	// 						season.season_number,
+	// 						episode
+	// 					);
+	// 					break;
+	// 				};
+	// 				season_episodes.push(episode);
+	// 			}
+
+	// 			episodes.insert(season.season_number, season_episodes);
+	// 			seasons.push(season);
+	// 		}
+
+	// 		let title = overrides.title.unwrap_or(show.title);
+	// 		let year = show.first_air_date.year();
+
+	// 		let sort_title = overrides
+	// 			.sort_title
+	// 			.unwrap_or_else(|| text::make_sortable_title(&title));
+	// 		let fs_slug = overrides
+	// 			.fs_slug
+	// 			.unwrap_or_else(|| text::make_fs_slug_year(&title, year));
+	// 		let web_slug = overrides
+	// 			.web_slug
+	// 			.unwrap_or_else(|| text::make_web_slug_year(&title, year));
+
+	// 		let result: Result<ShowId, TransactionError<DbErr>> = db
+	// 			.transaction(|txn| {
+	// 				let title = title.clone();
+	// 				Box::pin(async move {
+	// 					let flix = entity::info::shows::ActiveModel {
+	// 						id: NotSet,
+	// 						title: Set(title),
+	// 						tagline: Set(show.tagline),
+	// 						overview: Set(show.overview),
+	// 						date: Set(show.first_air_date),
+	// 						sort_title: Set(sort_title),
+	// 						fs_slug: Set(fs_slug),
+	// 						web_slug: Set(web_slug),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					entity::tmdb::shows::ActiveModel {
+	// 						tmdb_id: Set(id),
+	// 						flix_id: Set(flix.id),
+	// 						last_update: Set(Utc::now()),
+	// 						number_of_seasons: Set(show.number_of_seasons),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					for season in seasons {
+	// 						entity::info::seasons::ActiveModel {
+	// 							show_id: Set(flix.id),
+	// 							season_number: Set(season.season_number),
+	// 							title: Set(season.title),
+	// 							overview: Set(season.overview),
+	// 							date: Set(season.air_date),
+	// 						}
+	// 						.insert(txn)
+	// 						.await?;
+
+	// 						entity::tmdb::seasons::ActiveModel {
+	// 							tmdb_show: Set(id),
+	// 							tmdb_season: Set(season.season_number),
+	// 							flix_show: Set(flix.id),
+	// 							flix_season: Set(season.season_number),
+	// 							last_update: Set(Utc::now()),
+	// 						}
+	// 						.insert(txn)
+	// 						.await?;
+	// 					}
+
+	// 					for (season, episodes) in episodes {
+	// 						for episode in episodes {
+	// 							entity::info::episodes::ActiveModel {
+	// 								show_id: Set(flix.id),
+	// 								season_number: Set(season),
+	// 								episode_number: Set(episode.episode_number),
+	// 								title: Set(episode.title),
+	// 								overview: Set(episode.overview),
+	// 								date: Set(episode.air_date),
+	// 							}
+	// 							.insert(txn)
+	// 							.await?;
+
+	// 							entity::tmdb::episodes::ActiveModel {
+	// 								tmdb_show: Set(id),
+	// 								tmdb_season: Set(season),
+	// 								tmdb_episode: Set(episode.episode_number),
+	// 								flix_show: Set(flix.id),
+	// 								flix_season: Set(season),
+	// 								flix_episode: Set(episode.episode_number),
+	// 								last_update: Set(Utc::now()),
+	// 								runtime: Set(episode.runtime.into()),
+	// 							}
+	// 							.insert(txn)
+	// 							.await?;
+	// 						}
+	// 					}
+
+	// 					Ok(flix.id)
+	// 				})
+	// 			})
+	// 			.await;
+
+	// 		let flix_id = match result {
+	// 			Ok(id) => id,
+	// 			Err(TransactionError::Connection(err)) => Err(err)?,
+	// 			Err(TransactionError::Transaction(err)) => Err(err)?,
+	// 		};
+	// 		println!(
+	// 			"Created Show: {} ({})",
+	// 			title,
+	// 			year,
+	// 			flix_id.into_raw()
+	// 		);
+
+	// 		Ok(())
+	// 	}
+	// 	Command::Season { id, season } => {
+	// 		let id = TmdbShowId::from_raw(id);
+	// 		let season_number = season;
+
+	// 		let Some(show) = entity::tmdb::shows::Entity::find_by_id(id).one(db).await? else {
+	// 			bail!("show does not exists");
+	// 		};
+
+	// 		let season = entity::tmdb::seasons::Entity::find_by_id((id, season))
+	// 			.one(db)
+	// 			.await?;
+	// 		if season.is_some() {
+	// 			bail!("season already exists");
+	// 		}
+
+	// 		let season = client
+	// 			.seasons()
+	// 			.get_details(id, season_number, None)
+	// 			.await
+	// 			.with_context(|| {
+	// 				format!(
+	// 					"seasons().get_details({}, {})",
+	// 					id.into_raw(),
+	// 					season_number
+	// 				)
+	// 			})?;
+	// 		let mut episodes = Vec::new();
+
+	// 		let Ok(number_of_episodes) = u32::try_from(season.episodes.len()) else {
+	// 			bail!(
+	// 				"could not convert {} to an EpisodeNumber",
+	// 				season.episodes.len()
+	// 			)
+	// 		};
+
+	// 		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)
+	// 				.await
+	// 			else {
+	// 				eprintln!(
+	// 					"skipping episode ({}, {}, {})",
+	// 					id.into_raw(),
+	// 					season.season_number,
+	// 					episode
+	// 				);
+	// 				break;
+	// 			};
+	// 			episodes.push(episode);
+	// 		}
+
+	// 		let result: Result<(), TransactionError<DbErr>> = db
+	// 			.transaction(|txn| {
+	// 				Box::pin(async move {
+	// 					entity::info::seasons::ActiveModel {
+	// 						show_id: Set(show.flix_id),
+	// 						season_number: Set(season_number),
+	// 						title: Set(season.title),
+	// 						overview: Set(season.overview),
+	// 						date: Set(season.air_date),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					entity::tmdb::seasons::ActiveModel {
+	// 						tmdb_show: Set(show.tmdb_id),
+	// 						tmdb_season: Set(season_number),
+	// 						flix_show: Set(show.flix_id),
+	// 						flix_season: Set(season_number),
+	// 						last_update: Set(Utc::now()),
+	// 					}
+	// 					.insert(txn)
+	// 					.await?;
+
+	// 					for episode in episodes {
+	// 						entity::info::episodes::ActiveModel {
+	// 							show_id: Set(show.flix_id),
+	// 							season_number: Set(season_number),
+	// 							episode_number: Set(episode.episode_number),
+	// 							title: Set(episode.title),
+	// 							overview: Set(episode.overview),
+	// 							date: Set(episode.air_date),
+	// 						}
+	// 						.insert(txn)
+	// 						.await?;
+
+	// 						entity::tmdb::episodes::ActiveModel {
+	// 							tmdb_show: Set(show.tmdb_id),
+	// 							tmdb_season: Set(season_number),
+	// 							tmdb_episode: Set(episode.episode_number),
+	// 							flix_show: Set(show.flix_id),
+	// 							flix_season: Set(season_number),
+	// 							flix_episode: Set(episode.episode_number),
+	// 							last_update: Set(Utc::now()),
+	// 							runtime: Set(episode.runtime.into()),
+	// 						}
+	// 						.insert(txn)
+	// 						.await?;
+	// 					}
+
+	// 					Ok(())
+	// 				})
+	// 			})
+	// 			.await;
+
+	// 		match result {
+	// 			Ok(_) => (),
+	// 			Err(TransactionError::Connection(err)) => Err(err)?,
+	// 			Err(TransactionError::Transaction(err)) => Err(err)?,
+	// 		};
+	// 		println!(
+	// 			"Created Season: {} S{}",
+	// 			show.flix_id.into_raw(),
+	// 			season_number
+	// 		);
+
+	// 		Ok(())
+	// 	}
+	// 	Command::Episode {
+	// 		id,
+	// 		season,
+	// 		episode,
+	// 		episodes,
+	// 	} => {
+	// 		let id = TmdbShowId::from_raw(id);
+	// 		let season_number = season;
+
+	// 		let Some(show) = entity::tmdb::shows::Entity::find_by_id(id).one(db).await? else {
+	// 			bail!("show does not exists");
+	// 		};
+	// 		let Some(_) = entity::tmdb::seasons::Entity::find_by_id((id, season))
+	// 			.one(db)
+	// 			.await?
+	// 		else {
+	// 			bail!("season does not exists");
+	// 		};
+
+	// 		async fn fetch_episode(
+	// 			client: &Client,
+	// 			db: &DatabaseConnection,
+	// 			flix_id: ShowId,
+	// 			tmdb_id: TmdbShowId,
+	// 			id: TmdbShowId,
+	// 			season: SeasonNumber,
+	// 			episode: EpisodeNumber,
+	// 		) -> Result<()> {
+	// 			let episode_number = episode;
+
+	// 			let episode = entity::tmdb::episodes::Entity::find_by_id((id, season, episode))
+	// 				.one(db)
+	// 				.await?;
+	// 			if episode.is_some() {
+	// 				bail!("episode already exists");
+	// 			}
+
+	// 			let episode = client
+	// 				.episodes()
+	// 				.get_details(id, season, episode_number, None)
+	// 				.await
+	// 				.with_context(|| {
+	// 					format!("episodes().get_details({}, {})", id.into_raw(), season)
+	// 				})?;
+
+	// 			let result: Result<(), TransactionError<DbErr>> = db
+	// 				.transaction(|txn| {
+	// 					Box::pin(async move {
+	// 						entity::info::episodes::ActiveModel {
+	// 							show_id: Set(flix_id),
+	// 							season_number: Set(season),
+	// 							episode_number: Set(episode_number),
+	// 							title: Set(episode.title),
+	// 							overview: Set(episode.overview),
+	// 							date: Set(episode.air_date),
+	// 						}
+	// 						.insert(txn)
+	// 						.await?;
+
+	// 						entity::tmdb::episodes::ActiveModel {
+	// 							tmdb_show: Set(tmdb_id),
+	// 							tmdb_season: Set(season),
+	// 							tmdb_episode: Set(episode_number),
+	// 							flix_show: Set(flix_id),
+	// 							flix_season: Set(season),
+	// 							flix_episode: Set(episode_number),
+	// 							last_update: Set(Utc::now()),
+	// 							runtime: Set(episode.runtime.into()),
+	// 						}
+	// 						.insert(txn)
+	// 						.await?;
+
+	// 						Ok(())
+	// 					})
+	// 				})
+	// 				.await;
+
+	// 			match result {
+	// 				Ok(_) => (),
+	// 				Err(TransactionError::Connection(err)) => Err(err)?,
+	// 				Err(TransactionError::Transaction(err)) => Err(err)?,
+	// 			};
+	// 			println!(
+	// 				"Created Episode: {} S{}E{}",
+	// 				flix_id.into_raw(),
+	// 				season,
+	// 				episode_number
+	// 			);
+
+	// 			Ok(())
+	// 		}
+
+	// 		let flix_id = show.flix_id;
+	// 		let tmdb_id = show.tmdb_id;
+
+	// 		fetch_episode(&client, db, flix_id, tmdb_id, id, season_number, episode).await?;
+	// 		for episode in episodes {
+	// 			fetch_episode(&client, db, flix_id, tmdb_id, id, season_number, episode).await?;
+	// 		}
+
+	// 		Ok(())
+	// 	}
+	// }
 }

crates/db/Cargo.toml

@@ -1,41 +1,42 @@
 [package]
 name = "flix-db"
-version = "0.0.12"
+version = "0.0.19"
+license-file.workspace = true
 
-categories = []
 description = "Types for storing persistent data about media"
 repository = "https://github.com/QuantumShade/flix"
+categories = []
 
-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
+[dependencies]
+chrono = { workspace = true }
+flix-model = { workspace = true }
+sea-orm = { workspace = true, features = [
+	"entity-registry",
+	"schema-sync",
+	"with-chrono",
+] }
+sea-orm-migration = { workspace = true }
+seamantic = { workspace = true, features = ["sqlite"] }
+
+flix-tmdb = { workspace = true, features = ["sea-orm"], optional = true }
+
+[dev-dependencies]
+sea-orm-migration = { workspace = true, features = ["runtime-tokio-rustls"] }
+tokio = { version = "^1", default-features = false, features = [
+	"macros",
+	"rt",
+] }
 
 [features]
 default = []
 tmdb = ["dep:flix-tmdb"]
 
-[dependencies]
-flix-model = { workspace = true }
-
-flix-tmdb = { workspace = true, optional = true, features = ["sea-orm"] }
-
-seamantic = { workspace = true, features = ["sqlite"] }
-
-chrono = { workspace = true }
-sea-orm = { workspace = true, features = ["with-chrono"] }
-sea-orm-migration = { workspace = true }
-
-[dev-dependencies]
-sea-orm-migration = { workspace = true, features = ["runtime-tokio-rustls"] }
-tokio = { version = "^1", default-features = false, features = [
-	"rt",
-	"macros",
-] }
+[lints]
+workspace = true

crates/db/src/connection.rs

@@ -9,9 +9,12 @@ pub struct Connection(DatabaseConnection);
 impl Connection {
 	/// 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?;
-		Ok(Self(database))
+	pub async fn try_from(db: DatabaseConnection) -> Result<Self, DbErr> {
+		crate::migration::Migrator::down(&db, None).await?;
+		db.get_schema_registry("flix_db::*").sync(&db).await?;
+		db.get_schema_registry("flix_db::*").sync(&db).await?;
+		crate::migration::Migrator::up(&db, None).await?;
+		Ok(Self(db))
 	}
 }
 
@@ -20,3 +23,10 @@ impl AsRef<DatabaseConnection> for Connection {
 		&self.0
 	}
 }
+
+#[cfg(test)]
+impl Connection {
+	pub(crate) fn take(self) -> DatabaseConnection {
+		self.0
+	}
+}

crates/db/src/entity/content.rs

@@ -0,0 +1,892 @@
+//! This module contains entities for storing media file information
+
+/// Library entity
+pub mod libraries {
+	use flix_model::id::LibraryId;
+
+	use seamantic::model::duration::Seconds;
+	use seamantic::model::path::PathBytes;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	/// The database representation of a library media folder
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_libraries")]
+	pub struct Model {
+		/// The library's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: LibraryId,
+		/// The library's directory
+		pub directory: PathBytes,
+		/// The library's last scan data
+		pub last_scan_date: Option<DateTime<Utc>>,
+		/// The library's last scan duration
+		pub last_scan_duration: Option<Seconds>,
+
+		/// Collections that are part of this library
+		#[sea_orm(has_many)]
+		pub collections: HasMany<super::collections::Entity>,
+		/// Movies that are part of this library
+		#[sea_orm(has_many)]
+		pub movies: HasMany<super::movies::Entity>,
+		/// Shows that are part of this library
+		#[sea_orm(has_many)]
+		pub shows: HasMany<super::shows::Entity>,
+		/// Seasons that are part of this library
+		#[sea_orm(has_many)]
+		pub seasons: HasMany<super::seasons::Entity>,
+		/// Episodes that are part of this library
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Collection entity
+pub mod collections {
+	use flix_model::id::{CollectionId, LibraryId};
+
+	use seamantic::model::path::PathBytes;
+
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a collection media folder
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_collections")]
+	pub struct Model {
+		/// The collection's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: CollectionId,
+		/// The collection's parent
+		#[sea_orm(indexed)]
+		pub parent_id: Option<CollectionId>,
+		/// The collection's library ID
+		pub library_id: LibraryId,
+		/// The collection's directory
+		pub directory: PathBytes,
+		/// The collection's poster path
+		pub relative_poster_path: Option<String>,
+
+		/// This collection's parent
+		#[sea_orm(
+			self_ref,
+			relation_enum = "Parent",
+			from = "parent_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub parent: HasOne<Entity>,
+		/// The library this collection belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "library_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub library: HasOne<super::libraries::Entity>,
+		/// The info for this collection
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::collections::Entity>,
+
+		/// The watched info for this collection
+		#[sea_orm(has_many, relation_enum = "Watched", from = "id", to = "id")]
+		pub watched: HasMany<entity::watched::collections::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Movie entity
+pub mod movies {
+	use flix_model::id::{CollectionId, LibraryId, MovieId};
+
+	use seamantic::model::path::PathBytes;
+
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a movie media folder
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_movies")]
+	pub struct Model {
+		/// The movie's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: MovieId,
+		/// The movie's parent
+		#[sea_orm(indexed)]
+		pub parent_id: Option<CollectionId>,
+		/// The movie's library
+		pub library_id: LibraryId,
+		/// The movie's directory
+		pub directory: PathBytes,
+		/// The movie's media path
+		pub relative_media_path: String,
+		/// The movie's poster path
+		pub relative_poster_path: Option<String>,
+
+		/// This movie's parent
+		#[sea_orm(
+			belongs_to,
+			from = "parent_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub parent: HasOne<super::collections::Entity>,
+		/// The library this movie belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "library_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub library: HasOne<super::libraries::Entity>,
+		/// The info for this movie
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::movies::Entity>,
+
+		/// The watched info for this movie
+		#[sea_orm(has_many, relation_enum = "Watched", from = "id", to = "id")]
+		pub watched: HasMany<entity::watched::movies::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Show entity
+pub mod shows {
+	use flix_model::id::{CollectionId, LibraryId, ShowId};
+
+	use seamantic::model::path::PathBytes;
+
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a show media folder
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_shows")]
+	pub struct Model {
+		/// The show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: ShowId,
+		/// The show's parent
+		#[sea_orm(indexed)]
+		pub parent_id: Option<CollectionId>,
+		/// The show's library
+		pub library_id: LibraryId,
+		/// The show's directory
+		pub directory: PathBytes,
+		/// The show's poster path
+		pub relative_poster_path: Option<String>,
+
+		/// This show's parent
+		#[sea_orm(
+			belongs_to,
+			from = "parent_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub parent: HasOne<super::collections::Entity>,
+		/// The library this show belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "library_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub library: HasOne<super::libraries::Entity>,
+		/// The info for this show
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::shows::Entity>,
+
+		/// Seasons that are part of this show
+		#[sea_orm(has_many)]
+		pub seasons: HasMany<super::seasons::Entity>,
+		/// Episodes that are part of this show
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+		/// The watched info for this show
+		#[sea_orm(has_many, relation_enum = "Watched", from = "id", to = "id")]
+		pub watched: HasMany<entity::watched::shows::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Season entity
+pub mod seasons {
+	use flix_model::id::{LibraryId, ShowId};
+	use flix_model::numbers::SeasonNumber;
+
+	use seamantic::model::path::PathBytes;
+
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a season media folder
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_seasons")]
+	pub struct Model {
+		/// The season's show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub show_id: ShowId,
+		/// The season's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub season_number: SeasonNumber,
+		/// The season's library
+		pub library_id: LibraryId,
+		/// The season's directory
+		pub directory: PathBytes,
+		/// The season's poster path
+		pub relative_poster_path: Option<String>,
+
+		/// This season's show
+		#[sea_orm(
+			belongs_to,
+			from = "show_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub show: HasOne<super::shows::Entity>,
+		/// The library this season belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "library_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub library: HasOne<super::libraries::Entity>,
+		/// The info for this season
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "(show_id, season_number)",
+			to = "(show_id, season_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::seasons::Entity>,
+
+		/// Episodes that are part of this show
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+		/// The watched info for this season
+		#[sea_orm(
+			has_many,
+			relation_enum = "Watched",
+			from = "(show_id, season_number)",
+			to = "(show_id, season_number)"
+		)]
+		pub watched: HasMany<entity::watched::seasons::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Episode entity
+pub mod episodes {
+	use flix_model::id::{LibraryId, ShowId};
+	use flix_model::numbers::{EpisodeNumber, SeasonNumber};
+
+	use seamantic::model::path::PathBytes;
+
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a episode media folder
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_episodes")]
+	pub struct Model {
+		/// The episode's show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub show_id: ShowId,
+		/// The episode's season's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub season_number: SeasonNumber,
+		/// The episode's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub episode_number: EpisodeNumber,
+		/// The number of additional contained episodes
+		pub count: u8,
+		/// The episode's library
+		pub library_id: LibraryId,
+		/// The episode's directory
+		pub directory: PathBytes,
+		/// The episode's media path
+		pub relative_media_path: String,
+		/// The episode's poster path
+		pub relative_poster_path: Option<String>,
+
+		/// This episode's show
+		#[sea_orm(
+			belongs_to,
+			from = "show_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub show: HasOne<super::shows::Entity>,
+		/// This episode's season
+		#[sea_orm(
+			belongs_to,
+			from = "(show_id, season_number)",
+			to = "(show_id, season_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub season: HasOne<super::seasons::Entity>,
+		/// The library this episode belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "library_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub library: HasOne<super::libraries::Entity>,
+		/// The info for this episode
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "(show_id, season_number, episode_number)",
+			to = "(show_id, season_number, episode_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::episodes::Entity>,
+
+		/// The watched info for this episode
+		#[sea_orm(
+			has_many,
+			relation_enum = "Watched",
+			from = "(show_id, season_number, episode_number)",
+			to = "(show_id, season_number, episode_number)"
+		)]
+		pub watched: HasMany<entity::watched::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Macros for creating content entities
+#[cfg(test)]
+pub mod test {
+	macro_rules! make_content_library {
+		($db:expr, $id:expr) => {
+			$crate::entity::content::libraries::ActiveModel {
+				id: Set(::flix_model::id::LibraryId::from_raw($id)),
+				directory: Set(::std::path::PathBuf::new().into()),
+				last_scan_date: Set(None),
+				last_scan_duration: Set(None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_content_library;
+
+	macro_rules! make_content_collection {
+		($db:expr, $lid:expr, $id:expr, $pid:expr) => {
+			$crate::entity::info::test::make_info_collection!($db, $id);
+			$crate::entity::content::collections::ActiveModel {
+				id: Set(::flix_model::id::CollectionId::from_raw($id)),
+				parent_id: Set($pid.map(::flix_model::id::CollectionId::from_raw)),
+				library_id: Set(::flix_model::id::LibraryId::from_raw($lid)),
+				directory: Set(::std::path::PathBuf::new().into()),
+				relative_poster_path: Set(::core::option::Option::None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_content_collection;
+
+	macro_rules! make_content_movie {
+		($db:expr, $lid:expr, $id:expr, $pid:expr) => {
+			$crate::entity::info::test::make_info_movie!($db, $id);
+			$crate::entity::content::movies::ActiveModel {
+				id: Set(::flix_model::id::MovieId::from_raw($id)),
+				parent_id: Set($pid.map(::flix_model::id::CollectionId::from_raw)),
+				library_id: Set(::flix_model::id::LibraryId::from_raw($lid)),
+				directory: Set(::std::path::PathBuf::new().into()),
+				relative_media_path: Set(::std::string::String::new()),
+				relative_poster_path: Set(::core::option::Option::None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_content_movie;
+
+	macro_rules! make_content_show {
+		($db:expr, $lid:expr, $id:expr, $pid:expr) => {
+			$crate::entity::info::test::make_info_show!($db, $id);
+			$crate::entity::content::shows::ActiveModel {
+				id: Set(::flix_model::id::ShowId::from_raw($id)),
+				parent_id: Set($pid.map(::flix_model::id::CollectionId::from_raw)),
+				library_id: Set(::flix_model::id::LibraryId::from_raw($lid)),
+				directory: Set(::std::path::PathBuf::new().into()),
+				relative_poster_path: Set(::core::option::Option::None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_content_show;
+
+	macro_rules! make_content_season {
+		($db:expr, $lid:expr, $show:expr, $season:expr) => {
+			$crate::entity::info::test::make_info_season!($db, $show, $season);
+			$crate::entity::content::seasons::ActiveModel {
+				show_id: Set(::flix_model::id::ShowId::from_raw($show)),
+				season_number: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				library_id: Set(::flix_model::id::LibraryId::from_raw($lid)),
+				directory: Set(::std::path::PathBuf::new().into()),
+				relative_poster_path: Set(::core::option::Option::None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_content_season;
+
+	macro_rules! make_content_episode {
+		($db:expr, $lid:expr, $show:expr, $season:expr, $episode:expr) => {
+			make_content_episode!(@make, $db, $lid, $show, $season, $episode, 0);
+		};
+		($db:expr, $lid:literal, $show:literal, $season:literal, $episode:literal, >1) => {
+			make_content_episode!(@make, $db, $lid, $show, $season, $episode, 1);
+		};
+		(@make, $db:expr, $lid:expr, $show:expr, $season:expr, $episode:expr, $count:literal) => {
+			$crate::entity::info::test::make_info_episode!($db, $show, $season, $episode);
+			$crate::entity::content::episodes::ActiveModel {
+				show_id: Set(::flix_model::id::ShowId::from_raw($show)),
+				season_number: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				episode_number: Set(::flix_model::numbers::EpisodeNumber::new($episode)),
+				count: Set($count),
+				library_id: Set(::flix_model::id::LibraryId::from_raw($lid)),
+				directory: Set(::std::path::PathBuf::new().into()),
+				relative_media_path: Set(::std::string::String::new()),
+				relative_poster_path: Set(::core::option::Option::None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_content_episode;
+}
+
+#[cfg(test)]
+mod tests {
+	use core::time::Duration;
+	use std::path::Path;
+
+	use flix_model::id::{CollectionId, LibraryId, MovieId, ShowId};
+
+	use seamantic::model::duration::Seconds;
+
+	use chrono::NaiveDate;
+	use sea_orm::ActiveValue::{NotSet, Set};
+	use sea_orm::entity::prelude::*;
+	use sea_orm::sqlx::error::ErrorKind;
+
+	use crate::entity::content::test::{
+		make_content_collection, make_content_episode, make_content_library, make_content_movie,
+		make_content_season, make_content_show,
+	};
+	use crate::entity::info::test::{
+		make_info_collection, make_info_episode, make_info_movie, make_info_season, make_info_show,
+	};
+	use crate::tests::new_initialized_memory_db;
+
+	use super::super::tests::get_error_kind;
+	use super::super::tests::{noneable, notsettable};
+
+	#[tokio::test]
+	async fn use_test_macros() {
+		let db = new_initialized_memory_db().await;
+
+		make_content_library!(&db, 1);
+		make_content_collection!(&db, 1, 1, None);
+		make_content_movie!(&db, 1, 1, None);
+		make_content_show!(&db, 1, 1, None);
+		make_content_season!(&db, 1, 1, 1);
+		make_content_episode!(&db, 1, 1, 1, 1);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_libraries() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_library {
+			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_library!(@insert, $db, $id $(; $($skip),+)?)
+					.expect("insert");
+
+				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_date, noneable!(last_scan_date, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?));
+				assert_eq!(model.last_scan_duration, noneable!(last_scan_duration, Seconds(Duration::from_secs($id)) $(, $($skip),+)?));
+			};
+			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_library!(@insert, $db, $id $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
+				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_date: notsettable!(last_scan_date, Some(NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc()) $(, $($skip),+)?),
+					last_scan_duration: notsettable!(last_scan_duration, Some(Seconds(Duration::from_secs($id))) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_library!(&db, 1, Success);
+		assert_library!(&db, 1, UniqueViolation);
+		assert_library!(&db, 2, Success);
+		assert_library!(&db, 3, Success; id);
+		assert_library!(&db, 4, NotNullViolation; directory);
+		assert_library!(&db, 5, Success; last_scan_date);
+		assert_library!(&db, 6, Success; last_scan_duration);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_collections() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_collection {
+			($db:expr, $id:literal, $pid:expr, $lid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_collection!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, CollectionId::from_raw($id));
+				assert_eq!(model.parent_id, $pid.map(CollectionId::from_raw));
+				assert_eq!(model.library_id, LibraryId::from_raw($lid));
+				assert_eq!(model.directory, Path::new(concat!("C Directory ", $id)).to_owned().into());
+				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("C Poster ", $id).to_owned() $(, $($skip),+)?));
+			};
+			($db:expr, $id:literal, $pid:expr, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_collection!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $pid:expr, $lid:literal $(; $($skip:ident),+)?) => {
+				super::collections::ActiveModel {
+					id: notsettable!(id, CollectionId::from_raw($id) $(, $($skip),+)?),
+					parent_id: notsettable!(parent_id, $pid.map(CollectionId::from_raw) $(, $($skip),+)?),
+					library_id: notsettable!(library_id, LibraryId::from_raw($lid) $(, $($skip),+)?),
+					directory: notsettable!(directory, Path::new(concat!("C Directory ", $id)).to_owned().into() $(, $($skip),+)?),
+					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("C Poster ", $id).to_owned()) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_content_library!(&db, 1);
+		assert_collection!(&db, 1, None, 1, ForeignKeyViolation);
+		make_info_collection!(&db, 1);
+		assert_collection!(&db, 1, None, 1, Success);
+		make_info_collection!(&db, 2);
+		assert_collection!(&db, 2, None, 2, ForeignKeyViolation);
+		make_content_library!(&db, 2);
+		assert_collection!(&db, 2, None, 2, Success);
+
+		assert_collection!(&db, 1, None, 1, UniqueViolation);
+		make_info_collection!(&db, 3);
+		make_info_collection!(&db, 4);
+		make_info_collection!(&db, 5);
+		make_info_collection!(&db, 6);
+		make_info_collection!(&db, 7);
+		make_info_collection!(&db, 8);
+		assert_collection!(&db, 3, None, 1, Success; id);
+		assert_collection!(&db, 4, None, 1, Success; parent_id);
+		assert_collection!(&db, 5, None, 1, NotNullViolation; library_id);
+		assert_collection!(&db, 6, None, 1, NotNullViolation; directory);
+		assert_collection!(&db, 7, None, 1, Success; relative_poster_path);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_movies() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_movie {
+			($db:expr, $id:literal, $pid:expr, $lid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, MovieId::from_raw($id));
+				assert_eq!(model.parent_id, $pid.map(CollectionId::from_raw));
+				assert_eq!(model.library_id, LibraryId::from_raw($lid));
+				assert_eq!(model.directory, Path::new(concat!("M Directory ", $id)).to_owned().into());
+				assert_eq!(model.relative_media_path, concat!("M Media ", $id));
+				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("M Poster ", $id).to_owned() $(, $($skip),+)?));
+			};
+			($db:expr, $id:literal, $pid:expr, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $pid:expr, $lid:literal $(; $($skip:ident),+)?) => {
+				super::movies::ActiveModel {
+					id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
+					parent_id: notsettable!(parent_id, $pid.map(CollectionId::from_raw) $(, $($skip),+)?),
+					library_id: notsettable!(library_id, LibraryId::from_raw($lid) $(, $($skip),+)?),
+					directory: notsettable!(directory, Path::new(concat!("M Directory ", $id)).to_owned().into() $(, $($skip),+)?),
+					relative_media_path: notsettable!(relative_media_path, concat!("M Media ", $id).to_owned() $(, $($skip),+)?),
+					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("M Poster ", $id).to_owned()) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_content_library!(&db, 1);
+		assert_movie!(&db, 1, None, 1, ForeignKeyViolation);
+		make_info_movie!(&db, 1);
+		assert_movie!(&db, 1, Some(1), 1, ForeignKeyViolation);
+		make_content_collection!(&db, 1, 1, None);
+		assert_movie!(&db, 1, Some(1), 1, Success);
+		assert_movie!(&db, 2, None, 2, ForeignKeyViolation);
+		make_info_movie!(&db, 2);
+		assert_movie!(&db, 2, None, 2, ForeignKeyViolation);
+		make_content_library!(&db, 2);
+		assert_movie!(&db, 2, None, 2, Success);
+
+		assert_movie!(&db, 1, None, 1, UniqueViolation);
+		make_info_movie!(&db, 3);
+		make_info_movie!(&db, 4);
+		make_info_movie!(&db, 5);
+		make_info_movie!(&db, 6);
+		make_info_movie!(&db, 7);
+		make_info_movie!(&db, 8);
+		make_info_movie!(&db, 9);
+		assert_movie!(&db, 3, None, 1, Success; id);
+		assert_movie!(&db, 4, None, 1, Success; parent_id);
+		assert_movie!(&db, 5, None, 1, NotNullViolation; library_id);
+		assert_movie!(&db, 6, None, 1, NotNullViolation; directory);
+		assert_movie!(&db, 7, None, 1, NotNullViolation; relative_media_path);
+		assert_movie!(&db, 8, None, 1, Success; relative_poster_path);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_shows() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_show {
+			($db:expr, $id:literal, $pid:expr, $lid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_show!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, ShowId::from_raw($id));
+				assert_eq!(model.parent_id, $pid.map(CollectionId::from_raw));
+				assert_eq!(model.library_id, LibraryId::from_raw($lid));
+				assert_eq!(model.directory, Path::new(concat!("S Directory ", $id)).to_owned().into());
+				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("S Poster ", $id).to_owned() $(, $($skip),+)?));
+			};
+			($db:expr, $id:literal, $pid:expr, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_show!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $pid:expr, $lid:literal $(; $($skip:ident),+)?) => {
+				super::shows::ActiveModel {
+					id: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
+					parent_id: notsettable!(parent_id, $pid.map(CollectionId::from_raw) $(, $($skip),+)?),
+					library_id: notsettable!(library_id, LibraryId::from_raw($lid) $(, $($skip),+)?),
+					directory: notsettable!(directory, Path::new(concat!("S Directory ", $id)).to_owned().into() $(, $($skip),+)?),
+					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("S Poster ", $id).to_owned()) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_content_library!(&db, 1);
+		assert_show!(&db, 1, None, 1, ForeignKeyViolation);
+		make_info_show!(&db, 1);
+		assert_show!(&db, 1, Some(1), 1, ForeignKeyViolation);
+		make_content_collection!(&db, 1, 1, None);
+		assert_show!(&db, 1, Some(1), 1, Success);
+		assert_show!(&db, 2, None, 2, ForeignKeyViolation);
+		make_info_show!(&db, 2);
+		assert_show!(&db, 2, None, 2, ForeignKeyViolation);
+		make_content_library!(&db, 2);
+		assert_show!(&db, 2, None, 2, Success);
+
+		assert_show!(&db, 1, None, 1, UniqueViolation);
+		make_info_show!(&db, 3);
+		make_info_show!(&db, 4);
+		make_info_show!(&db, 5);
+		make_info_show!(&db, 6);
+		make_info_show!(&db, 7);
+		make_info_show!(&db, 8);
+		assert_show!(&db, 3, None, 1, Success; id);
+		assert_show!(&db, 4, None, 1, Success; parent_id);
+		assert_show!(&db, 5, None, 1, NotNullViolation; library_id);
+		assert_show!(&db, 6, None, 1, NotNullViolation; directory);
+		assert_show!(&db, 7, None, 1, Success; relative_poster_path);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_seasons() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_season {
+			($db:expr, $id:literal, $season:literal, $lid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_season!(@insert, $db, $id, $season, $lid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.show_id, ShowId::from_raw($id));
+				assert_eq!(model.season_number, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.library_id, LibraryId::from_raw($lid));
+				assert_eq!(model.directory, Path::new(concat!("SS Directory ", $id, ",", $season)).to_owned().into());
+				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("SS Poster ", $id, ",", $season).to_owned() $(, $($skip),+)?));
+			};
+			($db:expr, $id:literal, $season:literal, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_season!(@insert, $db, $id, $season, $lid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $season:literal, $lid:literal $(; $($skip:ident),+)?) => {
+				super::seasons::ActiveModel {
+					show_id: notsettable!(show_id, ShowId::from_raw($id) $(, $($skip),+)?),
+					season_number: notsettable!(season_number, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					library_id: notsettable!(library_id, LibraryId::from_raw($lid) $(, $($skip),+)?),
+					directory: notsettable!(directory, Path::new(concat!("SS Directory ", $id, ",", $season)).to_owned().into() $(, $($skip),+)?),
+					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("SS Poster ", $id, ",", $season).to_owned()) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_content_library!(&db, 1);
+		make_content_show!(&db, 1, 1, None);
+		assert_season!(&db, 1, 1, 1, ForeignKeyViolation);
+		make_info_season!(&db, 1, 1);
+		assert_season!(&db, 1, 1, 1, Success);
+
+		assert_season!(&db, 1, 1, 1, UniqueViolation);
+		make_info_season!(&db, 1, 3);
+		make_info_season!(&db, 1, 4);
+		make_info_season!(&db, 1, 5);
+		make_info_season!(&db, 1, 6);
+		make_info_season!(&db, 1, 7);
+		make_info_season!(&db, 1, 8);
+		assert_season!(&db, 1, 3, 1, NotNullViolation; show_id);
+		assert_season!(&db, 1, 4, 1, NotNullViolation; season_number);
+		assert_season!(&db, 1, 5, 1, NotNullViolation; library_id);
+		assert_season!(&db, 1, 6, 1, NotNullViolation; directory);
+		assert_season!(&db, 1, 7, 1, Success; relative_poster_path);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_episodes() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_episode {
+			($db:expr, $id:literal, $season:literal, $episode:literal, $lid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $id, $season, $episode, $lid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.show_id, ShowId::from_raw($id));
+				assert_eq!(model.season_number, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.episode_number, ::flix_model::numbers::EpisodeNumber::new($episode));
+				assert_eq!(model.library_id, LibraryId::from_raw($lid));
+				assert_eq!(model.directory, Path::new(concat!("SS Directory ", $id, ",", $season, $episode)).to_owned().into());
+				assert_eq!(model.relative_media_path, concat!("SS Media ", $id, ",", $season, $episode));
+				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("SS Poster ", $id, ",", $season, $episode).to_owned() $(, $($skip),+)?));
+			};
+			($db:expr, $id:literal, $season:literal, $episode:literal, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $id, $season, $episode, $lid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $season:literal, $episode:literal, $lid:literal $(; $($skip:ident),+)?) => {
+				super::episodes::ActiveModel {
+					show_id: notsettable!(show_id, ShowId::from_raw($id) $(, $($skip),+)?),
+					season_number: notsettable!(season_number, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					episode_number: notsettable!(episode_number, ::flix_model::numbers::EpisodeNumber::new($episode) $(, $($skip),+)?),
+					count: notsettable!(count, 0 $(, $($skip),+)?),
+					library_id: notsettable!(library_id, LibraryId::from_raw($lid) $(, $($skip),+)?),
+					directory: notsettable!(directory, Path::new(concat!("SS Directory ", $id, ",", $season, $episode)).to_owned().into() $(, $($skip),+)?),
+					relative_media_path: notsettable!(relative_media_path, concat!("SS Media ", $id, ",", $season, $episode).to_owned() $(, $($skip),+)?),
+					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("SS Poster ", $id, ",", $season, $episode).to_owned()) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_content_library!(&db, 1);
+		make_content_show!(&db, 1, 1, None);
+		make_content_season!(&db, 1, 1, 1);
+		assert_episode!(&db, 1, 1, 1, 1, ForeignKeyViolation);
+		make_info_episode!(&db, 1, 1, 1);
+		assert_episode!(&db, 1, 1, 1, 1, Success);
+
+		assert_episode!(&db, 1, 1, 1, 1, UniqueViolation);
+		make_info_episode!(&db, 1, 1, 3);
+		make_info_episode!(&db, 1, 1, 4);
+		make_info_episode!(&db, 1, 1, 5);
+		make_info_episode!(&db, 1, 1, 6);
+		make_info_episode!(&db, 1, 1, 7);
+		make_info_episode!(&db, 1, 1, 8);
+		make_info_episode!(&db, 1, 1, 9);
+		make_info_episode!(&db, 1, 1, 10);
+		assert_episode!(&db, 1, 1, 3, 1, NotNullViolation; show_id);
+		assert_episode!(&db, 1, 1, 4, 1, NotNullViolation; season_number);
+		assert_episode!(&db, 1, 1, 5, 1, NotNullViolation; episode_number);
+		assert_episode!(&db, 1, 1, 6, 1, NotNullViolation; library_id);
+		assert_episode!(&db, 1, 1, 7, 1, NotNullViolation; directory);
+		assert_episode!(&db, 1, 1, 8, 1, NotNullViolation; relative_media_path);
+		assert_episode!(&db, 1, 1, 9, 1, Success; relative_poster_path);
+	}
+}

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

@@ -1,96 +0,0 @@
-//! Collection entity
-
-use flix_model::id::{CollectionId, LibraryId};
-
-use seamantic::model::path::PathBytes;
-
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a collection media folder
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_collections")]
-pub struct Model {
-	/// The collection's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: CollectionId,
-	/// The collection's parent
-	pub parent: Option<CollectionId>,
-	/// The collection's slug
-	pub slug: String,
-	/// The collection's library ID
-	pub library: LibraryId,
-	/// The collection's directory
-	pub directory: PathBytes,
-	/// The collection's poster path
-	pub relative_poster_path: Option<String>,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The parent collection of this collection
-	#[sea_orm(
-		belongs_to = "super::collections::Entity",
-		from = "Column::Parent",
-		to = "super::collections::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Parent,
-	/// The library this collection belongs to
-	#[sea_orm(
-		belongs_to = "super::libraries::Entity",
-		from = "Column::Library",
-		to = "super::libraries::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Library,
-	/// The media info for this collection
-	#[sea_orm(
-		belongs_to = "super::super::info::collections::Entity",
-		from = "Column::Id",
-		to = "super::super::info::collections::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	MediaInfo,
-	/// The watched info for this collection
-	#[sea_orm(
-		belongs_to = "super::super::watched::collections::Entity",
-		from = "Column::Id",
-		to = "super::super::watched::collections::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	WatchInfo,
-}
-
-impl Related<super::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Parent.def()
-	}
-}
-
-impl Related<super::libraries::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Library.def()
-	}
-}
-
-impl Related<super::super::info::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::MediaInfo.def()
-	}
-}
-
-impl Related<super::super::watched::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::WatchInfo.def()
-	}
-}

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

@@ -1,90 +0,0 @@
-//! Episode entity
-
-use flix_model::id::{LibraryId, ShowId};
-
-use seamantic::model::path::PathBytes;
-
-use flix_model::numbers::{EpisodeNumber, SeasonNumber};
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a episode media folder
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_episodes")]
-pub struct Model {
-	/// The episode's show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub show: ShowId,
-	/// The episode's season's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub season: SeasonNumber,
-	/// The episode's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub episode: EpisodeNumber,
-	/// The number of additional contained episodes
-	pub count: u8,
-	/// The episode's slug
-	pub slug: String,
-	/// The episode's library
-	pub library: LibraryId,
-	/// The episode's directory
-	pub directory: PathBytes,
-	/// The episode's media path
-	pub relative_media_path: String,
-	/// The episode's poster path
-	pub relative_poster_path: Option<String>,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The library this episode belongs to
-	#[sea_orm(
-		belongs_to = "super::libraries::Entity",
-		from = "Column::Library",
-		to = "super::libraries::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Library,
-	/// The media info for this episode
-	#[sea_orm(
-		belongs_to = "super::super::info::episodes::Entity",
-		from = "(Column::Show, Column::Season, Column::Episode)",
-		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"
-	)]
-	MediaInfo,
-	/// The watched info for this episode
-	#[sea_orm(
-		belongs_to = "super::super::watched::episodes::Entity",
-		from = "(Column::Show, Column::Season, Column::Episode)",
-		to = "(super::super::watched::episodes::Column::Show, super::super::watched::episodes::Column::Season, super::super::watched::episodes::Column::Episode)",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	WatchInfo,
-}
-
-impl Related<super::libraries::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Library.def()
-	}
-}
-
-impl Related<super::super::info::episodes::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::MediaInfo.def()
-	}
-}
-
-impl Related<super::super::watched::episodes::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::WatchInfo.def()
-	}
-}

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

@@ -1,73 +0,0 @@
-//! Library entity
-
-use flix_model::id::LibraryId;
-
-use seamantic::model::path::PathBytes;
-
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a library media folder
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_libraries")]
-pub struct Model {
-	/// The library's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: LibraryId,
-	/// The library's directory
-	pub directory: PathBytes,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// All collections in this library
-	#[sea_orm(has_many = "super::collections::Entity")]
-	Collections,
-	#[sea_orm(has_many = "super::movies::Entity")]
-	/// All movies in this library
-	Movies,
-	#[sea_orm(has_many = "super::shows::Entity")]
-	/// All shows in this library
-	Shows,
-	#[sea_orm(has_many = "super::seasons::Entity")]
-	/// All seasons in this library
-	Seasons,
-	#[sea_orm(has_many = "super::episodes::Entity")]
-	/// All episodes in this library
-	Episodes,
-}
-
-impl Related<super::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Collections.def()
-	}
-}
-
-impl Related<super::movies::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Movies.def()
-	}
-}
-
-impl Related<super::shows::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Shows.def()
-	}
-}
-
-impl Related<super::seasons::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Seasons.def()
-	}
-}
-
-impl Related<super::episodes::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Episodes.def()
-	}
-}

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

@@ -1,342 +0,0 @@
-//! This module contains entities for storing media file information
-
-pub mod libraries;
-
-pub mod collections;
-
-pub mod movies;
-
-pub mod episodes;
-pub mod seasons;
-pub mod shows;
-
-#[cfg(test)]
-mod tests {
-	use std::path::Path;
-
-	use flix_model::id::{CollectionId, LibraryId, MovieId, ShowId};
-
-	use sea_orm::ActiveModelTrait;
-	use sea_orm::ActiveValue::{NotSet, Set};
-	use sea_orm::sqlx::error::ErrorKind;
-	use sea_orm_migration::MigratorTrait;
-
-	use crate::migration::Migrator;
-	use crate::tests::new_memory_db;
-
-	use super::super::tests::get_error_kind;
-	use super::super::tests::{
-		make_flix_collection, make_flix_episode, make_flix_movie, make_flix_season, make_flix_show,
-	};
-	use super::super::tests::{noneable, notsettable};
-
-	#[tokio::test]
-	async fn test_inserts() {
-		let db = new_memory_db().await;
-		Migrator::up(&db, None).await.expect("up");
-
-		// Libraries
-		macro_rules! assert_library {
-			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_library!(@insert, $db, $id $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, LibraryId::from_raw($id));
-				assert_eq!(model.directory, Path::new(concat!("/L/", $id)).to_owned().into());
-			};
-			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_library!(@insert, $db, $id $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
-				super::libraries::ActiveModel {
-					id: notsettable!(id, LibraryId::from_raw($id) $(, $($skip),+)?),
-					directory: notsettable!(directory, Path::new(concat!("/L/", $id)).to_owned().into() $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_library!(&db, 1, Success);
-		assert_library!(&db, 1, UniqueViolation);
-		assert_library!(&db, 2, Success);
-		assert_library!(&db, 3, Success; id);
-		assert_library!(&db, 4, NotNullViolation; directory);
-
-		// Collections
-		macro_rules! assert_collection {
-			($db:expr, $id:literal, $pid:expr, $lid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_collection!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, CollectionId::from_raw($id));
-				assert_eq!(model.parent, $pid);
-				assert_eq!(model.slug, concat!("C/", $id).to_string());
-				assert_eq!(model.library, LibraryId::from_raw($lid));
-				assert_eq!(model.directory, Path::new(concat!("/C/", $id)).to_owned().into());
-				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("C/Poster", $id).to_owned() $(, $($skip),+)?));
-			};
-			($db:expr, $id:literal, $pid:expr, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_collection!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $pid:expr, $lid:literal $(; $($skip:ident),+)?) => {
-				super::collections::ActiveModel {
-					id: notsettable!(id, CollectionId::from_raw($id) $(, $($skip),+)?),
-					parent: notsettable!(parent, $pid $(, $($skip),+)?),
-					slug: notsettable!(slug, concat!("C/", $id).to_string() $(, $($skip),+)?),
-					library: notsettable!(library, LibraryId::from_raw($lid) $(, $($skip),+)?),
-					directory: notsettable!(directory, Path::new(concat!("/C/", $id)).to_owned().into() $(, $($skip),+)?),
-					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("C/Poster", $id).to_owned()) $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_collection!(&db, 1, None, 0, ForeignKeyViolation);
-		assert_collection!(
-			&db,
-			1,
-			Some(CollectionId::from_raw(0)),
-			1,
-			ForeignKeyViolation
-		);
-		assert_collection!(&db, 1, None, 1, ForeignKeyViolation);
-		make_flix_collection!(&db, 1);
-		make_flix_collection!(&db, 2);
-		make_flix_collection!(&db, 3);
-		make_flix_collection!(&db, 4);
-		make_flix_collection!(&db, 8);
-
-		assert_collection!(&db, 1, None, 1, Success);
-		assert_collection!(&db, 1, None, 1, UniqueViolation);
-		assert_collection!(&db, 2, None, 1, Success);
-		assert_collection!(&db, 3, None, 1, Success; id);
-		assert_collection!(&db, 4, None, 1, Success; parent);
-		assert_collection!(&db, 5, None, 1, NotNullViolation; slug);
-		assert_collection!(&db, 6, None, 1, NotNullViolation; library);
-		assert_collection!(&db, 7, None, 1, NotNullViolation; directory);
-		assert_collection!(&db, 8, None, 1, Success; relative_poster_path);
-
-		// Movies
-		macro_rules! assert_movie {
-			($db:expr, $id:literal, $pid:expr, $lid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_movie!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, MovieId::from_raw($id));
-				assert_eq!(model.parent, $pid);
-				assert_eq!(model.slug, concat!("M/", $id).to_string());
-				assert_eq!(model.library, LibraryId::from_raw($lid));
-				assert_eq!(model.directory, Path::new(concat!("/M/", $id)).to_owned().into());
-				assert_eq!(model.relative_media_path, concat!("M/Media", $id));
-				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("M/Poster", $id).to_owned() $(, $($skip),+)?));
-			};
-			($db:expr, $id:literal, $pid:expr, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_movie!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $pid:expr, $lid:literal $(; $($skip:ident),+)?) => {
-				super::movies::ActiveModel {
-					id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
-					parent: notsettable!(parent, $pid $(, $($skip),+)?),
-					slug: notsettable!(slug, concat!("M/", $id).to_string() $(, $($skip),+)?),
-					library: notsettable!(library, LibraryId::from_raw($lid) $(, $($skip),+)?),
-					directory: notsettable!(directory, Path::new(concat!("/M/", $id)).to_owned().into() $(, $($skip),+)?),
-					relative_media_path: notsettable!(relative_media_path, concat!("M/Media", $id).to_owned() $(, $($skip),+)?),
-					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("M/Poster", $id).to_owned()) $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_movie!(&db, 1, None, 0, ForeignKeyViolation);
-		assert_movie!(
-			&db,
-			1,
-			Some(CollectionId::from_raw(0)),
-			1,
-			ForeignKeyViolation
-		);
-		assert_movie!(&db, 1, None, 1, ForeignKeyViolation);
-		make_flix_movie!(&db, 1);
-		make_flix_movie!(&db, 2);
-		make_flix_movie!(&db, 3);
-		make_flix_movie!(&db, 4);
-		make_flix_movie!(&db, 9);
-
-		assert_movie!(&db, 1, None, 1, Success);
-		assert_movie!(&db, 1, None, 1, UniqueViolation);
-		assert_movie!(&db, 2, None, 1, Success);
-		assert_movie!(&db, 3, None, 1, Success; id);
-		assert_movie!(&db, 4, None, 1, Success; parent);
-		assert_movie!(&db, 5, None, 1, NotNullViolation; slug);
-		assert_movie!(&db, 6, None, 1, NotNullViolation; library);
-		assert_movie!(&db, 7, None, 1, NotNullViolation; directory);
-		assert_movie!(&db, 8, None, 1, NotNullViolation; relative_media_path);
-		assert_movie!(&db, 9, None, 1, Success; relative_poster_path);
-
-		// Shows
-		macro_rules! assert_show {
-			($db:expr, $id:literal, $pid:expr, $lid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_show!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, ShowId::from_raw($id));
-				assert_eq!(model.parent, $pid);
-				assert_eq!(model.slug, concat!("S/", $id).to_string());
-				assert_eq!(model.library, LibraryId::from_raw($lid));
-				assert_eq!(model.directory, Path::new(concat!("/S/", $id)).to_owned().into());
-				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("S/Poster", $id).to_owned() $(, $($skip),+)?));
-			};
-			($db:expr, $id:literal, $pid:expr, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_show!(@insert, $db, $id, $pid, $lid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $pid:expr, $lid:literal $(; $($skip:ident),+)?) => {
-				super::shows::ActiveModel {
-					id: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
-					parent: notsettable!(parent, $pid $(, $($skip),+)?),
-					slug: notsettable!(slug, concat!("S/", $id).to_string() $(, $($skip),+)?),
-					library: notsettable!(library, LibraryId::from_raw($lid) $(, $($skip),+)?),
-					directory: notsettable!(directory, Path::new(concat!("/S/", $id)).to_owned().into() $(, $($skip),+)?),
-					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("S/Poster", $id).to_owned()) $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_show!(&db, 1, None, 0, ForeignKeyViolation);
-		assert_show!(
-			&db,
-			1,
-			Some(CollectionId::from_raw(0)),
-			1,
-			ForeignKeyViolation
-		);
-		assert_show!(&db, 1, None, 1, ForeignKeyViolation);
-		make_flix_show!(&db, 1);
-		make_flix_show!(&db, 2);
-		make_flix_show!(&db, 3);
-		make_flix_show!(&db, 4);
-		make_flix_show!(&db, 8);
-
-		assert_show!(&db, 1, None, 1, Success);
-		assert_show!(&db, 1, None, 1, UniqueViolation);
-		assert_show!(&db, 2, None, 1, Success);
-		assert_show!(&db, 3, None, 1, Success; id);
-		assert_show!(&db, 4, None, 1, Success; parent);
-		assert_show!(&db, 5, None, 1, NotNullViolation; slug);
-		assert_show!(&db, 6, None, 1, NotNullViolation; library);
-		assert_show!(&db, 7, None, 1, NotNullViolation; directory);
-		assert_show!(&db, 8, None, 1, Success; relative_poster_path);
-
-		// Seasons
-		macro_rules! assert_season {
-			($db:expr, $id:literal, $season:literal, $lid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_season!(@insert, $db, $id, $season, $lid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.show, ShowId::from_raw($id));
-				assert_eq!(model.season, $season);
-				assert_eq!(model.slug, concat!("S/S", $id).to_string());
-				assert_eq!(model.library, LibraryId::from_raw($lid));
-				assert_eq!(model.directory, Path::new(concat!("/S/S", $id)).to_owned().into());
-				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("S/S/Poster", $id).to_owned() $(, $($skip),+)?));
-			};
-			($db:expr, $id:literal, $season:literal, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_season!(@insert, $db, $id, $season, $lid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $season:literal, $lid:literal $(; $($skip:ident),+)?) => {
-				super::seasons::ActiveModel {
-					show: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
-					season: notsettable!(season, $season $(, $($skip),+)?),
-					slug: notsettable!(slug, concat!("S/S", $id).to_string() $(, $($skip),+)?),
-					library: notsettable!(library, LibraryId::from_raw($lid) $(, $($skip),+)?),
-					directory: notsettable!(directory, Path::new(concat!("/S/S", $id)).to_owned().into() $(, $($skip),+)?),
-					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("S/S/Poster", $id).to_owned()) $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_season!(&db, 1, 1, 0, ForeignKeyViolation);
-		assert_season!(&db, 1, 1, 1, ForeignKeyViolation);
-		make_flix_season!(&db, 1, 1);
-		make_flix_season!(&db, 1, 2);
-		make_flix_season!(&db, 2, 1);
-		make_flix_season!(&db, 3, 1);
-		make_flix_season!(&db, 8, 1);
-
-		assert_season!(&db, 1, 1, 1, Success);
-		assert_season!(&db, 1, 2, 1, Success);
-		assert_season!(&db, 1, 1, 1, UniqueViolation);
-		assert_season!(&db, 2, 1, 1, Success);
-		assert_season!(&db, 3, 1, 1, Success; show);
-		assert_season!(&db, 4, 1, 1, NotNullViolation; season);
-		assert_season!(&db, 5, 1, 1, NotNullViolation; slug);
-		assert_season!(&db, 6, 1, 1, NotNullViolation; library);
-		assert_season!(&db, 7, 1, 1, NotNullViolation; directory);
-		assert_season!(&db, 8, 1, 1, Success; relative_poster_path);
-
-		// Episodes
-		macro_rules! assert_episode {
-			($db:expr, $id:literal, $season:literal, $episode:literal, $lid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_episode!(@insert, $db, $id, $season, $episode, $lid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.show, ShowId::from_raw($id));
-				assert_eq!(model.season, $season);
-				assert_eq!(model.episode, $episode);
-				assert_eq!(model.slug, concat!("S/S/E", $id).to_string());
-				assert_eq!(model.library, LibraryId::from_raw($lid));
-				assert_eq!(model.directory, Path::new(concat!("/S/S/E", $id)).to_owned().into());
-				assert_eq!(model.relative_media_path, concat!("E/Media", $id));
-				assert_eq!(model.relative_poster_path, noneable!(relative_poster_path, concat!("S/S/E/Poster", $id).to_owned() $(, $($skip),+)?));
-			};
-			($db:expr, $id:literal, $season:literal, $episode:literal, $lid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_episode!(@insert, $db, $id, $season, $episode, $lid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $season:literal, $episode:literal, $lid:literal $(; $($skip:ident),+)?) => {
-				super::episodes::ActiveModel {
-					show: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
-					season: notsettable!(season, $season $(, $($skip),+)?),
-					episode: notsettable!(episode, $episode $(, $($skip),+)?),
-					count: notsettable!(count, 0 $(, $($skip),+)?),
-					slug: notsettable!(slug, concat!("S/S/E", $id).to_string() $(, $($skip),+)?),
-					library: notsettable!(library, LibraryId::from_raw($lid) $(, $($skip),+)?),
-					directory: notsettable!(directory, Path::new(concat!("/S/S/E", $id)).to_owned().into() $(, $($skip),+)?),
-					relative_media_path: notsettable!(relative_media_path, concat!("E/Media", $id).to_owned() $(, $($skip),+)?),
-					relative_poster_path: notsettable!(relative_poster_path, Some(concat!("S/S/E/Poster", $id).to_owned()) $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_episode!(&db, 1, 1, 1, 0, ForeignKeyViolation);
-		assert_episode!(&db, 1, 1, 1, 1, ForeignKeyViolation);
-		make_flix_episode!(&db, 1, 1, 1);
-		make_flix_episode!(&db, 1, 1, 2);
-		make_flix_episode!(&db, 2, 1, 1);
-		make_flix_episode!(&db, 3, 1, 1);
-		make_flix_show!(&db, 11);
-		make_flix_season!(&db, 11, 1);
-		make_flix_episode!(&db, 11, 1, 1);
-
-		assert_episode!(&db, 1, 1, 1, 1, Success);
-		assert_episode!(&db, 1, 1, 2, 1, Success);
-		assert_episode!(&db, 1, 1, 1, 1, UniqueViolation);
-		assert_episode!(&db, 2, 1, 1, 1, Success);
-		assert_episode!(&db, 3, 1, 1, 1, Success; show);
-		assert_episode!(&db, 4, 1, 1, 1, NotNullViolation; season);
-		assert_episode!(&db, 5, 1, 1, 1, NotNullViolation; episode);
-		assert_episode!(&db, 6, 1, 1, 1, NotNullViolation; count);
-		assert_episode!(&db, 7, 1, 1, 1, NotNullViolation; slug);
-		assert_episode!(&db, 8, 1, 1, 1, NotNullViolation; library);
-		assert_episode!(&db, 9, 1, 1, 1, NotNullViolation; directory);
-		assert_episode!(&db, 10, 1, 1, 1, NotNullViolation; relative_media_path);
-		assert_episode!(&db, 11, 1, 1, 1, Success; relative_poster_path);
-	}
-}

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

@@ -1,98 +0,0 @@
-//! Movie entity
-
-use flix_model::id::{CollectionId, LibraryId, MovieId};
-
-use seamantic::model::path::PathBytes;
-
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a movie media folder
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_movies")]
-pub struct Model {
-	/// The movie's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: MovieId,
-	/// The movie's parent
-	pub parent: Option<CollectionId>,
-	/// The movie's slug
-	pub slug: String,
-	/// The movie's library
-	pub library: LibraryId,
-	/// The movie's directory
-	pub directory: PathBytes,
-	/// The movie's media path
-	pub relative_media_path: String,
-	/// The movie's poster path
-	pub relative_poster_path: Option<String>,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The parent collection of this collection
-	#[sea_orm(
-		belongs_to = "super::collections::Entity",
-		from = "Column::Parent",
-		to = "super::collections::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Parent,
-	/// The library this movie belongs to
-	#[sea_orm(
-		belongs_to = "super::libraries::Entity",
-		from = "Column::Library",
-		to = "super::libraries::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Library,
-	/// The media info for this movie
-	#[sea_orm(
-		belongs_to = "super::super::info::movies::Entity",
-		from = "Column::Id",
-		to = "super::super::info::movies::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	MediaInfo,
-	/// The watched info for this movie
-	#[sea_orm(
-		belongs_to = "super::super::watched::movies::Entity",
-		from = "Column::Id",
-		to = "super::super::watched::movies::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	WatchInfo,
-}
-
-impl Related<super::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Parent.def()
-	}
-}
-
-impl Related<super::libraries::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Library.def()
-	}
-}
-
-impl Related<super::super::info::movies::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::MediaInfo.def()
-	}
-}
-
-impl Related<super::super::watched::movies::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::WatchInfo.def()
-	}
-}

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

@@ -1,83 +0,0 @@
-//! Season entity
-
-use flix_model::id::{LibraryId, ShowId};
-
-use seamantic::model::path::PathBytes;
-
-use flix_model::numbers::SeasonNumber;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a season media folder
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_seasons")]
-pub struct Model {
-	/// The season's show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub show: ShowId,
-	/// The season's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub season: SeasonNumber,
-	/// The season's slug
-	pub slug: String,
-	/// The season's library
-	pub library: LibraryId,
-	/// The season's directory
-	pub directory: PathBytes,
-	/// The season's poster path
-	pub relative_poster_path: Option<String>,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The library this season belongs to
-	#[sea_orm(
-		belongs_to = "super::libraries::Entity",
-		from = "Column::Library",
-		to = "super::libraries::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Library,
-	/// The media info for this show
-	#[sea_orm(
-		belongs_to = "super::super::info::seasons::Entity",
-		from = "(Column::Show, Column::Season)",
-		to = "(super::super::info::seasons::Column::Show, super::super::info::seasons::Column::Season)",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	MediaInfo,
-	/// The watched info for this show
-	#[sea_orm(
-		belongs_to = "super::super::watched::seasons::Entity",
-		from = "(Column::Show, Column::Season)",
-		to = "(super::super::watched::seasons::Column::Show, super::super::watched::seasons::Column::Season)",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	WatchInfo,
-}
-
-impl Related<super::libraries::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Library.def()
-	}
-}
-
-impl Related<super::super::info::seasons::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::MediaInfo.def()
-	}
-}
-
-impl Related<super::super::watched::seasons::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::WatchInfo.def()
-	}
-}

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

@@ -1,96 +0,0 @@
-//! Show entity
-
-use flix_model::id::{CollectionId, LibraryId, ShowId};
-
-use seamantic::model::path::PathBytes;
-
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a show media folder
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_shows")]
-pub struct Model {
-	/// The show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: ShowId,
-	/// The show's parent
-	pub parent: Option<CollectionId>,
-	/// The show's slug
-	pub slug: String,
-	/// The show's library
-	pub library: LibraryId,
-	/// The show's directory
-	pub directory: PathBytes,
-	/// The show's poster path
-	pub relative_poster_path: Option<String>,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The parent collection of this collection
-	#[sea_orm(
-		belongs_to = "super::collections::Entity",
-		from = "Column::Parent",
-		to = "super::collections::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Parent,
-	/// The library this show belongs to
-	#[sea_orm(
-		belongs_to = "super::libraries::Entity",
-		from = "Column::Library",
-		to = "super::libraries::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Library,
-	/// The media info for this show
-	#[sea_orm(
-		belongs_to = "super::super::info::shows::Entity",
-		from = "Column::Id",
-		to = "super::super::info::shows::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	MediaInfo,
-	/// The watched info for this show
-	#[sea_orm(
-		belongs_to = "super::super::watched::shows::Entity",
-		from = "Column::Id",
-		to = "super::super::watched::shows::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	WatchInfo,
-}
-
-impl Related<super::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Parent.def()
-	}
-}
-
-impl Related<super::libraries::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Library.def()
-	}
-}
-
-impl Related<super::super::info::shows::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::MediaInfo.def()
-	}
-}
-
-impl Related<super::super::watched::shows::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::WatchInfo.def()
-	}
-}

crates/db/src/entity/info.rs

@@ -0,0 +1,622 @@
+//! This module contains entities for storing media information such as
+//! titles and overviews
+
+/// Collection entity
+pub mod collections {
+	use flix_model::id::CollectionId;
+
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a flix collection
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_info_collections")]
+	pub struct Model {
+		/// The collection's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: CollectionId,
+		/// The collection's title
+		pub title: String,
+		/// The collection's overview
+		pub overview: String,
+
+		/// The sortable title
+		#[sea_orm(indexed)]
+		pub sort_title: String,
+		/// The filesystem-safe slug
+		#[sea_orm(indexed, unique)]
+		pub fs_slug: String,
+		/// The url-safe slug
+		#[sea_orm(indexed, unique)]
+		pub web_slug: String,
+
+		/// Potential content for this collection
+		#[sea_orm(has_one)]
+		pub content: HasOne<entity::content::collections::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Movie entity
+pub mod movies {
+	use flix_model::id::MovieId;
+
+	use chrono::NaiveDate;
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a flix movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_info_movies")]
+	pub struct Model {
+		/// The movie's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: MovieId,
+		/// The movie's title
+		pub title: String,
+		/// The movie's tagline
+		pub tagline: String,
+		/// The movie's overview
+		pub overview: String,
+		/// The movie's release date
+		#[sea_orm(indexed)]
+		pub date: NaiveDate,
+
+		/// The sortable title
+		#[sea_orm(indexed)]
+		pub sort_title: String,
+		/// The filesystem-safe slug
+		#[sea_orm(indexed, unique)]
+		pub fs_slug: String,
+		/// The url-safe slug
+		#[sea_orm(indexed, unique)]
+		pub web_slug: String,
+
+		/// Potential content for this movie
+		#[sea_orm(has_one)]
+		pub content: HasOne<entity::content::movies::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Show entity
+pub mod shows {
+	use flix_model::id::ShowId;
+
+	use chrono::NaiveDate;
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a flix show
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_info_shows")]
+	pub struct Model {
+		/// The show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: ShowId,
+		/// The show's title
+		pub title: String,
+		/// The show's tagline
+		pub tagline: String,
+		/// The show's overview
+		pub overview: String,
+		/// The show's air date
+		#[sea_orm(indexed)]
+		pub date: NaiveDate,
+
+		/// The sortable title
+		#[sea_orm(indexed)]
+		pub sort_title: String,
+		/// The filesystem-safe slug
+		#[sea_orm(indexed, unique)]
+		pub fs_slug: String,
+		/// The url-safe slug
+		#[sea_orm(indexed, unique)]
+		pub web_slug: String,
+
+		/// Seasons that are part of this show
+		#[sea_orm(has_many)]
+		pub seasons: HasMany<super::seasons::Entity>,
+		/// Episodes that are part of this show
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+
+		/// Potential content for this show
+		#[sea_orm(has_one)]
+		pub content: HasOne<entity::content::shows::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Season entity
+pub mod seasons {
+	use flix_model::id::ShowId;
+	use flix_model::numbers::SeasonNumber;
+
+	use chrono::NaiveDate;
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a flix season
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_info_seasons")]
+	pub struct Model {
+		/// The season's show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub show_id: ShowId,
+		/// The season's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub season_number: SeasonNumber,
+		/// The season's title
+		pub title: String,
+		/// The season's overview
+		pub overview: String,
+		/// The season's air date
+		#[sea_orm(indexed)]
+		pub date: NaiveDate,
+
+		/// The show this season belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "show_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub show: HasOne<super::shows::Entity>,
+		/// Episodes that are part of this season
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+
+		/// Potential content for this season
+		#[sea_orm(has_one)]
+		pub content: HasOne<entity::content::seasons::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Episode entity
+pub mod episodes {
+	use flix_model::id::ShowId;
+	use flix_model::numbers::{EpisodeNumber, SeasonNumber};
+
+	use chrono::NaiveDate;
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a flix episode
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_info_episodes")]
+	pub struct Model {
+		/// The episode's show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub show_id: ShowId,
+		/// The episode's season's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub season_number: SeasonNumber,
+		/// The episode's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub episode_number: EpisodeNumber,
+		/// The episode's title
+		pub title: String,
+		/// The episode's overview
+		pub overview: String,
+		/// The episode's air date
+		#[sea_orm(indexed)]
+		pub date: NaiveDate,
+
+		/// The show this episode belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "show_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub show: HasOne<super::shows::Entity>,
+		/// The season this episode belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "(show_id, season_number)",
+			to = "(show_id, season_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub season: HasOne<super::seasons::Entity>,
+
+		/// Potential content for this episode
+		#[sea_orm(has_one)]
+		pub content: HasOne<entity::content::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Macros for creating info entities
+#[cfg(test)]
+pub mod test {
+	macro_rules! make_info_collection {
+		($db:expr, $id:expr) => {
+			$crate::entity::info::collections::ActiveModel {
+				id: Set(::flix_model::id::CollectionId::from_raw($id)),
+				title: Set(::std::string::String::new()),
+				overview: Set(::std::string::String::new()),
+				sort_title: Set(::std::string::String::new()),
+				fs_slug: Set(format!("C FS {}", $id)),
+				web_slug: Set(format!("C Web {}", $id)),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_info_collection;
+
+	macro_rules! make_info_movie {
+		($db:expr, $id:expr) => {
+			$crate::entity::info::movies::ActiveModel {
+				id: Set(::flix_model::id::MovieId::from_raw($id)),
+				title: Set(::std::string::String::new()),
+				tagline: Set(::std::string::String::new()),
+				overview: Set(::std::string::String::new()),
+				date: Set(::chrono::NaiveDate::from_yo_opt(1, 1).expect("from_yo_opt")),
+				sort_title: Set(::std::string::String::new()),
+				fs_slug: Set(format!("M FS {}", $id)),
+				web_slug: Set(format!("M Web {}", $id)),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_info_movie;
+
+	macro_rules! make_info_show {
+		($db:expr, $id:expr) => {
+			$crate::entity::info::shows::ActiveModel {
+				id: Set(::flix_model::id::ShowId::from_raw($id)),
+				title: Set(::std::string::String::new()),
+				tagline: Set(::std::string::String::new()),
+				overview: Set(::std::string::String::new()),
+				date: Set(::chrono::NaiveDate::from_yo_opt(1, 1).expect("from_yo_opt")),
+				sort_title: Set(::std::string::String::new()),
+				fs_slug: Set(format!("S FS {}", $id)),
+				web_slug: Set(format!("S Web {}", $id)),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_info_show;
+
+	macro_rules! make_info_season {
+		($db:expr, $show:expr, $season:expr) => {
+			$crate::entity::info::seasons::ActiveModel {
+				show_id: Set(::flix_model::id::ShowId::from_raw($show)),
+				season_number: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				title: Set(::std::string::String::new()),
+				overview: Set(::std::string::String::new()),
+				date: Set(::chrono::NaiveDate::from_yo_opt(1, 1).expect("from_yo_opt")),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_info_season;
+
+	macro_rules! make_info_episode {
+		($db:expr, $show:expr, $season:expr, $episode:expr) => {
+			$crate::entity::info::episodes::ActiveModel {
+				show_id: Set(::flix_model::id::ShowId::from_raw($show)),
+				season_number: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				episode_number: Set(::flix_model::numbers::EpisodeNumber::new($episode)),
+				title: Set(::std::string::String::new()),
+				overview: Set(::std::string::String::new()),
+				date: Set(::chrono::NaiveDate::from_yo_opt(1, 1).expect("from_yo_opt")),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_info_episode;
+}
+
+#[cfg(test)]
+mod tests {
+	use flix_model::id::{CollectionId, MovieId, ShowId};
+
+	use chrono::NaiveDate;
+	use sea_orm::ActiveValue::{NotSet, Set};
+	use sea_orm::entity::prelude::*;
+	use sea_orm::sqlx::error::ErrorKind;
+
+	use crate::tests::new_initialized_memory_db;
+
+	use super::super::tests::get_error_kind;
+	use super::super::tests::notsettable;
+	use super::test::{
+		make_info_collection, make_info_episode, make_info_movie, make_info_season, make_info_show,
+	};
+
+	#[tokio::test]
+	async fn use_test_macros() {
+		let db = new_initialized_memory_db().await;
+
+		make_info_collection!(&db, 1);
+		make_info_movie!(&db, 1);
+		make_info_show!(&db, 1);
+		make_info_season!(&db, 1, 1);
+		make_info_episode!(&db, 1, 1, 1);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_collections() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_collection {
+			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_collection!(@insert, $db, $id $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, CollectionId::from_raw($id));
+				assert_eq!(model.title, concat!("C Title ", $id));
+				assert_eq!(model.overview, concat!("C Overview ", $id));
+			};
+			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_collection!(@insert, $db, $id $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
+				super::collections::ActiveModel {
+					id: notsettable!(id, CollectionId::from_raw($id) $(, $($skip),+)?),
+					title: notsettable!(title, concat!("C Title ", $id).to_string() $(, $($skip),+)?),
+					overview: notsettable!(overview, concat!("C Overview ", $id).to_string() $(, $($skip),+)?),
+					sort_title: notsettable!(sort_title, concat!("C Sort Title ", $id).to_string() $(, $($skip),+)?),
+					fs_slug: notsettable!(fs_slug, concat!("C FS Slug ", $id).to_string() $(, $($skip),+)?),
+					web_slug: notsettable!(web_slug, concat!("C Web Slug ", $id).to_string() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_collection!(&db, 1, Success);
+		assert_collection!(&db, 1, UniqueViolation);
+		assert_collection!(&db, 2, Success);
+
+		assert_collection!(&db, 3, Success; id);
+		assert_collection!(&db, 4, NotNullViolation; title);
+		assert_collection!(&db, 5, NotNullViolation; overview);
+		assert_collection!(&db, 6, NotNullViolation; sort_title);
+		assert_collection!(&db, 7, NotNullViolation; fs_slug);
+		assert_collection!(&db, 8, NotNullViolation; web_slug);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_movies() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_movie {
+			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, MovieId::from_raw($id));
+				assert_eq!(model.title, concat!("M Title ", $id));
+				assert_eq!(model.tagline, concat!("M Tagline ", $id));
+				assert_eq!(model.overview, concat!("M Overview ", $id));
+				assert_eq!(model.date, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt"));
+			};
+			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
+				super::movies::ActiveModel {
+					id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
+					title: notsettable!(title, concat!("M Title ", $id).to_string() $(, $($skip),+)?),
+					tagline: notsettable!(tagline, concat!("M Tagline ", $id).to_string() $(, $($skip),+)?),
+					overview: notsettable!(overview, concat!("M Overview ", $id).to_string() $(, $($skip),+)?),
+					date: notsettable!(date, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt") $(, $($skip),+)?),
+					sort_title: notsettable!(sort_title, concat!("M Sort Title ", $id).to_string() $(, $($skip),+)?),
+					fs_slug: notsettable!(fs_slug, concat!("M FS Slug ", $id).to_string() $(, $($skip),+)?),
+					web_slug: notsettable!(web_slug, concat!("M Web Slug ", $id).to_string() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_movie!(&db, 1, Success);
+		assert_movie!(&db, 1, UniqueViolation);
+		assert_movie!(&db, 2, Success);
+
+		assert_movie!(&db, 3, Success; id);
+		assert_movie!(&db, 4, NotNullViolation; title);
+		assert_movie!(&db, 5, NotNullViolation; tagline);
+		assert_movie!(&db, 6, NotNullViolation; overview);
+		assert_movie!(&db, 7, NotNullViolation; date);
+		assert_movie!(&db, 8, NotNullViolation; sort_title);
+		assert_movie!(&db, 9, NotNullViolation; fs_slug);
+		assert_movie!(&db, 10, NotNullViolation; web_slug);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_shows() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_show {
+			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_show!(@insert, $db, $id $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, ShowId::from_raw($id));
+				assert_eq!(model.title, concat!("S Title ", $id));
+				assert_eq!(model.tagline, concat!("S Tagline ", $id));
+				assert_eq!(model.overview, concat!("S Overview ", $id));
+				assert_eq!(model.date, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt"));
+			};
+			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_show!(@insert, $db, $id $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(
+					get_error_kind(model).expect("get_error_kind"),
+					ErrorKind::$error
+				);
+			};
+			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
+				super::shows::ActiveModel {
+					id: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
+					title: notsettable!(title, concat!("S Title ", $id).to_string() $(, $($skip),+)?),
+					tagline: notsettable!(tagline, concat!("S Tagline ", $id).to_string() $(, $($skip),+)?),
+					overview: notsettable!(overview, concat!("S Overview ", $id).to_string() $(, $($skip),+)?),
+					date: notsettable!(date, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt") $(, $($skip),+)?),
+					sort_title: notsettable!(sort_title, concat!("S Sort Title ", $id).to_string() $(, $($skip),+)?),
+					fs_slug: notsettable!(fs_slug, concat!("S FS Slug ", $id).to_string() $(, $($skip),+)?),
+					web_slug: notsettable!(web_slug, concat!("S Web Slug ", $id).to_string() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_show!(&db, 1, Success);
+		assert_show!(&db, 1, UniqueViolation);
+		assert_show!(&db, 2, Success);
+
+		assert_show!(&db, 3, Success; id);
+		assert_show!(&db, 4, NotNullViolation; title);
+		assert_show!(&db, 5, NotNullViolation; tagline);
+		assert_show!(&db, 6, NotNullViolation; overview);
+		assert_show!(&db, 7, NotNullViolation; date);
+		assert_show!(&db, 8, NotNullViolation; sort_title);
+		assert_show!(&db, 9, NotNullViolation; fs_slug);
+		assert_show!(&db, 10, NotNullViolation; web_slug);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_seasons() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_season {
+			($db:expr, $show:literal, $season:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_season!(@insert, $db, $show, $season $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.show_id, ShowId::from_raw($show));
+				assert_eq!(model.season_number, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.title, concat!("SS Title ", $show, ",", $season));
+				assert_eq!(model.overview, concat!("SS Overview ", $show, ",", $season));
+				assert_eq!(model.date, NaiveDate::from_yo_opt($show + $season, 1).expect("from_yo_opt"));
+			};
+			($db:expr, $show:literal, $season:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_season!(@insert, $db, $show, $season $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(
+					get_error_kind(model).expect("get_error_kind"),
+					ErrorKind::$error
+				);
+			};
+			(@insert, $db:expr, $show:literal, $season:literal $(; $($skip:ident),+)?) => {
+				super::seasons::ActiveModel {
+					show_id: notsettable!(show_id, ShowId::from_raw($show) $(, $($skip),+)?),
+					season_number: notsettable!(season_number, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					title: notsettable!(title, concat!("SS Title ", $show, ",", $season).to_string() $(, $($skip),+)?),
+					overview: notsettable!(overview, concat!("SS Overview ", $show, ",", $season).to_string() $(, $($skip),+)?),
+					date: notsettable!(date, NaiveDate::from_yo_opt($show + $season, 1).expect("from_yo_opt") $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_season!(&db, 1, 1, ForeignKeyViolation);
+		make_info_show!(&db, 1);
+		make_info_show!(&db, 2);
+
+		assert_season!(&db, 1, 1, Success);
+		assert_season!(&db, 1, 1, UniqueViolation);
+		assert_season!(&db, 2, 1, Success);
+		assert_season!(&db, 1, 2, Success);
+
+		assert_season!(&db, 1, 3, NotNullViolation; show_id);
+		assert_season!(&db, 1, 4, NotNullViolation; season_number);
+		assert_season!(&db, 1, 5, NotNullViolation; title);
+		assert_season!(&db, 1, 6, NotNullViolation; overview);
+		assert_season!(&db, 1, 7, NotNullViolation; date);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_episodes() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_episode {
+			($db:expr, $show:literal, $season:literal, $episode:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $show, $season, $episode $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.show_id, ShowId::from_raw($show));
+				assert_eq!(model.season_number, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.episode_number, ::flix_model::numbers::EpisodeNumber::new($episode));
+				assert_eq!(model.title, concat!("SSE Title ", $show, ",", $season, ",", $episode));
+				assert_eq!(model.overview, concat!("SSE Overview ", $show, ",", $season, ",", $episode));
+				assert_eq!(model.date, NaiveDate::from_yo_opt($show + $season, 1).expect("from_yo_opt"));
+			};
+			($db:expr, $show:literal, $season:literal, $episode:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $show, $season, $episode $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(
+					get_error_kind(model).expect("get_error_kind"),
+					ErrorKind::$error
+				);
+			};
+			(@insert, $db:expr, $show:literal, $season:literal, $episode:literal $(; $($skip:ident),+)?) => {
+				super::episodes::ActiveModel {
+					show_id: notsettable!(show_id, ShowId::from_raw($show) $(, $($skip),+)?),
+					season_number: notsettable!(season_number, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					episode_number: notsettable!(episode_number, ::flix_model::numbers::EpisodeNumber::new($episode) $(, $($skip),+)?),
+					title: notsettable!(title, concat!("SSE Title ", $show, ",", $season, ",", $episode).to_string() $(, $($skip),+)?),
+					overview: notsettable!(overview, concat!("SSE Overview ", $show, ",", $season, ",", $episode).to_string() $(, $($skip),+)?),
+					date: notsettable!(date, NaiveDate::from_yo_opt($show + $season, 1).expect("from_yo_opt") $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_episode!(&db, 1, 1, 1, ForeignKeyViolation);
+		make_info_show!(&db, 1);
+		make_info_show!(&db, 2);
+		assert_episode!(&db, 1, 1, 1, ForeignKeyViolation);
+		make_info_season!(&db, 1, 1);
+		make_info_season!(&db, 1, 2);
+		make_info_season!(&db, 2, 1);
+
+		assert_episode!(&db, 1, 1, 1, Success);
+		assert_episode!(&db, 1, 1, 1, UniqueViolation);
+		assert_episode!(&db, 2, 1, 1, Success);
+		assert_episode!(&db, 1, 2, 1, Success);
+		assert_episode!(&db, 1, 1, 2, Success);
+
+		assert_episode!(&db, 1, 1, 3, NotNullViolation; show_id);
+		assert_episode!(&db, 1, 1, 4, NotNullViolation; season_number);
+		assert_episode!(&db, 1, 1, 4, NotNullViolation; episode_number);
+		assert_episode!(&db, 1, 1, 5, NotNullViolation; title);
+		assert_episode!(&db, 1, 1, 6, NotNullViolation; overview);
+		assert_episode!(&db, 1, 1, 7, NotNullViolation; date);
+	}
+}

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

@@ -1,27 +0,0 @@
-//! Collection entity
-
-use flix_model::id::CollectionId;
-
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a flix collection
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_info_collections")]
-pub struct Model {
-	/// The collection's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: CollectionId,
-	/// The collection's title
-	pub title: String,
-	/// The collection's overview
-	pub overview: String,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,53 +0,0 @@
-//! Episode entity
-
-use flix_model::id::ShowId;
-
-use chrono::NaiveDate;
-use flix_model::numbers::{EpisodeNumber, SeasonNumber};
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a flix episode
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_info_episodes")]
-pub struct Model {
-	/// The episode's show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub show: ShowId,
-	/// The episode's season's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub season: SeasonNumber,
-	/// The episode's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub episode: EpisodeNumber,
-	/// The episode's title
-	pub title: String,
-	/// The episode's overview
-	pub overview: String,
-	/// The episode's air date
-	pub date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The show this season belongs to
-	#[sea_orm(
-		belongs_to = "super::shows::Entity",
-		from = "Column::Show",
-		to = "super::shows::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Show,
-}
-
-impl Related<super::shows::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Show.def()
-	}
-}

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

@@ -1,230 +0,0 @@
-//! This module contains entities for storing media information such as
-//! titles and overviews
-
-pub mod collections;
-
-pub mod movies;
-
-pub mod episodes;
-pub mod seasons;
-pub mod shows;
-
-#[cfg(test)]
-mod tests {
-	use flix_model::id::{CollectionId, MovieId, ShowId};
-
-	use chrono::NaiveDate;
-	use sea_orm::ActiveModelTrait;
-	use sea_orm::ActiveValue::{NotSet, Set};
-	use sea_orm::sqlx::error::ErrorKind;
-	use sea_orm_migration::MigratorTrait;
-
-	use crate::migration::Migrator;
-	use crate::tests::new_memory_db;
-
-	use super::super::tests::get_error_kind;
-	use super::super::tests::notsettable;
-
-	#[tokio::test]
-	async fn test_inserts() {
-		let db = new_memory_db().await;
-		Migrator::up(&db, None).await.expect("up");
-
-		// Collections
-		macro_rules! assert_collection {
-			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_collection!(@insert, $db, $id $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, CollectionId::from_raw($id));
-				assert_eq!(model.title, concat!("C", $id));
-				assert_eq!(model.overview, concat!("Collection", " ", $id));
-			};
-			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_collection!(@insert, $db, $id $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
-				super::collections::ActiveModel {
-					id: notsettable!(id, CollectionId::from_raw($id) $(, $($skip),+)?),
-					title: notsettable!(title, concat!("C", $id).to_string() $(, $($skip),+)?),
-					overview: notsettable!(overview, concat!("Collection", " ", $id).to_string() $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_collection!(&db, 1, Success);
-		assert_collection!(&db, 1, UniqueViolation);
-		assert_collection!(&db, 2, Success);
-		assert_collection!(&db, 3, Success; id);
-		assert_collection!(&db, 4, NotNullViolation; title);
-		assert_collection!(&db, 5, NotNullViolation; overview);
-
-		// Movies
-		macro_rules! assert_movie {
-			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_movie!(@insert, $db, $id $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, MovieId::from_raw($id));
-				assert_eq!(model.title, concat!("M", $id));
-				assert_eq!(model.tagline, concat!("Watch Movie", " ", $id));
-				assert_eq!(model.overview, concat!("Movie", " ", $id));
-				assert_eq!(model.date, NaiveDate::from_yo_opt(2000, $id).expect("NaiveDate::from_yo_opt"));
-			};
-			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_movie!(@insert, $db, $id $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
-				super::movies::ActiveModel {
-					id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
-					title: notsettable!(title, concat!("M", $id).to_string() $(, $($skip),+)?),
-					tagline: notsettable!(tagline, concat!("Watch Movie", " ", $id).to_string() $(, $($skip),+)?),
-					overview: notsettable!(overview, concat!("Movie", " ", $id).to_string() $(, $($skip),+)?),
-					date: notsettable!(date, NaiveDate::from_yo_opt(2000, $id).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_movie!(&db, 1, Success);
-		assert_movie!(&db, 1, UniqueViolation);
-		assert_movie!(&db, 2, Success);
-		assert_movie!(&db, 3, Success; id);
-		assert_movie!(&db, 4, NotNullViolation; title);
-		assert_movie!(&db, 5, NotNullViolation; tagline);
-		assert_movie!(&db, 6, NotNullViolation; overview);
-		assert_movie!(&db, 7, NotNullViolation; date);
-
-		// Shows
-		macro_rules! assert_show {
-			($db:expr, $id:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_show!(@insert, $db, $id $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.id, ShowId::from_raw($id));
-				assert_eq!(model.title, concat!("S", $id));
-				assert_eq!(model.tagline, concat!("Watch Show", " ", $id));
-				assert_eq!(model.overview, concat!("Show", " ", $id));
-				assert_eq!(model.date, NaiveDate::from_yo_opt(2000, $id).expect("NaiveDate::from_yo_opt"));
-			};
-			($db:expr, $id:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_show!(@insert, $db, $id $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(
-					get_error_kind(model).expect("get_error_kind"),
-					ErrorKind::$error
-				);
-			};
-			(@insert, $db:expr, $id:literal $(; $($skip:ident),+)?) => {
-				super::shows::ActiveModel {
-					id: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
-					title: notsettable!(title, concat!("S", $id).to_string() $(, $($skip),+)?),
-					tagline: notsettable!(tagline, concat!("Watch Show", " ", $id).to_string() $(, $($skip),+)?),
-					overview: notsettable!(overview, concat!("Show", " ", $id).to_string() $(, $($skip),+)?),
-					date: notsettable!(date, NaiveDate::from_yo_opt(2000, $id).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_show!(&db, 1, Success);
-		assert_show!(&db, 1, UniqueViolation);
-		assert_show!(&db, 2, Success);
-		assert_show!(&db, 3, Success; id);
-		assert_show!(&db, 4, NotNullViolation; title);
-		assert_show!(&db, 5, NotNullViolation; tagline);
-		assert_show!(&db, 6, NotNullViolation; overview);
-		assert_show!(&db, 7, NotNullViolation; date);
-
-		// Seasons
-		macro_rules! assert_season {
-			($db:expr, $show:literal, $season:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_season!(@insert, $db, $show, $season $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.show, ShowId::from_raw($show));
-				assert_eq!(model.season, $season);
-				assert_eq!(model.title, concat!("S", $show, "S", $season));
-				assert_eq!(model.overview, concat!("Show", " ", $show, " ", "Season", " ", $season));
-				assert_eq!(model.date, NaiveDate::from_yo_opt(2000, $show + $season).expect("NaiveDate::from_yo_opt"));
-			};
-			($db:expr, $show:literal, $season:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_season!(@insert, $db, $show, $season $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(
-					get_error_kind(model).expect("get_error_kind"),
-					ErrorKind::$error
-				);
-			};
-			(@insert, $db:expr, $show:literal, $season:literal $(; $($skip:ident),+)?) => {
-				super::seasons::ActiveModel {
-					show: notsettable!(show, ShowId::from_raw($show) $(, $($skip),+)?),
-					season: notsettable!(season, $season $(, $($skip),+)?),
-					title: notsettable!(title, concat!("S", $show, "S", $season).to_string() $(, $($skip),+)?),
-					overview: notsettable!(overview, concat!("Show", " ", $show, " ", "Season", " ", $season).to_string() $(, $($skip),+)?),
-					date: notsettable!(date, NaiveDate::from_yo_opt(2000, $show + $season).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_season!(&db, 1, 1, Success);
-		assert_season!(&db, 1, 1, UniqueViolation);
-		assert_season!(&db, 2, 1, Success);
-		assert_season!(&db, 0, 1, ForeignKeyViolation);
-		assert_season!(&db, 1, 2, Success);
-		assert_season!(&db, 1, 3, NotNullViolation; show);
-		assert_season!(&db, 1, 4, NotNullViolation; season);
-		assert_season!(&db, 1, 5, NotNullViolation; title);
-		assert_season!(&db, 1, 6, NotNullViolation; overview);
-		assert_season!(&db, 1, 7, NotNullViolation; date);
-
-		// Episodes
-		macro_rules! assert_episode {
-			($db:expr, $show:literal, $season:literal, $episode:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_episode!(@insert, $db, $show, $season, $episode $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.show, ShowId::from_raw($show));
-				assert_eq!(model.season, $season);
-				assert_eq!(model.episode, $episode);
-				assert_eq!(model.title, concat!("S", $show, "S", $season, "E", $episode));
-				assert_eq!(model.overview, concat!("Show", " ", $show, " ", "Season", " ", $season, " ", "Episode", " ", $episode));
-				assert_eq!(model.date, NaiveDate::from_yo_opt(2000, $show + $season + $episode).expect("NaiveDate::from_yo_opt"));
-			};
-			($db:expr, $show:literal, $season:literal, $episode:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_episode!(@insert, $db, $show, $season, $episode $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(
-					get_error_kind(model).expect("get_error_kind"),
-					ErrorKind::$error
-				);
-			};
-			(@insert, $db:expr, $show:literal, $season:literal, $episode:literal $(; $($skip:ident),+)?) => {
-				super::episodes::ActiveModel {
-					show: notsettable!(show, ShowId::from_raw($show) $(, $($skip),+)?),
-					season: notsettable!(season, $season $(, $($skip),+)?),
-					episode: notsettable!(episode, $episode $(, $($skip),+)?),
-					title: notsettable!(title, concat!("S", $show, "S", $season, "E", $episode).to_string() $(, $($skip),+)?),
-					overview: notsettable!(overview, concat!("Show", " ", $show, " ", "Season", " ", $season, " ", "Episode", " ", $episode).to_string() $(, $($skip),+)?),
-					date: notsettable!(date, NaiveDate::from_yo_opt(2000, $show + $season + $episode).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_episode!(&db, 1, 1, 1, Success);
-		assert_episode!(&db, 1, 1, 1, UniqueViolation);
-		assert_episode!(&db, 1, 2, 1, Success);
-		assert_episode!(&db, 2, 1, 1, Success);
-		assert_episode!(&db, 1, 0, 1, ForeignKeyViolation);
-		assert_episode!(&db, 0, 1, 1, ForeignKeyViolation);
-		assert_episode!(&db, 1, 1, 2, Success);
-		assert_episode!(&db, 1, 1, 3, NotNullViolation; show);
-		assert_episode!(&db, 1, 1, 4, NotNullViolation; season);
-		assert_episode!(&db, 1, 1, 4, NotNullViolation; episode);
-		assert_episode!(&db, 1, 1, 5, NotNullViolation; title);
-		assert_episode!(&db, 1, 1, 6, NotNullViolation; overview);
-		assert_episode!(&db, 1, 1, 7, NotNullViolation; date);
-	}
-}

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

@@ -1,32 +0,0 @@
-//! Movie entity
-
-use flix_model::id::MovieId;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a flix movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_info_movies")]
-pub struct Model {
-	/// The movie's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: MovieId,
-	/// The movie's title
-	pub title: String,
-	/// The movie's tagline
-	pub tagline: String,
-	/// The movie's overview
-	pub overview: String,
-	/// The movie's release date
-	pub date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,50 +0,0 @@
-//! Season entity
-
-use flix_model::id::ShowId;
-
-use chrono::NaiveDate;
-use flix_model::numbers::SeasonNumber;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a flix season
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_info_seasons")]
-pub struct Model {
-	/// The season's show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub show: ShowId,
-	/// The season's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub season: SeasonNumber,
-	/// The season's title
-	pub title: String,
-	/// The season's overview
-	pub overview: String,
-	/// The season's air date
-	pub date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The show this season belongs to
-	#[sea_orm(
-		belongs_to = "super::shows::Entity",
-		from = "Column::Show",
-		to = "super::shows::Column::Id",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Show,
-}
-
-impl Related<super::shows::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Show.def()
-	}
-}

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

@@ -1,51 +0,0 @@
-//! Show entity
-
-use flix_model::id::ShowId;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a flix show
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_info_shows")]
-pub struct Model {
-	/// The show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: ShowId,
-	/// The show's title
-	pub title: String,
-	/// The show's tagline
-	pub tagline: String,
-	/// The show's overview
-	pub overview: String,
-	/// The show's air date
-	pub date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The seasons that are part of this show
-	#[sea_orm(has_many = "super::seasons::Entity")]
-	Seasons,
-	/// The episodes that are part of this show
-	#[sea_orm(has_many = "super::episodes::Entity")]
-	Episodes,
-}
-
-impl Related<super::seasons::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Seasons.def()
-	}
-}
-
-impl Related<super::episodes::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Episodes.def()
-	}
-}

crates/db/src/entity/tmdb.rs

@@ -0,0 +1,677 @@
+//! This module contains entities for storing dynamic data from TMDB
+
+/// Collection entity
+pub mod collections {
+	use flix_model::id::CollectionId as FlixId;
+	use flix_tmdb::model::id::CollectionId;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a tmdb collection
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_tmdb_collections")]
+	pub struct Model {
+		/// The collection's TMDB ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_id: CollectionId,
+		/// The collection's ID
+		#[sea_orm(unique)]
+		pub flix_id: FlixId,
+		/// The date of the last update
+		pub last_update: DateTime<Utc>,
+		/// The number of movies in the collection
+		pub movie_count: u16,
+
+		/// The info for this collection
+		#[sea_orm(
+			belongs_to,
+			from = "flix_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::collections::Entity>,
+
+		/// Movies that are in this collection
+		#[sea_orm(has_many)]
+		pub movies: HasMany<super::movies::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Movie entity
+pub mod movies {
+	use flix_model::id::MovieId as FlixId;
+	use flix_tmdb::model::id::{CollectionId, MovieId};
+
+	use seamantic::model::duration::Seconds;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a tmdb movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_tmdb_movies")]
+	pub struct Model {
+		/// The movie's TMDB ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_id: MovieId,
+		/// The movie's ID
+		#[sea_orm(unique)]
+		pub flix_id: FlixId,
+		/// The date of the last update
+		pub last_update: DateTime<Utc>,
+		/// The movie's runtime in seconds
+		pub runtime: Seconds,
+		/// The TMDB ID of the collection this movie belongs to
+		#[sea_orm(indexed)]
+		pub collection_id: Option<CollectionId>,
+
+		/// The collection this movie belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "collection_id",
+			to = "tmdb_id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub collection: HasOne<super::collections::Entity>,
+		/// The info for this movie
+		#[sea_orm(
+			belongs_to,
+			from = "flix_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::movies::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Show entity
+pub mod shows {
+	use flix_model::id::ShowId as FlixId;
+	use flix_tmdb::model::id::ShowId;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a tmdb show
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_tmdb_shows")]
+	pub struct Model {
+		/// The show's TMDB ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_id: ShowId,
+		/// The show's ID
+		#[sea_orm(unique)]
+		pub flix_id: FlixId,
+		/// The movie's runtime in seconds
+		pub last_update: DateTime<Utc>,
+		/// The number of seasons the show has
+		pub number_of_seasons: u32,
+
+		/// The info for this show
+		#[sea_orm(
+			belongs_to,
+			from = "flix_id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::shows::Entity>,
+
+		/// Seasons that are part of this show
+		#[sea_orm(has_many)]
+		pub seasons: HasMany<super::seasons::Entity>,
+		/// Episodes that are part of this show
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Season entity
+pub mod seasons {
+	use flix_model::id::ShowId as FlixId;
+	use flix_model::numbers::SeasonNumber;
+	use flix_tmdb::model::id::ShowId;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a tmdb season
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_tmdb_seasons")]
+	pub struct Model {
+		/// The season's show's TMDB ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_show: ShowId,
+		/// The season's TMDB season number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_season: SeasonNumber,
+		/// The season's show's ID
+		#[sea_orm(unique_key = "flix")]
+		pub flix_show: FlixId,
+		/// The season's number
+		#[sea_orm(unique_key = "flix")]
+		pub flix_season: SeasonNumber,
+		/// The date of the last update
+		pub last_update: DateTime<Utc>,
+
+		/// The show this season belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "tmdb_show",
+			to = "tmdb_id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub show: HasOne<super::shows::Entity>,
+		/// The info for this season
+		#[sea_orm(
+			belongs_to,
+			from = "(flix_show, flix_season)",
+			to = "(show_id, season_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::seasons::Entity>,
+
+		/// Episodes that are part of this season
+		#[sea_orm(has_many)]
+		pub episodes: HasMany<super::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Season entity
+pub mod episodes {
+	use flix_model::id::ShowId as FlixId;
+	use flix_model::numbers::{EpisodeNumber, SeasonNumber};
+	use flix_tmdb::model::id::ShowId;
+	use seamantic::model::duration::Seconds;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a tmdb episode
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_tmdb_episodes")]
+	pub struct Model {
+		/// The episode's show's TMDB ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_show: ShowId,
+		/// The episode's season's TMDB season number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_season: SeasonNumber,
+		/// The episode's TMDB episode number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub tmdb_episode: EpisodeNumber,
+		/// The episode's show's ID
+		#[sea_orm(unique_key = "flix")]
+		pub flix_show: FlixId,
+		/// The episode's season's number
+		#[sea_orm(unique_key = "flix")]
+		pub flix_season: SeasonNumber,
+		/// The episode's number
+		#[sea_orm(unique_key = "flix")]
+		pub flix_episode: EpisodeNumber,
+		/// The date of the last update
+		pub last_update: DateTime<Utc>,
+		/// The episode's runtime in seconds
+		pub runtime: Seconds,
+
+		/// The show this episode belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "tmdb_show",
+			to = "tmdb_id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub show: HasOne<super::shows::Entity>,
+		/// The season this episode belongs to
+		#[sea_orm(
+			belongs_to,
+			from = "(tmdb_show, tmdb_season)",
+			to = "(tmdb_show, tmdb_season)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub season: HasOne<super::seasons::Entity>,
+		/// The info for this episode
+		#[sea_orm(
+			belongs_to,
+			from = "(flix_show, flix_season, flix_episode)",
+			to = "(show_id, season_number, episode_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Macros for creating tmdb entities
+#[cfg(test)]
+pub mod test {
+	macro_rules! make_tmdb_collection {
+		($db:expr, $id:expr, $flix_id:expr) => {
+			$crate::entity::tmdb::collections::ActiveModel {
+				tmdb_id: Set(::flix_tmdb::model::id::CollectionId::from_raw($id)),
+				flix_id: Set(::flix_model::id::CollectionId::from_raw($flix_id)),
+				last_update: Set(::chrono::Utc::now()),
+				movie_count: Set(::core::default::Default::default()),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_tmdb_collection;
+
+	macro_rules! make_tmdb_movie {
+		($db:expr, $id:expr, $flix_id:expr) => {
+			$crate::entity::tmdb::movies::ActiveModel {
+				tmdb_id: Set(::flix_tmdb::model::id::MovieId::from_raw($id)),
+				flix_id: Set(::flix_model::id::MovieId::from_raw($flix_id)),
+				last_update: Set(::chrono::Utc::now()),
+				runtime: Set(::core::default::Default::default()),
+				collection_id: Set(None),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_tmdb_movie;
+
+	macro_rules! make_tmdb_show {
+		($db:expr, $id:expr, $flix_id:expr) => {
+			$crate::entity::tmdb::shows::ActiveModel {
+				tmdb_id: Set(::flix_tmdb::model::id::ShowId::from_raw($id)),
+				flix_id: Set(::flix_model::id::ShowId::from_raw($flix_id)),
+				last_update: Set(::chrono::Utc::now()),
+				number_of_seasons: Set(::core::default::Default::default()),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_tmdb_show;
+
+	macro_rules! make_tmdb_season {
+		($db:expr, $show:expr, $season:expr, $flix_show:expr, $flix_season:expr) => {
+			$crate::entity::tmdb::seasons::ActiveModel {
+				tmdb_show: Set(::flix_tmdb::model::id::ShowId::from_raw($show)),
+				tmdb_season: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				flix_show: Set(::flix_model::id::ShowId::from_raw($flix_show)),
+				flix_season: Set(::flix_model::numbers::SeasonNumber::new($flix_season)),
+				last_update: Set(::chrono::Utc::now()),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_tmdb_season;
+
+	macro_rules! make_tmdb_episode {
+		($db:expr, $show:expr, $season:expr, $episode:expr, $flix_show:expr, $flix_season:expr, $flix_episode:expr) => {
+			$crate::entity::tmdb::episodes::ActiveModel {
+				tmdb_show: Set(::flix_tmdb::model::id::ShowId::from_raw($show)),
+				tmdb_season: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				tmdb_episode: Set(::flix_model::numbers::EpisodeNumber::new($episode)),
+				flix_show: Set(::flix_model::id::ShowId::from_raw($flix_show)),
+				flix_season: Set(::flix_model::numbers::SeasonNumber::new($flix_season)),
+				flix_episode: Set(::flix_model::numbers::EpisodeNumber::new($flix_episode)),
+				last_update: Set(::chrono::Utc::now()),
+				runtime: Set(::core::default::Default::default()),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_tmdb_episode;
+}
+
+#[cfg(test)]
+mod tests {
+	use core::time::Duration;
+
+	use flix_model::id::{CollectionId, MovieId, ShowId};
+	use flix_tmdb::model::id::{
+		CollectionId as TmdbCollectionId, MovieId as TmdbMovieId, ShowId as TmdbShowId,
+	};
+
+	use chrono::NaiveDate;
+	use sea_orm::ActiveValue::{NotSet, Set};
+	use sea_orm::entity::prelude::*;
+	use sea_orm::sqlx::error::ErrorKind;
+
+	use crate::entity::info::test::{
+		make_info_collection, make_info_episode, make_info_movie, make_info_season, make_info_show,
+	};
+	use crate::tests::new_initialized_memory_db;
+
+	use super::super::tests::get_error_kind;
+	use super::super::tests::notsettable;
+	use super::test::{
+		make_tmdb_collection, make_tmdb_episode, make_tmdb_movie, make_tmdb_season, make_tmdb_show,
+	};
+
+	#[tokio::test]
+	async fn use_test_macros() {
+		let db = new_initialized_memory_db().await;
+
+		make_info_collection!(&db, 1);
+		make_info_movie!(&db, 1);
+		make_info_show!(&db, 1);
+		make_info_season!(&db, 1, 1);
+		make_info_episode!(&db, 1, 1, 1);
+
+		make_tmdb_collection!(&db, 1, 1);
+		make_tmdb_movie!(&db, 1, 1);
+		make_tmdb_show!(&db, 1, 1);
+		make_tmdb_season!(&db, 1, 1, 1, 1);
+		make_tmdb_episode!(&db, 1, 1, 1, 1, 1, 1);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_collections() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_collection {
+			($db:expr, $id:literal, $tid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_collection!(@insert, $db, $id, $tid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.tmdb_id, TmdbCollectionId::from_raw($tid));
+				assert_eq!(model.flix_id, CollectionId::from_raw($id));
+				assert_eq!(model.last_update, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+				assert_eq!(model.movie_count, $id);
+			};
+			($db:expr, $id:literal, $tid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_collection!(@insert, $db, $id, $tid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $tid:literal $(; $($skip:ident),+)?) => {
+				super::collections::ActiveModel {
+					tmdb_id: notsettable!(tmdb_id, TmdbCollectionId::from_raw($tid) $(, $($skip),+)?),
+					flix_id: notsettable!(flix_id, CollectionId::from_raw($id) $(, $($skip),+)?),
+					last_update: notsettable!(last_update, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+					movie_count: notsettable!(movie_count, $id $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_collection!(&db, 1, 1, ForeignKeyViolation);
+		make_info_collection!(&db, 1);
+		assert_collection!(&db, 1, 1, Success);
+		assert_collection!(&db, 1, 1, UniqueViolation);
+
+		assert_collection!(&db, 1, 2, UniqueViolation);
+		assert_collection!(&db, 2, 1, UniqueViolation);
+		make_info_collection!(&db, 2);
+		assert_collection!(&db, 2, 2, Success);
+
+		make_info_collection!(&db, 3);
+		assert_collection!(&db, 3, 3, Success; tmdb_id);
+		assert_collection!(&db, 4, 4, NotNullViolation; flix_id);
+		assert_collection!(&db, 5, 5, NotNullViolation; last_update);
+		assert_collection!(&db, 6, 6, NotNullViolation; movie_count);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_movies() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_movie {
+			($db:expr, $id:literal, $tid:literal, $cid:expr, Success $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id, $tid, $cid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.tmdb_id, TmdbMovieId::from_raw($tid));
+				assert_eq!(model.flix_id, MovieId::from_raw($id));
+				assert_eq!(model.last_update, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+				assert_eq!(model.runtime, Duration::from_secs($tid).into());
+				assert_eq!(model.collection_id, $cid.map(TmdbCollectionId::from_raw));
+			};
+			($db:expr, $id:literal, $tid:literal, $cid:expr, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id, $tid, $cid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $tid:literal, $cid:expr $(; $($skip:ident),+)?) => {
+				super::movies::ActiveModel {
+					tmdb_id: notsettable!(tmdb_id, TmdbMovieId::from_raw($tid) $(, $($skip),+)?),
+					flix_id: notsettable!(flix_id, MovieId::from_raw($id) $(, $($skip),+)?),
+					last_update: notsettable!(last_update, NaiveDate::from_yo_opt($id, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+					runtime: notsettable!(runtime, Duration::from_secs($tid).into() $(, $($skip),+)?),
+					collection_id: notsettable!(collection_id, $cid.map(TmdbCollectionId::from_raw) $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_movie!(&db, 1, 1, None, ForeignKeyViolation);
+		make_info_movie!(&db, 1);
+		assert_movie!(&db, 1, 1, None, Success);
+		assert_movie!(&db, 1, 1, None, UniqueViolation);
+
+		make_info_movie!(&db, 2);
+		assert_movie!(&db, 2, 2, Some(2), ForeignKeyViolation);
+		make_info_collection!(&db, 2);
+		make_tmdb_collection!(&db, 2, 2);
+		assert_movie!(&db, 2, 2, Some(2), Success);
+		assert_movie!(&db, 1, 2, None, UniqueViolation);
+		assert_movie!(&db, 2, 1, None, UniqueViolation);
+
+		make_info_movie!(&db, 3);
+		assert_movie!(&db, 3, 3, None, Success; tmdb_id);
+		assert_movie!(&db, 4, 4, None, NotNullViolation; flix_id);
+		assert_movie!(&db, 5, 5, None, NotNullViolation; last_update);
+		assert_movie!(&db, 6, 6, None, NotNullViolation; runtime);
+		assert_movie!(&db, 7, 7, None, ForeignKeyViolation; collection_id);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_shows() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_show {
+			($db:expr, $id:literal, $tid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_show!(@insert, $db, $id, $tid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.tmdb_id, TmdbShowId::from_raw($tid));
+				assert_eq!(model.flix_id, ShowId::from_raw($id));
+				assert_eq!(model.last_update, NaiveDate::from_yo_opt($tid, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+				assert_eq!(model.number_of_seasons, $id);
+			};
+			($db:expr, $id:literal, $tid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_show!(@insert, $db, $id, $tid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(
+					get_error_kind(model).expect("get_error_kind"),
+					ErrorKind::$error
+				);
+			};
+			(@insert, $db:expr, $id:literal, $tid:literal $(; $($skip:ident),+)?) => {
+				super::shows::ActiveModel {
+					tmdb_id: notsettable!(tmdb_id, TmdbShowId::from_raw($tid) $(, $($skip),+)?),
+					flix_id: notsettable!(flix_id, ShowId::from_raw($id) $(, $($skip),+)?),
+					last_update: notsettable!(last_update, NaiveDate::from_yo_opt($tid, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+					number_of_seasons: notsettable!(number_of_seasons, $id $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_show!(&db, 1, 1, ForeignKeyViolation);
+		make_info_show!(&db, 1);
+		assert_show!(&db, 1, 1, Success);
+		assert_show!(&db, 1, 1, UniqueViolation);
+
+		assert_show!(&db, 1, 2, UniqueViolation);
+		assert_show!(&db, 2, 1, UniqueViolation);
+		make_info_show!(&db, 2);
+		assert_show!(&db, 2, 2, Success);
+
+		make_info_show!(&db, 3);
+		assert_show!(&db, 3, 3, Success; tmdb_id);
+		assert_show!(&db, 4, 4, NotNullViolation; flix_id);
+		assert_show!(&db, 5, 5, NotNullViolation; last_update);
+		assert_show!(&db, 6, 6, NotNullViolation; number_of_seasons);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_seasons() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_season {
+			($db:expr, $show:literal, $season:literal, $tshow:literal, $tseason:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_season!(@insert, $db, $show, $season, $tshow, $tseason $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.tmdb_show, TmdbShowId::from_raw($tshow));
+				assert_eq!(model.tmdb_season, ::flix_model::numbers::SeasonNumber::new($tseason));
+				assert_eq!(model.flix_show, ShowId::from_raw($show));
+				assert_eq!(model.flix_season, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.last_update, NaiveDate::from_yo_opt($tshow, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+			};
+			($db:expr, $show:literal, $season:literal, $tshow:literal, $tseason:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_season!(@insert, $db, $show, $season, $tshow, $tseason $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(
+					get_error_kind(model).expect("get_error_kind"),
+					ErrorKind::$error
+				);
+			};
+			(@insert, $db:expr, $show:literal, $season:literal, $tshow:literal, $tseason:literal $(; $($skip:ident),+)?) => {
+				super::seasons::ActiveModel {
+					tmdb_show: notsettable!(tmdb_show, TmdbShowId::from_raw($tshow) $(, $($skip),+)?),
+					tmdb_season: notsettable!(tmdb_season, ::flix_model::numbers::SeasonNumber::new($tseason) $(, $($skip),+)?),
+					flix_show: notsettable!(flix_show, ShowId::from_raw($show) $(, $($skip),+)?),
+					flix_season: notsettable!(flix_season, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					last_update: notsettable!(last_update, NaiveDate::from_yo_opt($tshow, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_info_show!(&db, 1);
+		make_tmdb_show!(&db, 1, 1);
+
+		assert_season!(&db, 1, 1, 1, 1, ForeignKeyViolation);
+		make_info_season!(&db, 1, 1);
+		assert_season!(&db, 1, 1, 1, 1, Success);
+
+		assert_season!(&db, 1, 1, 1, 1, UniqueViolation);
+		assert_season!(&db, 1, 1, 2, 1, UniqueViolation);
+		assert_season!(&db, 2, 1, 1, 1, UniqueViolation);
+		make_info_season!(&db, 1, 2);
+		assert_season!(&db, 1, 2, 1, 2, Success);
+
+		assert_season!(&db, 1, 3, 1, 3, NotNullViolation; tmdb_show);
+		assert_season!(&db, 1, 4, 1, 4, NotNullViolation; tmdb_season);
+		assert_season!(&db, 1, 5, 1, 5, NotNullViolation; flix_show);
+		assert_season!(&db, 1, 6, 1, 6, NotNullViolation; flix_season);
+		assert_season!(&db, 1, 7, 1, 7, NotNullViolation; last_update);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_episodes() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_episode {
+			($db:expr, $show:literal, $season:literal, $episode:literal, $tshow:literal, $tseason:literal, $tepisode:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $show, $season, $episode, $tshow, $tseason, $tepisode $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.tmdb_show, TmdbShowId::from_raw($tshow));
+				assert_eq!(model.tmdb_season, ::flix_model::numbers::SeasonNumber::new($tseason));
+				assert_eq!(model.tmdb_episode, ::flix_model::numbers::EpisodeNumber::new($tepisode));
+				assert_eq!(model.flix_show, ShowId::from_raw($show));
+				assert_eq!(model.flix_season, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.flix_episode, ::flix_model::numbers::EpisodeNumber::new($episode));
+				assert_eq!(model.last_update, NaiveDate::from_yo_opt($tshow, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+				assert_eq!(model.runtime, Duration::from_secs($tshow).into());
+			};
+			($db:expr, $show:literal, $season:literal, $episode:literal, $tshow:literal, $tseason:literal, $tepisode:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $show, $season, $episode, $tshow, $tseason, $tepisode $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(
+					get_error_kind(model).expect("get_error_kind"),
+					ErrorKind::$error
+				);
+			};
+			(@insert, $db:expr, $show:literal, $season:literal, $episode:literal, $tshow:literal, $tseason:literal, $tepisode:literal $(; $($skip:ident),+)?) => {
+				super::episodes::ActiveModel {
+					tmdb_show: notsettable!(tmdb_show, TmdbShowId::from_raw($tshow) $(, $($skip),+)?),
+					tmdb_season: notsettable!(tmdb_season, ::flix_model::numbers::SeasonNumber::new($tseason) $(, $($skip),+)?),
+					tmdb_episode: notsettable!(tmdb_episode, ::flix_model::numbers::EpisodeNumber::new($tepisode) $(, $($skip),+)?),
+					flix_show: notsettable!(flix_show, ShowId::from_raw($show) $(, $($skip),+)?),
+					flix_season: notsettable!(flix_season, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					flix_episode: notsettable!(flix_episode, ::flix_model::numbers::EpisodeNumber::new($episode) $(, $($skip),+)?),
+					last_update: notsettable!(last_update, NaiveDate::from_yo_opt($tshow, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+					runtime: notsettable!(runtime, Duration::from_secs($tshow).into() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_info_show!(&db, 1);
+		make_info_season!(&db, 1, 1);
+		make_tmdb_show!(&db, 1, 1);
+		make_tmdb_season!(&db, 1, 1, 1, 1);
+
+		assert_episode!(&db, 1, 1, 1, 1, 1, 1, ForeignKeyViolation);
+		make_info_episode!(&db, 1, 1, 1);
+		assert_episode!(&db, 1, 1, 1, 1, 1, 1, Success);
+
+		assert_episode!(&db, 1, 1, 1, 1, 1, 1, UniqueViolation);
+		assert_episode!(&db, 1, 1, 1, 1, 2, 1, UniqueViolation);
+		assert_episode!(&db, 1, 1, 1, 2, 1, 1, UniqueViolation);
+		assert_episode!(&db, 1, 2, 1, 1, 1, 1, UniqueViolation);
+		assert_episode!(&db, 2, 1, 1, 1, 1, 1, UniqueViolation);
+		make_info_episode!(&db, 1, 1, 2);
+		assert_episode!(&db, 1, 1, 2, 1, 1, 2, Success);
+
+		assert_episode!(&db, 1, 1, 3, 1, 1, 3, NotNullViolation; tmdb_show);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 4, NotNullViolation; tmdb_season);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 5, NotNullViolation; tmdb_episode);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 6, NotNullViolation; flix_show);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 7, NotNullViolation; flix_season);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 8, NotNullViolation; flix_episode);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 9, NotNullViolation; last_update);
+		assert_episode!(&db, 1, 1, 3, 1, 1, 10, NotNullViolation; runtime);
+	}
+}

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

@@ -1,41 +0,0 @@
-//! Collection entity
-
-use flix_model::id::CollectionId as FlixId;
-use flix_tmdb::model::id::CollectionId;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a tmdb collection
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_tmdb_collections")]
-pub struct Model {
-	/// The collection's TMDB ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_id: CollectionId,
-	/// The collection's ID
-	pub flix_id: FlixId,
-	/// The date of the last update
-	pub last_update: NaiveDate,
-	/// The number of movies in the collection
-	pub movie_count: u16,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The movies that are part of this collection
-	#[sea_orm(has_many = "super::movies::Entity")]
-	Movies,
-}
-
-impl Related<super::movies::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Movies.def()
-	}
-}

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

@@ -1,43 +0,0 @@
-//! Season entity
-
-use flix_model::id::ShowId as FlixId;
-use flix_model::numbers::{EpisodeNumber, SeasonNumber};
-use flix_tmdb::model::id::ShowId;
-use seamantic::model::duration::Seconds;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a tmdb episode
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_tmdb_episodes")]
-pub struct Model {
-	/// The episode's show's TMDB ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_show: ShowId,
-	/// The episode's season's TMDB season number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_season: SeasonNumber,
-	/// The episode's TMDB episode number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_episode: EpisodeNumber,
-	/// The episode's show's ID
-	pub flix_show: FlixId,
-	/// The episode's season's number
-	pub flix_season: SeasonNumber,
-	/// The episode's number
-	pub flix_episode: EpisodeNumber,
-	/// The date of the last update
-	pub last_update: NaiveDate,
-	/// The episode's runtime in seconds
-	pub runtime: Seconds,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,278 +0,0 @@
-//! This module contains entities for storing dynamic data from TMDB
-
-pub mod collections;
-
-pub mod movies;
-
-pub mod episodes;
-pub mod seasons;
-pub mod shows;
-
-#[cfg(test)]
-mod tests {
-	use core::time::Duration;
-
-	use flix_model::id::{CollectionId, MovieId, ShowId};
-	use flix_tmdb::model::id::{
-		CollectionId as TmdbCollectionId, MovieId as TmdbMovieId, ShowId as TmdbShowId,
-	};
-
-	use chrono::NaiveDate;
-	use sea_orm::ActiveModelTrait;
-	use sea_orm::ActiveValue::{NotSet, Set};
-	use sea_orm::sqlx::error::ErrorKind;
-	use sea_orm_migration::MigratorTrait;
-
-	use crate::migration::Migrator;
-	use crate::tests::new_memory_db;
-
-	use super::super::tests::get_error_kind;
-	use super::super::tests::notsettable;
-	use super::super::tests::{
-		make_flix_collection, make_flix_episode, make_flix_movie, make_flix_season, make_flix_show,
-	};
-
-	#[tokio::test]
-	async fn test_inserts() {
-		let db = new_memory_db().await;
-		Migrator::up(&db, None).await.expect("up");
-
-		// Collections
-		macro_rules! assert_collection {
-			($db:expr, $id:literal, $tid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_collection!(@insert, $db, $id, $tid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.tmdb_id, TmdbCollectionId::from_raw($tid));
-				assert_eq!(model.flix_id, CollectionId::from_raw($id));
-				assert_eq!(model.last_update, NaiveDate::from_yo_opt(2000, $tid).expect("NaiveDate::from_yo_opt"));
-				assert_eq!(model.movie_count, $id);
-			};
-			($db:expr, $id:literal, $tid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_collection!(@insert, $db, $id, $tid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $tid:literal $(; $($skip:ident),+)?) => {
-				super::collections::ActiveModel {
-					tmdb_id: notsettable!(tmdb_id, TmdbCollectionId::from_raw($tid) $(, $($skip),+)?),
-					flix_id: notsettable!(flix_id, CollectionId::from_raw($id) $(, $($skip),+)?),
-					last_update: notsettable!(last_update, NaiveDate::from_yo_opt(2000, $tid).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-					movie_count: notsettable!(movie_count, $id $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_collection!(&db, 1, 1, ForeignKeyViolation);
-		make_flix_collection!(&db, 1);
-		make_flix_collection!(&db, 2);
-		make_flix_collection!(&db, 3);
-
-		assert_collection!(&db, 1, 1, Success);
-		assert_collection!(&db, 1, 1, UniqueViolation);
-		assert_collection!(&db, 1, 2, UniqueViolation);
-		assert_collection!(&db, 2, 1, UniqueViolation);
-		assert_collection!(&db, 2, 2, Success);
-		assert_collection!(&db, 3, 3, Success; tmdb_id);
-		assert_collection!(&db, 4, 4, NotNullViolation; flix_id);
-		assert_collection!(&db, 5, 5, NotNullViolation; last_update);
-		assert_collection!(&db, 6, 6, NotNullViolation; movie_count);
-
-		// Movies
-		macro_rules! assert_movie {
-			($db:expr, $id:literal, $tid:literal, $cid:expr, Success $(; $($skip:ident),+)?) => {
-				let model = assert_movie!(@insert, $db, $id, $tid, $cid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.tmdb_id, TmdbMovieId::from_raw($tid));
-				assert_eq!(model.flix_id, MovieId::from_raw($id));
-				assert_eq!(model.last_update, NaiveDate::from_yo_opt(2000, $tid).expect("NaiveDate::from_yo_opt"));
-				assert_eq!(model.runtime, Duration::from_secs($tid).into());
-				assert_eq!(model.collection, $cid);
-			};
-			($db:expr, $id:literal, $tid:literal, $cid:expr, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_movie!(@insert, $db, $id, $tid, $cid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-			};
-			(@insert, $db:expr, $id:literal, $tid:literal, $cid:expr $(; $($skip:ident),+)?) => {
-				super::movies::ActiveModel {
-					tmdb_id: notsettable!(tmdb_id, TmdbMovieId::from_raw($tid) $(, $($skip),+)?),
-					flix_id: notsettable!(flix_id, MovieId::from_raw($id) $(, $($skip),+)?),
-					last_update: notsettable!(last_update, NaiveDate::from_yo_opt(2000, $tid).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-					runtime: notsettable!(runtime, Duration::from_secs($tid).into() $(, $($skip),+)?),
-					collection: notsettable!(collection, $cid $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_movie!(
-			&db,
-			1,
-			1,
-			Some(TmdbCollectionId::from_raw(1)),
-			ForeignKeyViolation
-		);
-		make_flix_movie!(&db, 1);
-		make_flix_movie!(&db, 2);
-		make_flix_movie!(&db, 3);
-
-		assert_movie!(&db, 1, 1, Some(TmdbCollectionId::from_raw(1)), Success);
-		assert_movie!(&db, 1, 1, None, UniqueViolation);
-		assert_movie!(&db, 1, 2, None, UniqueViolation);
-		assert_movie!(&db, 2, 1, None, UniqueViolation);
-		assert_movie!(&db, 2, 2, Some(TmdbCollectionId::from_raw(1)), Success);
-		assert_movie!(&db, 3, 3, None, Success; tmdb_id);
-		assert_movie!(&db, 4, 4, None, NotNullViolation; flix_id);
-		assert_movie!(&db, 5, 5, None, NotNullViolation; last_update);
-		assert_movie!(&db, 6, 6, None, NotNullViolation; runtime);
-		assert_movie!(&db, 7, 7, None, ForeignKeyViolation; collection); // Must be `Set(None)`
-
-		// Shows
-		macro_rules! assert_show {
-			($db:expr, $id:literal, $tid:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_show!(@insert, $db, $id, $tid $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.tmdb_id, TmdbShowId::from_raw($tid));
-				assert_eq!(model.flix_id, ShowId::from_raw($id));
-				assert_eq!(model.last_update, NaiveDate::from_yo_opt(2000, $tid).expect("NaiveDate::from_yo_opt"));
-				assert_eq!(model.number_of_seasons, $id);
-			};
-			($db:expr, $id:literal, $tid:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_show!(@insert, $db, $id, $tid $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(
-					get_error_kind(model).expect("get_error_kind"),
-					ErrorKind::$error
-				);
-			};
-			(@insert, $db:expr, $id:literal, $tid:literal $(; $($skip:ident),+)?) => {
-				super::shows::ActiveModel {
-					tmdb_id: notsettable!(tmdb_id, TmdbShowId::from_raw($tid) $(, $($skip),+)?),
-					flix_id: notsettable!(flix_id, ShowId::from_raw($id) $(, $($skip),+)?),
-					last_update: notsettable!(last_update, NaiveDate::from_yo_opt(2000, $tid).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-					number_of_seasons: notsettable!(number_of_seasons, $id $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_show!(&db, 1, 1, ForeignKeyViolation);
-		make_flix_show!(&db, 1);
-		make_flix_show!(&db, 2);
-		make_flix_show!(&db, 3);
-
-		assert_show!(&db, 1, 1, Success);
-		assert_show!(&db, 1, 1, UniqueViolation);
-		assert_show!(&db, 1, 2, UniqueViolation);
-		assert_show!(&db, 2, 1, UniqueViolation);
-		assert_show!(&db, 2, 2, Success);
-		assert_show!(&db, 3, 3, Success; tmdb_id);
-		assert_show!(&db, 4, 4, NotNullViolation; flix_id);
-		assert_show!(&db, 5, 5, NotNullViolation; last_update);
-		assert_show!(&db, 6, 6, NotNullViolation; number_of_seasons);
-
-		// Seasons
-		macro_rules! assert_season {
-			($db:expr, $show:literal, $season:literal, $tshow:literal, $tseason:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_season!(@insert, $db, $show, $season, $tshow, $tseason $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.tmdb_show, TmdbShowId::from_raw($tshow));
-				assert_eq!(model.tmdb_season, $tseason);
-				assert_eq!(model.flix_show, ShowId::from_raw($show));
-				assert_eq!(model.flix_season, $season);
-				assert_eq!(model.last_update, NaiveDate::from_yo_opt(2000, $tshow).expect("NaiveDate::from_yo_opt"));
-			};
-			($db:expr, $show:literal, $season:literal, $tshow:literal, $tseason:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_season!(@insert, $db, $show, $season, $tshow, $tseason $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(
-					get_error_kind(model).expect("get_error_kind"),
-					ErrorKind::$error
-				);
-			};
-			(@insert, $db:expr, $show:literal, $season:literal, $tshow:literal, $tseason:literal $(; $($skip:ident),+)?) => {
-				super::seasons::ActiveModel {
-					tmdb_show: notsettable!(tmdb_show, TmdbShowId::from_raw($tshow) $(, $($skip),+)?),
-					tmdb_season: notsettable!(tmdb_season, $tseason $(, $($skip),+)?),
-					flix_show: notsettable!(flix_show, ShowId::from_raw($show) $(, $($skip),+)?),
-					flix_season: notsettable!(flix_season, $season $(, $($skip),+)?),
-					last_update: notsettable!(last_update, NaiveDate::from_yo_opt(2000, $tshow).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_season!(&db, 1, 1, 1, 1, ForeignKeyViolation);
-		make_flix_season!(&db, 1, 1);
-		make_flix_season!(&db, 1, 2);
-
-		assert_season!(&db, 1, 1, 1, 1, Success);
-		assert_season!(&db, 1, 1, 1, 1, UniqueViolation);
-		assert_season!(&db, 1, 1, 2, 1, UniqueViolation);
-		assert_season!(&db, 2, 1, 1, 1, UniqueViolation);
-		assert_season!(&db, 1, 2, 1, 2, Success);
-		assert_season!(&db, 1, 3, 1, 3, NotNullViolation; tmdb_show);
-		assert_season!(&db, 1, 4, 1, 4, NotNullViolation; tmdb_season);
-		assert_season!(&db, 1, 5, 1, 5, NotNullViolation; flix_show);
-		assert_season!(&db, 1, 6, 1, 6, NotNullViolation; flix_season);
-		assert_season!(&db, 1, 7, 1, 7, NotNullViolation; last_update);
-
-		// Episodes
-		macro_rules! assert_episode {
-			($db:expr, $show:literal, $season:literal, $episode:literal, $tshow:literal, $tseason:literal, $tepisode:literal, Success $(; $($skip:ident),+)?) => {
-				let model = assert_episode!(@insert, $db, $show, $season, $episode, $tshow, $tseason, $tepisode $(; $($skip),+)?)
-					.expect("insert");
-
-				assert_eq!(model.tmdb_show, TmdbShowId::from_raw($tshow));
-				assert_eq!(model.tmdb_season, $tseason);
-				assert_eq!(model.tmdb_episode, $tepisode);
-				assert_eq!(model.flix_show, ShowId::from_raw($show));
-				assert_eq!(model.flix_season, $season);
-				assert_eq!(model.flix_episode, $episode);
-				assert_eq!(model.last_update, NaiveDate::from_yo_opt(2000, $tshow).expect("NaiveDate::from_yo_opt"));
-				assert_eq!(model.runtime, Duration::from_secs($tshow).into());
-			};
-			($db:expr, $show:literal, $season:literal, $episode:literal, $tshow:literal, $tseason:literal, $tepisode:literal, $error:ident $(; $($skip:ident),+)?) => {
-				let model = assert_episode!(@insert, $db, $show, $season, $episode, $tshow, $tseason, $tepisode $(; $($skip),+)?)
-					.expect_err("insert");
-
-				assert_eq!(
-					get_error_kind(model).expect("get_error_kind"),
-					ErrorKind::$error
-				);
-			};
-			(@insert, $db:expr, $show:literal, $season:literal, $episode:literal, $tshow:literal, $tseason:literal, $tepisode:literal $(; $($skip:ident),+)?) => {
-				super::episodes::ActiveModel {
-					tmdb_show: notsettable!(tmdb_show, TmdbShowId::from_raw($tshow) $(, $($skip),+)?),
-					tmdb_season: notsettable!(tmdb_season, $tseason $(, $($skip),+)?),
-					tmdb_episode: notsettable!(tmdb_episode, $tepisode $(, $($skip),+)?),
-					flix_show: notsettable!(flix_show, ShowId::from_raw($show) $(, $($skip),+)?),
-					flix_season: notsettable!(flix_season, $season $(, $($skip),+)?),
-					flix_episode: notsettable!(flix_episode, $episode $(, $($skip),+)?),
-					last_update: notsettable!(last_update, NaiveDate::from_yo_opt(2000, $tshow).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-					runtime: notsettable!(runtime, Duration::from_secs($tshow).into() $(, $($skip),+)?),
-				}.insert($db).await
-			};
-		}
-		assert_episode!(&db, 1, 1, 1, 1, 1, 1, ForeignKeyViolation);
-		make_flix_episode!(&db, 1, 1, 1);
-		make_flix_episode!(&db, 1, 1, 2);
-
-		assert_episode!(&db, 1, 1, 1, 1, 1, 1, Success);
-		assert_episode!(&db, 1, 1, 1, 1, 1, 1, UniqueViolation);
-		assert_episode!(&db, 1, 1, 1, 1, 2, 1, UniqueViolation);
-		assert_episode!(&db, 1, 1, 1, 2, 1, 1, UniqueViolation);
-		assert_episode!(&db, 1, 2, 1, 1, 1, 1, UniqueViolation);
-		assert_episode!(&db, 2, 1, 1, 1, 1, 1, UniqueViolation);
-		assert_episode!(&db, 1, 1, 2, 1, 1, 2, Success);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 3, NotNullViolation; tmdb_show);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 4, NotNullViolation; tmdb_season);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 5, NotNullViolation; tmdb_episode);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 6, NotNullViolation; flix_show);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 7, NotNullViolation; flix_season);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 8, NotNullViolation; flix_episode);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 9, NotNullViolation; last_update);
-		assert_episode!(&db, 1, 1, 3, 1, 1, 10, NotNullViolation; runtime);
-	}
-}

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

@@ -1,51 +0,0 @@
-//! Movie entity
-
-use flix_model::id::MovieId as FlixId;
-use flix_tmdb::model::id::{CollectionId, MovieId};
-
-use seamantic::model::duration::Seconds;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a tmdb movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_tmdb_movies")]
-pub struct Model {
-	/// The movie's TMDB ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_id: MovieId,
-	/// The movie's ID
-	pub flix_id: FlixId,
-	/// The date of the last update
-	pub last_update: NaiveDate,
-	/// The movie's runtime in seconds
-	pub runtime: Seconds,
-	/// The TMDB ID of the collection this movie belongs to
-	pub collection: Option<CollectionId>,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The collection this movie belongs to
-	#[sea_orm(
-		belongs_to = "super::collections::Entity",
-		from = "Column::Collection",
-		to = "super::collections::Column::TmdbId",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Collection,
-}
-
-impl Related<super::collections::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Collection.def()
-	}
-}

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

@@ -1,51 +0,0 @@
-//! Season entity
-
-use flix_model::id::ShowId as FlixId;
-use flix_model::numbers::SeasonNumber;
-use flix_tmdb::model::id::ShowId;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a tmdb season
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_tmdb_seasons")]
-pub struct Model {
-	/// The season's show's TMDB ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_show: ShowId,
-	/// The season's TMDB season number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_season: SeasonNumber,
-	/// The season's show's ID
-	pub flix_show: FlixId,
-	/// The season's number
-	pub flix_season: SeasonNumber,
-	/// The date of the last update
-	pub last_update: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The show this season belongs to
-	#[sea_orm(
-		belongs_to = "super::shows::Entity",
-		from = "Column::TmdbShow",
-		to = "super::shows::Column::TmdbId",
-		on_update = "Cascade",
-		on_delete = "Cascade"
-	)]
-	Show,
-}
-
-impl Related<super::shows::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Show.def()
-	}
-}

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

@@ -1,41 +0,0 @@
-//! Show entity
-
-use flix_model::id::ShowId as FlixId;
-use flix_tmdb::model::id::ShowId;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait, Related, RelationDef, RelationTrait,
-};
-
-/// The database representation of a tmdb show
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_tmdb_shows")]
-pub struct Model {
-	/// The show's TMDB ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub tmdb_id: ShowId,
-	/// The show's ID
-	pub flix_id: FlixId,
-	/// The movie's runtime in seconds
-	pub last_update: NaiveDate,
-	/// The number of seasons the show has
-	pub number_of_seasons: u32,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-	/// The seasons that are part of this show
-	#[sea_orm(has_many = "super::seasons::Entity")]
-	Seasons,
-}
-
-impl Related<super::seasons::Entity> for Entity {
-	fn to() -> RelationDef {
-		Relation::Seasons.def()
-	}
-}

crates/db/src/entity/watched.rs

@@ -0,0 +1,579 @@
+//! This module contains entities for storing watched information
+
+/// Collection entity
+pub mod collections {
+	use flix_model::id::{CollectionId, RawId};
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a watched movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_watched_collections")]
+	pub struct Model {
+		/// The collection's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: CollectionId,
+		/// The user's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub user_id: RawId,
+		/// The date this collection was watched
+		pub watched_date: DateTime<Utc>,
+
+		/// The info for this collection
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::collections::Entity>,
+		/// The content for this collection
+		#[sea_orm(belongs_to, relation_enum = "Content", from = "id", to = "id", skip_fk)]
+		pub content: HasOne<entity::content::collections::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Movie entity
+pub mod movies {
+	use flix_model::id::{MovieId, RawId};
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a watched movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_watched_movies")]
+	pub struct Model {
+		/// The movie's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: MovieId,
+		/// The user's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub user_id: RawId,
+		/// The date this movie was watched
+		pub watched_date: DateTime<Utc>,
+
+		/// The info for this movie
+		#[sea_orm(
+			belongs_to,
+			from = "id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::movies::Entity>,
+		/// The content for this movie
+		#[sea_orm(belongs_to, relation_enum = "Content", from = "id", to = "id", skip_fk)]
+		pub content: HasOne<entity::content::movies::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Show entity
+pub mod shows {
+	use flix_model::id::{RawId, ShowId};
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a watched movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_watched_shows")]
+	pub struct Model {
+		/// The show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub id: ShowId,
+		/// The user's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub user_id: RawId,
+		/// The date this show was watched
+		pub watched_date: DateTime<Utc>,
+
+		/// The info for this show
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "id",
+			to = "id",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::shows::Entity>,
+		/// The content for this show
+		#[sea_orm(belongs_to, relation_enum = "Content", from = "id", to = "id", skip_fk)]
+		pub content: HasOne<entity::content::shows::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Season entity
+pub mod seasons {
+	use flix_model::id::{RawId, ShowId};
+	use flix_model::numbers::SeasonNumber;
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a watched movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_watched_seasons")]
+	pub struct Model {
+		/// The season's show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub show_id: ShowId,
+		/// The season's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub season_number: SeasonNumber,
+		/// The user's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub user_id: RawId,
+		/// The date this season was watched
+		pub watched_date: DateTime<Utc>,
+
+		/// The info for this season
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "(show_id, season_number)",
+			to = "(show_id, season_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::seasons::Entity>,
+		/// The content for this season
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Content",
+			from = "(show_id, season_number)",
+			to = "(show_id, season_number)",
+			skip_fk
+		)]
+		pub content: HasOne<entity::content::seasons::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Episode entity
+pub mod episodes {
+	use flix_model::id::{RawId, ShowId};
+	use flix_model::numbers::{EpisodeNumber, SeasonNumber};
+
+	use chrono::{DateTime, Utc};
+	use sea_orm::entity::prelude::*;
+
+	use crate::entity;
+
+	/// The database representation of a watched movie
+	#[sea_orm::model]
+	#[derive(Debug, Clone, DeriveEntityModel)]
+	#[sea_orm(table_name = "flix_watched_episodes")]
+	pub struct Model {
+		/// The episode's show's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub show_id: ShowId,
+		/// The episode's season's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub season_number: SeasonNumber,
+		/// The episode's number
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub episode_number: EpisodeNumber,
+		/// The user's ID
+		#[sea_orm(primary_key, auto_increment = false)]
+		pub user_id: RawId,
+		/// The date this episode was watched
+		pub watched_date: DateTime<Utc>,
+
+		/// The info for this episode
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Info",
+			from = "(show_id, season_number, episode_number)",
+			to = "(show_id, season_number, episode_number)",
+			on_update = "Cascade",
+			on_delete = "Cascade"
+		)]
+		pub info: HasOne<entity::info::episodes::Entity>,
+		/// The content for this episode
+		#[sea_orm(
+			belongs_to,
+			relation_enum = "Content",
+			from = "(show_id, season_number, episode_number)",
+			to = "(show_id, season_number, episode_number)",
+			skip_fk
+		)]
+		pub content: HasOne<entity::content::episodes::Entity>,
+	}
+
+	impl ActiveModelBehavior for ActiveModel {}
+}
+
+/// Macros for creating watched entities
+#[cfg(test)]
+pub mod test {
+	macro_rules! make_watched_movie {
+		($db:expr, $id:expr, $user:expr) => {
+			$crate::entity::watched::movies::ActiveModel {
+				id: Set(::flix_model::id::MovieId::from_raw($id)),
+				user_id: Set($user),
+				watched_date: Set(::chrono::Utc::now()),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_watched_movie;
+
+	macro_rules! make_watched_episode {
+		($db:expr, $show:expr, $season:expr, $episode:expr, $user:expr) => {
+			$crate::entity::watched::episodes::ActiveModel {
+				show_id: Set(::flix_model::id::ShowId::from_raw($show)),
+				season_number: Set(::flix_model::numbers::SeasonNumber::new($season)),
+				episode_number: Set(::flix_model::numbers::EpisodeNumber::new($episode)),
+				user_id: Set($user),
+				watched_date: Set(::chrono::Utc::now()),
+			}
+			.insert($db)
+			.await
+			.expect("insert");
+		};
+	}
+	pub(crate) use make_watched_episode;
+}
+
+#[cfg(test)]
+mod tests {
+	use flix_model::id::{MovieId, ShowId};
+
+	use chrono::NaiveDate;
+	use sea_orm::ActiveValue::{NotSet, Set};
+	use sea_orm::Condition;
+	use sea_orm::entity::prelude::*;
+	use sea_orm::sqlx::error::ErrorKind;
+
+	use crate::entity::content::test::{
+		make_content_collection, make_content_episode, make_content_library, make_content_movie,
+		make_content_season, make_content_show,
+	};
+	use crate::entity::info::test::{
+		make_info_episode, make_info_movie, make_info_season, make_info_show,
+	};
+	use crate::tests::new_initialized_memory_db;
+
+	use super::super::tests::get_error_kind;
+	use super::super::tests::notsettable;
+	use super::test::{make_watched_episode, make_watched_movie};
+
+	#[tokio::test]
+	async fn use_test_macros() {
+		let db = new_initialized_memory_db().await;
+
+		make_info_movie!(&db, 1);
+		make_info_show!(&db, 1);
+		make_info_season!(&db, 1, 1);
+		make_info_episode!(&db, 1, 1, 1);
+
+		make_watched_movie!(&db, 1, 1);
+		make_watched_episode!(&db, 1, 1, 1, 1);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_movies() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_movie {
+			($db:expr, $id:literal, $uid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id, $uid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.id, MovieId::from_raw($id));
+				assert_eq!(model.user_id, $uid);
+				assert_eq!(model.watched_date, NaiveDate::from_yo_opt($uid, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+			};
+			($db:expr, $id:literal, $uid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_movie!(@insert, $db, $id, $uid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $id:literal, $uid:literal $(; $($skip:ident),+)?) => {
+				super::movies::ActiveModel {
+					id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
+					user_id: notsettable!(user_id, $uid $(, $($skip),+)?),
+					watched_date: notsettable!(watched_date, NaiveDate::from_yo_opt($uid, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		assert_movie!(&db, 1, 1, ForeignKeyViolation);
+		make_info_movie!(&db, 1);
+		assert_movie!(&db, 1, 1, Success);
+		assert_movie!(&db, 1, 2, Success);
+
+		assert_movie!(&db, 1, 1, UniqueViolation);
+		make_info_movie!(&db, 2);
+		assert_movie!(&db, 2, 1, Success);
+		assert_movie!(&db, 2, 2, Success);
+
+		assert_movie!(&db, 3, 1, NotNullViolation; id);
+		assert_movie!(&db, 4, 1, NotNullViolation; user_id);
+		assert_movie!(&db, 5, 1, NotNullViolation; watched_date);
+	}
+
+	#[tokio::test]
+	async fn test_round_trip_episodes() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_episode {
+			($db:expr, $show:literal, $season:literal, $episode:literal, $uid:literal, Success $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $show, $season, $episode, $uid $(; $($skip),+)?)
+					.expect("insert");
+
+				assert_eq!(model.show_id, ShowId::from_raw($show));
+				assert_eq!(model.season_number, ::flix_model::numbers::SeasonNumber::new($season));
+				assert_eq!(model.episode_number, ::flix_model::numbers::EpisodeNumber::new($episode));
+				assert_eq!(model.user_id, $uid);
+				assert_eq!(model.watched_date, NaiveDate::from_yo_opt($uid, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc());
+			};
+			($db:expr, $show:literal, $season:literal, $episode:literal, $uid:literal, $error:ident $(; $($skip:ident),+)?) => {
+				let model = assert_episode!(@insert, $db, $show, $season, $episode, $uid $(; $($skip),+)?)
+					.expect_err("insert");
+
+				assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
+			};
+			(@insert, $db:expr, $show:literal, $season:literal, $episode:literal, $uid:literal $(; $($skip:ident),+)?) => {
+				super::episodes::ActiveModel {
+					show_id: notsettable!(show_id, ShowId::from_raw($show) $(, $($skip),+)?),
+					season_number: notsettable!(season_number, ::flix_model::numbers::SeasonNumber::new($season) $(, $($skip),+)?),
+					episode_number: notsettable!(episode_number, ::flix_model::numbers::EpisodeNumber::new($episode) $(, $($skip),+)?),
+					user_id: notsettable!(user_id, $uid $(, $($skip),+)?),
+					watched_date: notsettable!(watched_date, NaiveDate::from_yo_opt($uid, 1).expect("from_yo_opt").and_hms_opt(0, 0, 0).expect("and_hms_opt").and_utc() $(, $($skip),+)?),
+				}.insert($db).await
+			};
+		}
+
+		make_info_show!(&db, 1);
+		make_info_season!(&db, 1, 1);
+		make_info_show!(&db, 2);
+		make_info_season!(&db, 2, 1);
+
+		assert_episode!(&db, 1, 1, 1, 1, ForeignKeyViolation);
+		assert_episode!(&db, 2, 1, 1, 1, ForeignKeyViolation);
+		make_info_episode!(&db, 1, 1, 1);
+		make_info_episode!(&db, 2, 1, 1);
+		assert_episode!(&db, 1, 1, 1, 1, Success);
+		assert_episode!(&db, 1, 1, 1, 2, Success);
+		assert_episode!(&db, 2, 1, 1, 1, Success);
+
+		assert_episode!(&db, 1, 1, 1, 1, UniqueViolation);
+
+		assert_episode!(&db, 3, 1, 1, 1, NotNullViolation; show_id);
+		assert_episode!(&db, 4, 1, 1, 1, NotNullViolation; season_number);
+		assert_episode!(&db, 5, 1, 1, 1, NotNullViolation; episode_number);
+		assert_episode!(&db, 6, 1, 1, 1, NotNullViolation; user_id);
+		assert_episode!(&db, 7, 1, 1, 1, NotNullViolation; watched_date);
+	}
+
+	#[tokio::test]
+	async fn test_query_seasons() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_season {
+			($db:expr, $show:literal, $season:literal, $uid:literal, Watched) => {
+				assert_season!(@find, $db, $show, $season, $uid)
+					.ok_or(())
+					.expect("is none");
+			};
+			($db:expr, $show:literal, $season:literal, $uid:literal, Unwatched) => {
+				assert_season!(@find, $db, $show, $season, $uid)
+					.ok_or(())
+					.expect_err("is some");
+			};
+			(@find, $db:expr, $show:literal, $season:literal, $uid:literal) => {
+				super::seasons::Entity::find()
+					.filter(
+						Condition::all()
+							.add(super::seasons::Column::ShowId.eq($show))
+							.add(super::seasons::Column::SeasonNumber.eq($season))
+							.add(super::seasons::Column::UserId.eq($uid)),
+					)
+					.one(&db)
+					.await
+					.expect("find.filter.one")
+			};
+		}
+
+		make_content_library!(&db, 1);
+		make_content_show!(&db, 1, 1, None);
+
+		make_content_season!(&db, 1, 1, 1);
+		assert_season!(&db, 1, 1, 1, Unwatched);
+		make_content_episode!(&db, 1, 1, 1, 1);
+		assert_season!(&db, 1, 1, 1, Unwatched);
+		make_watched_episode!(&db, 1, 1, 1, 1);
+		assert_season!(&db, 1, 1, 1, Watched);
+		assert_season!(&db, 1, 1, 2, Unwatched);
+		make_content_episode!(&db, 1, 1, 1, 2);
+		assert_season!(&db, 1, 1, 1, Unwatched);
+
+		make_content_season!(&db, 1, 1, 2);
+		make_content_episode!(&db, 1, 1, 2, 1);
+		make_content_episode!(&db, 1, 1, 2, 2, >1);
+		make_info_episode!(&db, 1, 2, 3);
+		make_content_episode!(&db, 1, 1, 2, 4);
+		assert_season!(&db, 1, 2, 1, Unwatched);
+		assert_season!(&db, 1, 2, 2, Unwatched);
+		assert_season!(&db, 1, 2, 3, Unwatched);
+		make_watched_episode!(&db, 1, 2, 1, 1);
+		make_watched_episode!(&db, 1, 2, 1, 2);
+		make_watched_episode!(&db, 1, 2, 2, 3);
+		assert_season!(&db, 1, 2, 1, Unwatched);
+		assert_season!(&db, 1, 2, 2, Unwatched);
+		assert_season!(&db, 1, 2, 3, Unwatched);
+		make_watched_episode!(&db, 1, 2, 2, 1);
+		make_watched_episode!(&db, 1, 2, 2, 2);
+		make_watched_episode!(&db, 1, 2, 1, 3);
+		assert_season!(&db, 1, 2, 1, Unwatched);
+		assert_season!(&db, 1, 2, 2, Unwatched);
+		assert_season!(&db, 1, 2, 3, Unwatched);
+		make_watched_episode!(&db, 1, 2, 4, 1);
+		assert_season!(&db, 1, 2, 1, Watched);
+		assert_season!(&db, 1, 2, 2, Unwatched);
+		assert_season!(&db, 1, 2, 3, Unwatched);
+	}
+
+	#[tokio::test]
+	async fn test_query_shows() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_show {
+			($db:expr, $show:literal, $uid:literal, Watched) => {
+				assert_show!(@find, $db, $show, $uid)
+					.ok_or(())
+					.expect("is none");
+			};
+			($db:expr, $show:literal, $uid:literal, Unwatched) => {
+				assert_show!(@find, $db, $show, $uid)
+					.ok_or(())
+					.expect_err("is some");
+			};
+			(@find, $db:expr, $show:literal, $uid:literal) => {
+				super::shows::Entity::find()
+					.filter(
+						Condition::all()
+							.add(super::shows::Column::Id.eq($show))
+							.add(super::shows::Column::UserId.eq($uid)),
+					)
+					.one(&db)
+					.await
+					.expect("find.filter.one")
+			};
+		}
+
+		make_content_library!(&db, 1);
+		make_content_show!(&db, 1, 1, None);
+
+		assert_show!(&db, 1, 1, Unwatched);
+		make_content_season!(&db, 1, 1, 1);
+		assert_show!(&db, 1, 1, Unwatched);
+		make_content_episode!(&db, 1, 1, 1, 1);
+		assert_show!(&db, 1, 1, Unwatched);
+		make_watched_episode!(&db, 1, 1, 1, 1);
+		assert_show!(&db, 1, 1, Watched);
+		assert_show!(&db, 1, 2, Unwatched);
+		make_content_episode!(&db, 1, 1, 1, 2);
+		assert_show!(&db, 1, 1, Unwatched);
+		assert_show!(&db, 1, 2, Unwatched);
+		make_watched_episode!(&db, 1, 1, 2, 1);
+
+		make_content_season!(&db, 1, 1, 2);
+		assert_show!(&db, 1, 1, Unwatched);
+		assert_show!(&db, 1, 2, Unwatched);
+		make_content_episode!(&db, 1, 1, 2, 1);
+		assert_show!(&db, 1, 1, Unwatched);
+		assert_show!(&db, 1, 2, Unwatched);
+		make_watched_episode!(&db, 1, 2, 1, 1);
+		assert_show!(&db, 1, 1, Watched);
+		assert_show!(&db, 1, 2, Unwatched);
+	}
+
+	#[tokio::test]
+	async fn test_query_collections() {
+		let db = new_initialized_memory_db().await;
+
+		macro_rules! assert_collection {
+			($db:expr, $id:literal, $uid:literal, Watched) => {
+				assert_collection!(@find, $db, $id, $uid)
+					.ok_or(())
+					.expect("is none");
+			};
+			($db:expr, $id:literal, $uid:literal, Unwatched) => {
+				assert_collection!(@find, $db, $id, $uid)
+					.ok_or(())
+					.expect_err("is some");
+			};
+			(@find, $db:expr, $id:literal, $uid:literal) => {
+				super::collections::Entity::find()
+					.filter(
+						Condition::all()
+							.add(super::collections::Column::Id.eq($id))
+							.add(super::collections::Column::UserId.eq($uid)),
+					)
+					.one(&db)
+					.await
+					.expect("find.filter.one")
+			};
+		}
+
+		make_content_library!(&db, 1);
+		make_content_collection!(&db, 1, 1, None);
+		assert_collection!(&db, 1, 1, Unwatched);
+
+		make_content_movie!(&db, 1, 1, Some(1));
+		assert_collection!(&db, 1, 1, Unwatched);
+		make_info_movie!(&db, 9999);
+		make_watched_movie!(&db, 9999, 1);
+		assert_collection!(&db, 1, 1, Unwatched);
+		make_watched_movie!(&db, 1, 1);
+		assert_collection!(&db, 1, 1, Watched);
+
+		make_content_collection!(&db, 1, 2, Some(1));
+		assert_collection!(&db, 1, 1, Watched);
+		assert_collection!(&db, 2, 1, Unwatched);
+		make_content_movie!(&db, 1, 2, Some(2));
+		assert_collection!(&db, 1, 1, Unwatched);
+		assert_collection!(&db, 2, 1, Unwatched);
+		make_watched_movie!(&db, 2, 1);
+		assert_collection!(&db, 1, 1, Watched);
+		assert_collection!(&db, 2, 1, Watched);
+
+		make_content_show!(&db, 1, 1, Some(2));
+		assert_collection!(&db, 1, 1, Unwatched);
+		assert_collection!(&db, 2, 1, Unwatched);
+		make_content_season!(&db, 1, 1, 1);
+		make_content_episode!(&db, 1, 1, 1, 1);
+		make_watched_episode!(&db, 1, 1, 1, 1);
+		assert_collection!(&db, 1, 1, Watched);
+		assert_collection!(&db, 2, 1, Watched);
+	}
+}

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

@@ -1,26 +0,0 @@
-//! Collection entity
-
-use flix_model::id::{CollectionId, RawId};
-
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a watched movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_watched_collections")]
-pub struct Model {
-	/// The collection's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: CollectionId,
-	/// The user's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub user_id: RawId,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,36 +0,0 @@
-//! Episode entity
-
-use flix_model::id::{RawId, ShowId};
-use flix_model::numbers::{EpisodeNumber, SeasonNumber};
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a watched movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_watched_episodes")]
-pub struct Model {
-	/// The episode's show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub show: ShowId,
-	/// The episode's season's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub season: SeasonNumber,
-	/// The episode's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub episode: EpisodeNumber,
-	/// The user's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub user_id: RawId,
-	/// The date this episode was watched
-	pub watched_date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,289 +0,0 @@
-//! This module contains entities for storing watched information
-
-pub mod collections;
-
-pub mod movies;
-
-pub mod episodes;
-pub mod seasons;
-pub mod shows;
-
-#[cfg(test)]
-mod tests {
-
-	use flix_model::id::{MovieId, ShowId};
-
-	use chrono::NaiveDate;
-	use sea_orm::ActiveValue::{NotSet, Set};
-	use sea_orm::sqlx::error::ErrorKind;
-	use sea_orm::{ActiveModelTrait, ColumnTrait, Condition, EntityTrait, QueryFilter};
-	use sea_orm_migration::MigratorTrait;
-
-	use crate::entity::tests::{have_collection, have_library, have_movie, have_season, have_show};
-	use crate::migration::Migrator;
-	use crate::tests::new_memory_db;
-
-	use super::super::tests::get_error_kind;
-	use super::super::tests::notsettable;
-	use super::super::tests::{
-		have_episode, make_flix_episode, make_flix_movie, make_flix_season, make_flix_show,
-	};
-
-	macro_rules! assert_movie {
-		($db:expr, $id:literal, $uid:literal, Success $(; $($skip:ident),+)?) => {
-			let model = assert_movie!(@insert, $db, $id, $uid $(; $($skip),+)?)
-				.expect("insert");
-
-			assert_eq!(model.id, MovieId::from_raw($id));
-			assert_eq!(model.user_id, $uid);
-			assert_eq!(model.watched_date, NaiveDate::from_yo_opt(2000, $uid).expect("NaiveDate::from_yo_opt"));
-		};
-		($db:expr, $id:literal, $uid:literal, $error:ident $(; $($skip:ident),+)?) => {
-			let model = assert_movie!(@insert, $db, $id, $uid $(; $($skip),+)?)
-				.expect_err("insert");
-
-			assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-		};
-		(@insert, $db:expr, $id:literal, $uid:literal $(; $($skip:ident),+)?) => {
-			super::movies::ActiveModel {
-				id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
-				user_id: notsettable!(user_id, $uid $(, $($skip),+)?),
-				watched_date: notsettable!(watched_date, NaiveDate::from_yo_opt(2000, $uid).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-			}.insert($db).await
-		};
-	}
-
-	macro_rules! assert_episode {
-		($db:expr, $show:literal, $season:literal, $episode:literal, $uid:literal, Success $(; $($skip:ident),+)?) => {
-			let model = assert_episode!(@insert, $db, $show, $season, $episode, $uid $(; $($skip),+)?)
-				.expect("insert");
-
-			assert_eq!(model.show, ShowId::from_raw($show));
-			assert_eq!(model.season, $season);
-			assert_eq!(model.episode, $episode);
-			assert_eq!(model.user_id, $uid);
-			assert_eq!(model.watched_date, NaiveDate::from_yo_opt(2000, $uid).expect("NaiveDate::from_yo_opt"));
-		};
-		($db:expr, $show:literal, $season:literal, $episode:literal, $uid:literal, $error:ident $(; $($skip:ident),+)?) => {
-			let model = assert_episode!(@insert, $db, $show, $season, $episode, $uid $(; $($skip),+)?)
-				.expect_err("insert");
-
-			assert_eq!(get_error_kind(model).expect("get_error_kind"), ErrorKind::$error);
-		};
-		(@insert, $db:expr, $show:literal, $season:literal, $episode:literal, $uid:literal $(; $($skip:ident),+)?) => {
-			super::episodes::ActiveModel {
-				show: notsettable!(show, ShowId::from_raw($show) $(, $($skip),+)?),
-				season: notsettable!(season, $season $(, $($skip),+)?),
-				episode: notsettable!(episode, $episode $(, $($skip),+)?),
-				user_id: notsettable!(user_id, $uid $(, $($skip),+)?),
-				watched_date: notsettable!(watched_date, NaiveDate::from_yo_opt(2000, $uid).expect("NaiveDate::from_yo_opt") $(, $($skip),+)?),
-			}.insert($db).await
-		};
-	}
-
-	#[tokio::test]
-	async fn test_inserts() {
-		let db = new_memory_db().await;
-		Migrator::up(&db, None).await.expect("up");
-
-		// Movies
-		assert_movie!(&db, 1, 1, ForeignKeyViolation);
-		make_flix_movie!(&db, 1);
-		make_flix_movie!(&db, 2);
-
-		assert_movie!(&db, 1, 1, Success);
-		assert_movie!(&db, 1, 1, UniqueViolation);
-		assert_movie!(&db, 2, 1, Success);
-		assert_movie!(&db, 3, 1, NotNullViolation; id);
-		assert_movie!(&db, 4, 1, NotNullViolation; user_id);
-		assert_movie!(&db, 5, 1, NotNullViolation; watched_date);
-
-		// Episodes
-		make_flix_show!(&db, 1);
-		make_flix_season!(&db, 1, 1);
-		make_flix_show!(&db, 2);
-		make_flix_season!(&db, 2, 1);
-
-		assert_episode!(&db, 1, 1, 1, 1, ForeignKeyViolation);
-		make_flix_episode!(&db, 1, 1, 1);
-		make_flix_episode!(&db, 1, 1, 2);
-		make_flix_episode!(&db, 2, 1, 1);
-
-		assert_episode!(&db, 1, 1, 1, 1, Success);
-		assert_episode!(&db, 1, 1, 1, 1, UniqueViolation);
-		assert_episode!(&db, 1, 1, 2, 1, Success);
-		assert_episode!(&db, 2, 1, 1, 1, Success);
-		assert_episode!(&db, 3, 1, 1, 1, NotNullViolation; show);
-		assert_episode!(&db, 4, 1, 1, 1, NotNullViolation; season);
-		assert_episode!(&db, 5, 1, 1, 1, NotNullViolation; episode);
-		assert_episode!(&db, 6, 1, 1, 1, NotNullViolation; user_id);
-		assert_episode!(&db, 7, 1, 1, 1, NotNullViolation; watched_date);
-	}
-
-	#[tokio::test]
-	async fn test_queries() {
-		let db = new_memory_db().await;
-		Migrator::up(&db, None).await.expect("up");
-
-		have_library!(&db, 1);
-
-		// Season + Show
-		macro_rules! assert_season {
-			($db:expr, $show:literal, $season:literal, $uid:literal, Watched) => {
-				assert_season!(@find, $db, $show, $season, $uid)
-					.ok_or(())
-					.expect("is none");
-			};
-			($db:expr, $show:literal, $season:literal, $uid:literal, Unwatched) => {
-				assert_season!(@find, $db, $show, $season, $uid)
-					.ok_or(())
-					.expect_err("is some");
-			};
-			(@find, $db:expr, $show:literal, $season:literal, $uid:literal) => {
-				super::seasons::Entity::find()
-					.filter(
-						Condition::all()
-							.add(super::seasons::Column::Show.eq($show))
-							.add(super::seasons::Column::Season.eq($season))
-							.add(super::seasons::Column::UserId.eq($uid)),
-					)
-					.one(&db)
-					.await
-					.expect("find.filter.one")
-			};
-		}
-		macro_rules! assert_show {
-			($db:expr, $show:literal, $uid:literal, Watched) => {
-				assert_show!(@find, $db, $show, $uid)
-					.ok_or(())
-					.expect("is none");
-			};
-			($db:expr, $show:literal, $uid:literal, Unwatched) => {
-				assert_show!(@find, $db, $show, $uid)
-					.ok_or(())
-					.expect_err("is some");
-			};
-			(@find, $db:expr, $show:literal, $uid:literal) => {
-				super::shows::Entity::find()
-					.filter(
-						Condition::all()
-							.add(super::shows::Column::Id.eq($show))
-							.add(super::shows::Column::UserId.eq($uid)),
-					)
-					.one(&db)
-					.await
-					.expect("find.filter.one")
-			};
-		}
-
-		have_show!(&db, 1, 1, None);
-		have_season!(&db, 1, 1, 1);
-		have_episode!(&db, 1, 1, 1, 1);
-		assert_episode!(&db, 1, 1, 1, 1, Success);
-		assert_episode!(&db, 1, 1, 1, 2, Success);
-		have_episode!(&db, 1, 1, 1, 2, >1); // Covers 2 and 3
-		make_flix_episode!(&db, 1, 1, 3);
-		assert_episode!(&db, 1, 1, 2, 1, Success);
-		assert_episode!(&db, 1, 1, 2, 2, Success);
-		have_season!(&db, 1, 1, 2);
-		have_episode!(&db, 1, 1, 2, 1);
-		assert_episode!(&db, 1, 2, 1, 1, Success);
-		assert_episode!(&db, 1, 2, 1, 2, Success);
-		have_episode!(&db, 1, 1, 2, 2);
-		assert_episode!(&db, 1, 2, 2, 1, Success);
-		have_episode!(&db, 1, 1, 2, 3);
-		assert_episode!(&db, 1, 2, 3, 1, Success);
-
-		// Add watched episodes that we do not have
-		make_flix_episode!(&db, 1, 1, 4);
-		assert_episode!(&db, 1, 1, 4, 1, Success);
-		make_flix_episode!(&db, 1, 2, 4);
-		assert_episode!(&db, 1, 2, 4, 2, Success);
-		make_flix_episode!(&db, 1, 2, 5);
-		assert_episode!(&db, 1, 2, 5, 2, Success);
-
-		assert_season!(&db, 1, 1, 1, Watched);
-		assert_season!(&db, 1, 1, 2, Watched);
-		assert_season!(&db, 1, 1, 3, Unwatched);
-		assert_season!(&db, 1, 2, 1, Watched);
-		assert_season!(&db, 1, 2, 2, Unwatched);
-		assert_season!(&db, 1, 2, 3, Unwatched);
-		assert_season!(&db, 1, 3, 1, Unwatched);
-		assert_season!(&db, 1, 3, 2, Unwatched);
-		assert_season!(&db, 1, 3, 3, Unwatched);
-
-		assert_show!(&db, 1, 1, Watched);
-		assert_show!(&db, 1, 2, Unwatched);
-		assert_show!(&db, 1, 3, Unwatched);
-		assert_show!(&db, 2, 1, Unwatched);
-		assert_show!(&db, 2, 2, Unwatched);
-		assert_show!(&db, 2, 3, Unwatched);
-
-		// Collection
-		macro_rules! assert_collection {
-			($db:expr, $id:literal, $uid:literal, Watched) => {
-				assert_collection!(@find, $db, $id, $uid)
-					.ok_or(())
-					.expect("is none");
-			};
-			($db:expr, $id:literal, $uid:literal, Unwatched) => {
-				assert_collection!(@find, $db, $id, $uid)
-					.ok_or(())
-					.expect_err("is some");
-			};
-			(@find, $db:expr, $id:literal, $uid:literal) => {
-				super::collections::Entity::find()
-					.filter(
-						Condition::all()
-							.add(super::collections::Column::Id.eq($id))
-							.add(super::collections::Column::UserId.eq($uid)),
-					)
-					.one(&db)
-					.await
-					.expect("find.filter.one")
-			};
-		}
-
-		have_collection!(&db, 1, 1, None);
-		have_movie!(&db, 1, 1, Some(1));
-		assert_movie!(&db, 1, 1, Success);
-		assert_movie!(&db, 1, 2, Success);
-		have_movie!(&db, 1, 2, Some(1));
-		assert_movie!(&db, 2, 1, Success);
-		assert_movie!(&db, 2, 2, Success);
-
-		have_collection!(&db, 1, 2, Some(1));
-		have_movie!(&db, 1, 3, Some(2));
-		have_show!(&db, 1, 2, Some(2));
-		have_season!(&db, 1, 2, 1);
-		have_episode!(&db, 1, 2, 1, 1);
-		assert_episode!(&db, 2, 1, 1, 1, Success);
-		assert_movie!(&db, 3, 1, Success);
-		have_movie!(&db, 1, 4, Some(2));
-		assert_movie!(&db, 4, 1, Success);
-
-		have_collection!(&db, 1, 3, Some(2));
-		have_movie!(&db, 1, 5, Some(3));
-		assert_movie!(&db, 5, 1, Success);
-		have_movie!(&db, 1, 6, Some(3));
-		assert_movie!(&db, 6, 1, Success);
-		assert_movie!(&db, 6, 2, Success);
-
-		have_collection!(&db, 1, 4, Some(3));
-		have_movie!(&db, 1, 7, Some(4));
-		assert_movie!(&db, 7, 1, Success);
-		assert_movie!(&db, 7, 2, Success);
-		have_movie!(&db, 1, 8, Some(4));
-		assert_movie!(&db, 8, 1, Success);
-		assert_movie!(&db, 8, 2, Success);
-
-		assert_collection!(&db, 1, 1, Watched);
-		assert_collection!(&db, 1, 2, Unwatched);
-		assert_collection!(&db, 2, 1, Watched);
-		assert_collection!(&db, 2, 2, Unwatched);
-		assert_collection!(&db, 3, 1, Watched);
-		assert_collection!(&db, 3, 2, Unwatched);
-		assert_collection!(&db, 4, 1, Watched);
-		assert_collection!(&db, 4, 2, Watched);
-	}
-}

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

@@ -1,29 +0,0 @@
-//! Movie entity
-
-use flix_model::id::{MovieId, RawId};
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a watched movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_watched_movies")]
-pub struct Model {
-	/// The movie's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: MovieId,
-	/// The user's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub user_id: RawId,
-	/// The date this movie was watched
-	pub watched_date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,33 +0,0 @@
-//! Episode entity
-
-use flix_model::id::{RawId, ShowId};
-use flix_model::numbers::SeasonNumber;
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a watched movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_watched_seasons")]
-pub struct Model {
-	/// The season's show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub show: ShowId,
-	/// The season's number
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub season: SeasonNumber,
-	/// The user's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub user_id: RawId,
-	/// The date this season was watched
-	pub watched_date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

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

@@ -1,29 +0,0 @@
-//! Show entity
-
-use flix_model::id::{RawId, ShowId};
-
-use chrono::NaiveDate;
-use sea_orm::{
-	ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
-	EnumIter, PrimaryKeyTrait,
-};
-
-/// The database representation of a watched movie
-#[derive(Debug, Clone, DeriveEntityModel)]
-#[sea_orm(table_name = "flix_watched_shows")]
-pub struct Model {
-	/// The show's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub id: ShowId,
-	/// The user's ID
-	#[sea_orm(primary_key, auto_increment = false)]
-	pub user_id: RawId,
-	/// The date this show was watched
-	pub watched_date: NaiveDate,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-/// Relation
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}

crates/db/src/lib.rs

@@ -10,8 +10,17 @@ pub mod migration;
 mod tests {
 	use sea_orm::{ConnectOptions, Database, DatabaseConnection};
 
-	pub async fn new_memory_db() -> DatabaseConnection {
-		let options = ConnectOptions::new("sqlite:/tmp/db?mode=memory");
-		Database::connect(options).await.expect("Database::connect")
+	use crate::connection::Connection;
+
+	pub async fn new_initialized_memory_db() -> DatabaseConnection {
+		let options = ConnectOptions::new("sqlite::memory:");
+
+		let db = Database::connect(options)
+			.await
+			.expect("Database::connect()");
+		let connection = Connection::try_from(db)
+			.await
+			.expect("Connection::try_from");
+		connection.take()
 	}
 }

crates/db/src/migration/m_000001.rs

@@ -1,52 +1,33 @@
-//! Adds entity/info tables:
+//! Adds watched views:
 //!  - Collections
-//!  - Movies
 //!  - Shows
 //!  - Seasons
-//!  - Episodes
 
 use sea_orm::{DbErr, DeriveMigrationName};
 use sea_orm_migration::async_trait;
 use sea_orm_migration::{MigrationTrait, SchemaManager};
 
 mod collections;
-mod episodes;
-mod movies;
 mod seasons;
 mod shows;
 
-#[allow(unused_imports)]
-pub use collections::FlixInfoCollections;
-#[allow(unused_imports)]
-pub use episodes::FlixInfoEpisodes;
-#[allow(unused_imports)]
-pub use movies::FlixInfoMovies;
-#[allow(unused_imports)]
-pub use seasons::FlixInfoSeasons;
-#[allow(unused_imports)]
-pub use shows::FlixInfoShows;
-
 #[derive(DeriveMigrationName)]
 pub(super) struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
 	async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		collections::up(manager).await?;
-		movies::up(manager).await?;
-		shows::up(manager).await?;
 		seasons::up(manager).await?;
-		episodes::up(manager).await?;
+		shows::up(manager).await?;
+		collections::up(manager).await?;
 
 		Ok(())
 	}
 
 	async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		episodes::down(manager).await?;
-		seasons::down(manager).await?;
-		shows::down(manager).await?;
-		movies::down(manager).await?;
 		collections::down(manager).await?;
+		shows::down(manager).await?;
+		seasons::down(manager).await?;
 
 		Ok(())
 	}

crates/db/src/migration/m_000001/collections.rs

@@ -1,39 +1,88 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::string;
-
-#[derive(Iden)]
-pub enum FlixInfoCollections {
-	Table,
-	Id,
-	Title,
-	Overview,
-}
+use sea_orm::prelude::*;
+use sea_orm::sea_query::Table;
+use sea_orm::{ConnectionTrait, DbBackend, Statement};
+use sea_orm_migration::prelude::*;
 
 pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 	manager
-		.create_table(
-			Table::create()
-				.table(FlixInfoCollections::Table)
-				.col(sqlite_rowid_alias(FlixInfoCollections::Id))
-				.col(string(FlixInfoCollections::Title))
-				.col(string(FlixInfoCollections::Overview))
-				.to_owned(),
-		)
+		.drop_table(Table::drop().table("flix_watched_collections").to_owned())
 		.await?;
 
 	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_info_collections-title")
-				.table(FlixInfoCollections::Table)
-				.col(FlixInfoCollections::Title)
-				.to_owned(),
+		.get_connection()
+		.execute_raw(Statement::from_string(
+			DbBackend::Sqlite,
+			r#"
+				CREATE VIEW flix_watched_collections AS
+				WITH RECURSIVE
+				watched_items AS (
+					SELECT
+						w.id,
+						w.user_id,
+						w.watched_date,
+						'movie' AS type
+					FROM flix_watched_movies w
+
+					UNION ALL
+
+					SELECT
+						w.id,
+						w.user_id,
+						w.watched_date,
+						'show' AS type
+					FROM flix_watched_shows w
+				),
+				collection_items AS (
+					SELECT
+						m.parent_id,
+						m.id,
+						'movie' AS type
+					FROM flix_movies m
+					WHERE m.parent_id IS NOT NULL
+
+					UNION ALL
+
+					SELECT
+						s.parent_id,
+						s.id,
+						'show' AS type
+					FROM flix_shows s
+					WHERE s.parent_id IS NOT NULL
+
+					UNION ALL
+
+					SELECT
+						c.parent_id,
+						ci.id,
+						ci.type
+					FROM collection_items ci
+					JOIN flix_collections c
+						ON c.id = ci.parent_id
 				)
+				SELECT
+					ci.parent_id AS id,
+					wi.user_id,
+					MAX(wi.watched_date) AS watched_date
+				FROM collection_items ci
+				JOIN watched_items wi
+					ON wi.id = ci.id
+					AND wi.type = ci.type
+				WHERE NOT EXISTS (
+					SELECT 1
+					FROM collection_items ci2
+					WHERE ci2.parent_id = ci.parent_id
+					AND NOT EXISTS (
+						SELECT 1
+						FROM watched_items wi2
+						WHERE wi2.id = ci2.id
+						AND wi2.type = ci2.type
+						AND wi2.user_id = wi.user_id
+					)
+				)
+				GROUP BY ci.parent_id, wi.user_id
+				;
+			"#,
+		))
 		.await?;
 
 	Ok(())
@@ -41,6 +90,15 @@ pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 
 pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 	manager
-		.drop_table(Table::drop().table(FlixInfoCollections::Table).to_owned())
-		.await
+		.get_connection()
+		.execute_raw(Statement::from_string(
+			DbBackend::Sqlite,
+			r#"
+				DROP VIEW flix_watched_collections
+				;
+			"#,
+		))
+		.await?;
+
+	Ok(())
 }

crates/db/src/migration/m_000001/episodes.rs

@@ -1,68 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer, string};
-
-use crate::migration::m_000001::FlixInfoShows;
-
-use super::FlixInfoSeasons;
-
-#[derive(Iden)]
-pub enum FlixInfoEpisodes {
-	Table,
-	Show,
-	Season,
-	Episode,
-	Title,
-	Overview,
-	Date,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixInfoEpisodes::Table)
-				.col(integer(FlixInfoEpisodes::Show))
-				.col(integer(FlixInfoEpisodes::Season))
-				.col(integer(FlixInfoEpisodes::Episode))
-				.col(string(FlixInfoEpisodes::Title))
-				.col(string(FlixInfoEpisodes::Overview))
-				.col(date(FlixInfoEpisodes::Date))
-				.primary_key(
-					Index::create()
-						.col(FlixInfoEpisodes::Show)
-						.col(FlixInfoEpisodes::Season)
-						.col(FlixInfoEpisodes::Episode),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_info_episodes-show")
-						.from_tbl(FlixInfoEpisodes::Table)
-						.from_col(FlixInfoEpisodes::Show)
-						.to_tbl(FlixInfoShows::Table)
-						.to_col(FlixInfoShows::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_info_episodes-show_season")
-						.from_tbl(FlixInfoEpisodes::Table)
-						.from_col(FlixInfoEpisodes::Show)
-						.from_col(FlixInfoEpisodes::Season)
-						.to_tbl(FlixInfoSeasons::Table)
-						.to_col(FlixInfoSeasons::Show)
-						.to_col(FlixInfoSeasons::Season),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixInfoEpisodes::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000001/movies.rs

@@ -1,60 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, string};
-
-#[derive(Iden)]
-pub enum FlixInfoMovies {
-	Table,
-	Id,
-	Title,
-	Tagline,
-	Overview,
-	Date,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixInfoMovies::Table)
-				.col(sqlite_rowid_alias(FlixInfoMovies::Id))
-				.col(string(FlixInfoMovies::Title))
-				.col(string(FlixInfoMovies::Tagline))
-				.col(string(FlixInfoMovies::Overview))
-				.col(date(FlixInfoMovies::Date))
-				.to_owned(),
-		)
-		.await?;
-
-	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_info_movies-title")
-				.table(FlixInfoMovies::Table)
-				.col(FlixInfoMovies::Title)
-				.to_owned(),
-		)
-		.await?;
-
-	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_info_movies-date")
-				.table(FlixInfoMovies::Table)
-				.col(FlixInfoMovies::Date)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixInfoMovies::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000001/seasons.rs

@@ -1,46 +1,43 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer, string};
-
-use super::FlixInfoShows;
-
-#[derive(Iden)]
-pub enum FlixInfoSeasons {
-	Table,
-	Show,
-	Season,
-	Title,
-	Overview,
-	Date,
-}
+use sea_orm::prelude::*;
+use sea_orm::sea_query::Table;
+use sea_orm::{ConnectionTrait, DbBackend, Statement};
+use sea_orm_migration::prelude::*;
 
 pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 	manager
-		.create_table(
-			Table::create()
-				.table(FlixInfoSeasons::Table)
-				.col(integer(FlixInfoSeasons::Show))
-				.col(integer(FlixInfoSeasons::Season))
-				.col(string(FlixInfoSeasons::Title))
-				.col(string(FlixInfoSeasons::Overview))
-				.col(date(FlixInfoSeasons::Date))
-				.primary_key(
-					Index::create()
-						.col(FlixInfoSeasons::Show)
-						.col(FlixInfoSeasons::Season),
+		.drop_table(Table::drop().table("flix_watched_seasons").to_owned())
+		.await?;
+
+	manager
+		.get_connection()
+		.execute_raw(Statement::from_string(
+			DbBackend::Sqlite,
+			r#"
+				CREATE VIEW flix_watched_seasons AS
+				SELECT
+					w.show_id,
+					w.season_number,
+					w.user_id,
+					MAX(w.watched_date) AS watched_date
+				FROM flix_watched_episodes w
+				WHERE NOT EXISTS (
+					SELECT 1
+					FROM flix_episodes e
+					WHERE e.show_id = w.show_id
+					AND e.season_number = w.season_number
+					AND NOT EXISTS (
+						SELECT 1
+						FROM flix_watched_episodes wc
+						WHERE wc.show_id = e.show_id
+						AND wc.season_number = e.season_number
+						AND wc.episode_number = e.episode_number
+						AND wc.user_id = w.user_id
 					)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_info_seasons-show")
-						.from_tbl(FlixInfoSeasons::Table)
-						.from_col(FlixInfoSeasons::Show)
-						.to_tbl(FlixInfoShows::Table)
-						.to_col(FlixInfoShows::Id),
-				)
-				.to_owned(),
 				)
+				GROUP BY w.show_id, w.season_number, w.user_id
+				;
+			"#,
+		))
 		.await?;
 
 	Ok(())
@@ -48,6 +45,15 @@ pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 
 pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 	manager
-		.drop_table(Table::drop().table(FlixInfoSeasons::Table).to_owned())
-		.await
+		.get_connection()
+		.execute_raw(Statement::from_string(
+			DbBackend::Sqlite,
+			r#"
+				DROP VIEW flix_watched_seasons
+				;
+			"#,
+		))
+		.await?;
+
+	Ok(())
 }

crates/db/src/migration/m_000001/shows.rs

@@ -1,53 +1,40 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, string};
-
-#[derive(Iden)]
-pub enum FlixInfoShows {
-	Table,
-	Id,
-	Title,
-	Tagline,
-	Overview,
-	Date,
-}
+use sea_orm::prelude::*;
+use sea_orm::sea_query::Table;
+use sea_orm::{ConnectionTrait, DbBackend, Statement};
+use sea_orm_migration::prelude::*;
 
 pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 	manager
-		.create_table(
-			Table::create()
-				.table(FlixInfoShows::Table)
-				.col(sqlite_rowid_alias(FlixInfoShows::Id))
-				.col(string(FlixInfoShows::Title))
-				.col(string(FlixInfoShows::Tagline))
-				.col(string(FlixInfoShows::Overview))
-				.col(date(FlixInfoShows::Date))
-				.to_owned(),
-		)
+		.drop_table(Table::drop().table("flix_watched_shows").to_owned())
 		.await?;
 
 	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_info_shows-title")
-				.table(FlixInfoShows::Table)
-				.col(FlixInfoShows::Title)
-				.to_owned(),
+		.get_connection()
+		.execute_raw(Statement::from_string(
+			DbBackend::Sqlite,
+			r#"
+				CREATE VIEW flix_watched_shows AS
+				SELECT
+					w.show_id as id,
+					w.user_id,
+					MAX(w.watched_date) AS watched_date
+				FROM flix_watched_seasons w
+				WHERE NOT EXISTS (
+					SELECT 1
+					FROM flix_seasons s
+					WHERE s.show_id = w.show_id
+					AND NOT EXISTS (
+						SELECT 1
+						FROM flix_watched_seasons wc
+						WHERE wc.show_id = s.show_id
+						AND wc.season_number = s.season_number
+						AND wc.user_id = w.user_id
 					)
-		.await?;
-
-	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_info_shows-date")
-				.table(FlixInfoShows::Table)
-				.col(FlixInfoShows::Date)
-				.to_owned(),
 				)
+				GROUP BY w.show_id, w.user_id
+				;
+			"#,
+		))
 		.await?;
 
 	Ok(())
@@ -55,6 +42,15 @@ pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 
 pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
 	manager
-		.drop_table(Table::drop().table(FlixInfoShows::Table).to_owned())
-		.await
+		.get_connection()
+		.execute_raw(Statement::from_string(
+			DbBackend::Sqlite,
+			r#"
+				DROP VIEW flix_watched_shows
+				;
+			"#,
+		))
+		.await?;
+
+	Ok(())
 }

crates/db/src/migration/m_000002.rs

@@ -1,53 +0,0 @@
-//! Adds entity/tmdb tables:
-//!  - Collections
-//!  - Movies
-//!  - Shows
-//!  - Seasons
-//!  - Episodes
-
-use sea_orm::{DbErr, DeriveMigrationName};
-use sea_orm_migration::async_trait;
-use sea_orm_migration::{MigrationTrait, SchemaManager};
-
-mod collections;
-mod episodes;
-mod movies;
-mod seasons;
-mod shows;
-
-#[allow(unused_imports)]
-pub use collections::FlixTmdbCollections;
-#[allow(unused_imports)]
-pub use episodes::FlixTmdbEpisodes;
-#[allow(unused_imports)]
-pub use movies::FlixTmdbMovies;
-#[allow(unused_imports)]
-pub use seasons::FlixTmdbSeasons;
-#[allow(unused_imports)]
-pub use shows::FlixTmdbShows;
-
-#[derive(DeriveMigrationName)]
-pub(super) struct Migration;
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-	async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		collections::up(manager).await?;
-		movies::up(manager).await?;
-		shows::up(manager).await?;
-		seasons::up(manager).await?;
-		episodes::up(manager).await?;
-
-		Ok(())
-	}
-
-	async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		episodes::down(manager).await?;
-		seasons::down(manager).await?;
-		shows::down(manager).await?;
-		movies::down(manager).await?;
-		collections::down(manager).await?;
-
-		Ok(())
-	}
-}

crates/db/src/migration/m_000002/collections.rs

@@ -1,58 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer};
-
-use super::super::m_000001::FlixInfoCollections;
-
-#[derive(Iden)]
-pub enum FlixTmdbCollections {
-	Table,
-	TmdbId,
-	FlixId,
-	LastUpdate,
-	MovieCount,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixTmdbCollections::Table)
-				.col(sqlite_rowid_alias(FlixTmdbCollections::TmdbId))
-				.col(integer(FlixTmdbCollections::FlixId).unique_key())
-				.col(date(FlixTmdbCollections::LastUpdate))
-				.col(integer(FlixTmdbCollections::MovieCount))
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_collections-flixid")
-						.from_tbl(FlixTmdbCollections::Table)
-						.from_col(FlixTmdbCollections::FlixId)
-						.to_tbl(FlixInfoCollections::Table)
-						.to_col(FlixInfoCollections::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_tmdb_collections-flixid")
-				.table(FlixTmdbCollections::Table)
-				.col(FlixTmdbCollections::FlixId)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixTmdbCollections::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000002/episodes.rs

@@ -1,94 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer};
-
-use super::super::m_000001::{FlixInfoEpisodes, FlixInfoSeasons};
-
-use super::FlixTmdbSeasons;
-
-#[derive(Iden)]
-pub enum FlixTmdbEpisodes {
-	Table,
-	TmdbShow,
-	TmdbSeason,
-	TmdbEpisode,
-	FlixShow,
-	FlixSeason,
-	FlixEpisode,
-	LastUpdate,
-	Runtime,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixTmdbEpisodes::Table)
-				.col(integer(FlixTmdbEpisodes::TmdbShow))
-				.col(integer(FlixTmdbEpisodes::TmdbSeason))
-				.col(integer(FlixTmdbEpisodes::TmdbEpisode))
-				.col(integer(FlixTmdbEpisodes::FlixShow))
-				.col(integer(FlixTmdbEpisodes::FlixSeason))
-				.col(integer(FlixTmdbEpisodes::FlixEpisode))
-				.col(date(FlixTmdbEpisodes::LastUpdate))
-				.col(integer(FlixTmdbEpisodes::Runtime))
-				.primary_key(
-					Index::create()
-						.col(FlixTmdbEpisodes::TmdbShow)
-						.col(FlixTmdbEpisodes::TmdbSeason)
-						.col(FlixTmdbEpisodes::TmdbEpisode),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_episodes-tmdb_show_season")
-						.from_tbl(FlixTmdbEpisodes::Table)
-						.from_col(FlixTmdbEpisodes::TmdbShow)
-						.from_col(FlixTmdbEpisodes::TmdbSeason)
-						.to_tbl(FlixTmdbSeasons::Table)
-						.to_col(FlixTmdbSeasons::TmdbShow)
-						.to_col(FlixTmdbSeasons::TmdbSeason),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_episodes-flix_show_season")
-						.from_tbl(FlixTmdbEpisodes::Table)
-						.from_col(FlixTmdbEpisodes::FlixShow)
-						.from_col(FlixTmdbEpisodes::FlixSeason)
-						.to_tbl(FlixInfoSeasons::Table)
-						.to_col(FlixInfoSeasons::Show)
-						.to_col(FlixInfoSeasons::Season),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_episodes-flix_show_season_episode")
-						.from_tbl(FlixTmdbEpisodes::Table)
-						.from_col(FlixTmdbEpisodes::FlixShow)
-						.from_col(FlixTmdbEpisodes::FlixSeason)
-						.from_col(FlixTmdbEpisodes::FlixEpisode)
-						.to_tbl(FlixInfoEpisodes::Table)
-						.to_col(FlixInfoEpisodes::Show)
-						.to_col(FlixInfoEpisodes::Season)
-						.to_col(FlixInfoEpisodes::Episode),
-				)
-				.index(
-					Index::create()
-						.unique()
-						.name("idx-flix_tmdb_episodes-flix_show_season_episode")
-						.col(FlixTmdbEpisodes::FlixShow)
-						.col(FlixTmdbEpisodes::FlixSeason)
-						.col(FlixTmdbEpisodes::FlixEpisode),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixTmdbEpisodes::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000002/movies.rs

@@ -1,70 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer, integer_null};
-
-use crate::migration::m_000002::FlixTmdbCollections;
-
-use super::super::m_000001::FlixInfoMovies;
-
-#[derive(Iden)]
-pub enum FlixTmdbMovies {
-	Table,
-	TmdbId,
-	FlixId,
-	LastUpdate,
-	Runtime,
-	Collection,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixTmdbMovies::Table)
-				.col(sqlite_rowid_alias(FlixTmdbMovies::TmdbId))
-				.col(integer(FlixTmdbMovies::FlixId).unique_key())
-				.col(date(FlixTmdbMovies::LastUpdate))
-				.col(integer(FlixTmdbMovies::Runtime))
-				.col(integer_null(FlixTmdbMovies::Collection))
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_movies-flixid")
-						.from_tbl(FlixTmdbMovies::Table)
-						.from_col(FlixTmdbMovies::FlixId)
-						.to_tbl(FlixInfoMovies::Table)
-						.to_col(FlixInfoMovies::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_movies-collectionid")
-						.from_tbl(FlixTmdbMovies::Table)
-						.from_col(FlixTmdbMovies::Collection)
-						.to_tbl(FlixTmdbCollections::Table)
-						.to_col(FlixTmdbCollections::TmdbId),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_tmdb_movies-flixid")
-				.table(FlixTmdbMovies::Table)
-				.col(FlixTmdbMovies::FlixId)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixTmdbMovies::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000002/seasons.rs

@@ -1,82 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer};
-
-use crate::migration::m_000001::FlixInfoShows;
-
-use super::super::m_000001::FlixInfoSeasons;
-
-use super::FlixTmdbShows;
-
-#[derive(Iden)]
-pub enum FlixTmdbSeasons {
-	Table,
-	TmdbShow,
-	TmdbSeason,
-	FlixShow,
-	FlixSeason,
-	LastUpdate,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixTmdbSeasons::Table)
-				.col(integer(FlixTmdbSeasons::TmdbShow))
-				.col(integer(FlixTmdbSeasons::TmdbSeason))
-				.col(integer(FlixTmdbSeasons::FlixShow))
-				.col(integer(FlixTmdbSeasons::FlixSeason))
-				.col(date(FlixTmdbSeasons::LastUpdate))
-				.primary_key(
-					Index::create()
-						.col(FlixTmdbSeasons::TmdbShow)
-						.col(FlixTmdbSeasons::TmdbSeason),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_seasons-tmdb_show")
-						.from_tbl(FlixTmdbSeasons::Table)
-						.from_col(FlixTmdbSeasons::FlixShow)
-						.to_tbl(FlixTmdbShows::Table)
-						.to_col(FlixTmdbShows::FlixId),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_seasons-flix_show")
-						.from_tbl(FlixTmdbSeasons::Table)
-						.from_col(FlixTmdbSeasons::FlixShow)
-						.to_tbl(FlixInfoShows::Table)
-						.to_col(FlixInfoShows::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_seasons-flix_show_season")
-						.from_tbl(FlixTmdbSeasons::Table)
-						.from_col(FlixTmdbSeasons::FlixShow)
-						.from_col(FlixTmdbSeasons::FlixSeason)
-						.to_tbl(FlixInfoSeasons::Table)
-						.to_col(FlixInfoSeasons::Show)
-						.to_col(FlixInfoSeasons::Season),
-				)
-				.index(
-					Index::create()
-						.unique()
-						.name("idx-flix_tmdb_seasons-flix_show_season")
-						.col(FlixTmdbSeasons::FlixShow)
-						.col(FlixTmdbSeasons::FlixSeason),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixTmdbSeasons::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000002/shows.rs

@@ -1,58 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer};
-
-use super::super::m_000001::FlixInfoShows;
-
-#[derive(Iden)]
-pub enum FlixTmdbShows {
-	Table,
-	TmdbId,
-	FlixId,
-	LastUpdate,
-	NumberOfSeasons,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixTmdbShows::Table)
-				.col(sqlite_rowid_alias(FlixTmdbShows::TmdbId))
-				.col(integer(FlixTmdbShows::FlixId).unique_key())
-				.col(date(FlixTmdbShows::LastUpdate))
-				.col(integer(FlixTmdbShows::NumberOfSeasons))
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_tmdb_shows-flixid")
-						.from_tbl(FlixTmdbShows::Table)
-						.from_col(FlixTmdbShows::FlixId)
-						.to_tbl(FlixInfoShows::Table)
-						.to_col(FlixInfoShows::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	manager
-		.create_index(
-			Index::create()
-				.name("idx-flix_tmdb_shows-flixid")
-				.table(FlixTmdbShows::Table)
-				.col(FlixTmdbShows::FlixId)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixTmdbShows::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000003.rs

@@ -1,59 +0,0 @@
-//! Adds entity/content tables:
-//!  - Libraries
-//!  - Collections
-//!  - Movies
-//!  - Shows
-//!  - Seasons
-//!  - Episodes
-
-use sea_orm::{DbErr, DeriveMigrationName};
-use sea_orm_migration::async_trait;
-use sea_orm_migration::{MigrationTrait, SchemaManager};
-
-mod collections;
-mod episodes;
-mod libraries;
-mod movies;
-mod seasons;
-mod shows;
-
-#[allow(unused_imports)]
-pub use collections::FlixCollections;
-#[allow(unused_imports)]
-pub use episodes::FlixEpisodes;
-#[allow(unused_imports)]
-pub use libraries::FlixLibraries;
-#[allow(unused_imports)]
-pub use movies::FlixMovies;
-#[allow(unused_imports)]
-pub use seasons::FlixSeasons;
-#[allow(unused_imports)]
-pub use shows::FlixShows;
-
-#[derive(DeriveMigrationName)]
-pub(super) struct Migration;
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-	async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		libraries::up(manager).await?;
-		collections::up(manager).await?;
-		movies::up(manager).await?;
-		shows::up(manager).await?;
-		seasons::up(manager).await?;
-		episodes::up(manager).await?;
-
-		Ok(())
-	}
-
-	async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		episodes::down(manager).await?;
-		seasons::down(manager).await?;
-		shows::down(manager).await?;
-		movies::down(manager).await?;
-		collections::down(manager).await?;
-		libraries::down(manager).await?;
-
-		Ok(())
-	}
-}

crates/db/src/migration/m_000003/collections.rs

@@ -1,69 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{binary, integer, integer_null, string, string_null};
-
-use crate::migration::m_000001::FlixInfoCollections;
-use crate::migration::m_000003::FlixLibraries;
-
-#[derive(Iden)]
-pub enum FlixCollections {
-	Table,
-	Id,
-	Parent,
-	Slug,
-	Library,
-	Directory,
-	RelativePosterPath,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixCollections::Table)
-				.col(sqlite_rowid_alias(FlixCollections::Id))
-				.col(integer_null(FlixCollections::Parent))
-				.col(string(FlixCollections::Slug))
-				.col(integer(FlixCollections::Library))
-				.col(binary(FlixCollections::Directory))
-				.col(string_null(FlixCollections::RelativePosterPath))
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_collections-id")
-						.from_tbl(FlixCollections::Table)
-						.from_col(FlixCollections::Id)
-						.to_tbl(FlixInfoCollections::Table)
-						.to_col(FlixInfoCollections::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_collections-parent")
-						.from_tbl(FlixCollections::Table)
-						.from_col(FlixCollections::Parent)
-						.to_tbl(FlixCollections::Table)
-						.to_col(FlixCollections::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_collections-library")
-						.from_tbl(FlixCollections::Table)
-						.from_col(FlixCollections::Library)
-						.to_tbl(FlixLibraries::Table)
-						.to_col(FlixLibraries::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixCollections::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000003/episodes.rs

@@ -1,75 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{binary, integer, string, string_null};
-
-use crate::migration::m_000001::FlixInfoEpisodes;
-use crate::migration::m_000003::FlixLibraries;
-
-#[derive(Iden)]
-pub enum FlixEpisodes {
-	Table,
-	Show,
-	Season,
-	Episode,
-	Count,
-	Slug,
-	Library,
-	Directory,
-	RelativeMediaPath,
-	RelativePosterPath,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixEpisodes::Table)
-				.col(integer(FlixEpisodes::Show))
-				.col(integer(FlixEpisodes::Season))
-				.col(integer(FlixEpisodes::Episode))
-				.col(integer(FlixEpisodes::Count))
-				.col(string(FlixEpisodes::Slug))
-				.col(integer(FlixEpisodes::Library))
-				.col(binary(FlixEpisodes::Directory))
-				.col(string(FlixEpisodes::RelativeMediaPath))
-				.col(string_null(FlixEpisodes::RelativePosterPath))
-				.primary_key(
-					Index::create()
-						.col(FlixEpisodes::Show)
-						.col(FlixEpisodes::Season)
-						.col(FlixEpisodes::Episode),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_episodes-show_season_episode")
-						.from_tbl(FlixEpisodes::Table)
-						.from_col(FlixEpisodes::Show)
-						.from_col(FlixEpisodes::Season)
-						.from_col(FlixEpisodes::Episode)
-						.to_tbl(FlixInfoEpisodes::Table)
-						.to_col(FlixInfoEpisodes::Show)
-						.to_col(FlixInfoEpisodes::Season)
-						.to_col(FlixInfoEpisodes::Episode),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_episodes-library")
-						.from_tbl(FlixEpisodes::Table)
-						.from_col(FlixEpisodes::Library)
-						.to_tbl(FlixLibraries::Table)
-						.to_col(FlixLibraries::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixEpisodes::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000003/libraries.rs

@@ -1,34 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::Table;
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::binary;
-
-#[derive(Iden)]
-pub enum FlixLibraries {
-	Table,
-	Id,
-	Directory,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixLibraries::Table)
-				.col(sqlite_rowid_alias(FlixLibraries::Id))
-				.col(binary(FlixLibraries::Directory))
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixLibraries::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000003/movies.rs

@@ -1,71 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{binary, integer, integer_null, string, string_null};
-
-use crate::migration::m_000001::FlixInfoMovies;
-use crate::migration::m_000003::{FlixCollections, FlixLibraries};
-
-#[derive(Iden)]
-pub enum FlixMovies {
-	Table,
-	Id,
-	Parent,
-	Slug,
-	Library,
-	Directory,
-	RelativeMediaPath,
-	RelativePosterPath,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixMovies::Table)
-				.col(sqlite_rowid_alias(FlixMovies::Id))
-				.col(integer_null(FlixMovies::Parent))
-				.col(string(FlixMovies::Slug))
-				.col(integer(FlixMovies::Library))
-				.col(binary(FlixMovies::Directory))
-				.col(string(FlixMovies::RelativeMediaPath))
-				.col(string_null(FlixMovies::RelativePosterPath))
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_movies-id")
-						.from_tbl(FlixMovies::Table)
-						.from_col(FlixMovies::Id)
-						.to_tbl(FlixInfoMovies::Table)
-						.to_col(FlixInfoMovies::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_movies-parent")
-						.from_tbl(FlixMovies::Table)
-						.from_col(FlixMovies::Parent)
-						.to_tbl(FlixCollections::Table)
-						.to_col(FlixCollections::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_movies-library")
-						.from_tbl(FlixMovies::Table)
-						.from_col(FlixMovies::Library)
-						.to_tbl(FlixLibraries::Table)
-						.to_col(FlixLibraries::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixMovies::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000003/seasons.rs

@@ -1,66 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{binary, integer, string, string_null};
-
-use crate::migration::m_000001::FlixInfoSeasons;
-use crate::migration::m_000003::FlixLibraries;
-
-#[derive(Iden)]
-pub enum FlixSeasons {
-	Table,
-	Show,
-	Season,
-	Slug,
-	Library,
-	Directory,
-	RelativePosterPath,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixSeasons::Table)
-				.col(integer(FlixSeasons::Show))
-				.col(integer(FlixSeasons::Season))
-				.col(string(FlixSeasons::Slug))
-				.col(integer(FlixSeasons::Library))
-				.col(binary(FlixSeasons::Directory))
-				.col(string_null(FlixSeasons::RelativePosterPath))
-				.primary_key(
-					Index::create()
-						.col(FlixSeasons::Show)
-						.col(FlixSeasons::Season),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_seasons-show_season")
-						.from_tbl(FlixSeasons::Table)
-						.from_col(FlixSeasons::Show)
-						.from_col(FlixSeasons::Season)
-						.to_tbl(FlixInfoSeasons::Table)
-						.to_col(FlixInfoSeasons::Show)
-						.to_col(FlixInfoSeasons::Season),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_seasons-library")
-						.from_tbl(FlixSeasons::Table)
-						.from_col(FlixSeasons::Library)
-						.to_tbl(FlixLibraries::Table)
-						.to_col(FlixLibraries::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixSeasons::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000003/shows.rs

@@ -1,69 +0,0 @@
-use seamantic::schema::sqlite_rowid_alias;
-
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{binary, integer, integer_null, string, string_null};
-
-use crate::migration::m_000001::FlixInfoShows;
-use crate::migration::m_000003::{FlixCollections, FlixLibraries};
-
-#[derive(Iden)]
-pub enum FlixShows {
-	Table,
-	Id,
-	Parent,
-	Slug,
-	Library,
-	Directory,
-	RelativePosterPath,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixShows::Table)
-				.col(sqlite_rowid_alias(FlixShows::Id))
-				.col(integer_null(FlixShows::Parent))
-				.col(string(FlixShows::Slug))
-				.col(integer(FlixShows::Library))
-				.col(binary(FlixShows::Directory))
-				.col(string_null(FlixShows::RelativePosterPath))
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_shows-id")
-						.from_tbl(FlixShows::Table)
-						.from_col(FlixShows::Id)
-						.to_tbl(FlixInfoShows::Table)
-						.to_col(FlixInfoShows::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_shows-parent")
-						.from_tbl(FlixShows::Table)
-						.from_col(FlixShows::Parent)
-						.to_tbl(FlixCollections::Table)
-						.to_col(FlixCollections::Id),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_shows-library")
-						.from_tbl(FlixShows::Table)
-						.from_col(FlixShows::Library)
-						.to_tbl(FlixLibraries::Table)
-						.to_col(FlixLibraries::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixShows::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000004.rs

@@ -1,47 +0,0 @@
-//! Adds entity/watched tables:
-//!  - Collections
-//!  - Movies
-//!  - Shows
-//!  - Seasons
-//!  - Episodes
-
-use sea_orm::{DbErr, DeriveMigrationName};
-use sea_orm_migration::async_trait;
-use sea_orm_migration::{MigrationTrait, SchemaManager};
-
-mod collections;
-mod episodes;
-mod movies;
-mod seasons;
-mod shows;
-
-#[allow(unused_imports)]
-pub use episodes::FlixWatchedEpisodes;
-#[allow(unused_imports)]
-pub use movies::FlixWatchedMovies;
-
-#[derive(DeriveMigrationName)]
-pub(super) struct Migration;
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-	async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		episodes::up(manager).await?;
-		seasons::up(manager).await?;
-		shows::up(manager).await?;
-		movies::up(manager).await?;
-		collections::up(manager).await?;
-
-		Ok(())
-	}
-
-	async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-		collections::down(manager).await?;
-		movies::down(manager).await?;
-		shows::down(manager).await?;
-		seasons::down(manager).await?;
-		episodes::down(manager).await?;
-
-		Ok(())
-	}
-}

crates/db/src/migration/m_000004/collections.rs

@@ -1,98 +0,0 @@
-use sea_orm::DbErr;
-use sea_orm::{ConnectionTrait, DbBackend, Statement};
-use sea_orm_migration::SchemaManager;
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.get_connection()
-		.execute_raw(Statement::from_string(
-			DbBackend::Sqlite,
-			r#"
-				CREATE VIEW flix_watched_collections AS
-				WITH RECURSIVE
-				watched_items AS (
-					SELECT
-						w.id,
-						w.user_id,
-						w.watched_date,
-						'movie' AS type
-					FROM flix_watched_movies w
-
-					UNION ALL
-
-					SELECT
-						w.id,
-						w.user_id,
-						w.watched_date,
-						'show' AS type
-					FROM flix_watched_shows w
-				),
-				collection_items AS (
-					SELECT
-						m.parent,
-						m.id,
-						'movie' AS type
-					FROM flix_movies m
-					WHERE m.parent IS NOT NULL
-
-					UNION ALL
-
-					SELECT
-						s.parent,
-						s.id,
-						'show' AS type
-					FROM flix_shows s
-					WHERE s.parent IS NOT NULL
-
-					UNION ALL
-
-					SELECT
-						c.parent,
-						ci.id,
-						ci.type
-					FROM collection_items ci
-					JOIN flix_collections c
-						ON c.id = ci.parent
-				)
-				SELECT
-					ci.parent AS id,
-					wi.user_id,
-					MAX(wi.watched_date) AS watched_date
-				FROM collection_items ci
-				JOIN watched_items wi
-					ON wi.id = ci.id
-					AND wi.type = ci.type
-				WHERE NOT EXISTS (
-					SELECT 1
-					FROM collection_items ci2
-					WHERE ci2.parent = ci.parent
-					AND NOT EXISTS (
-						SELECT 1
-						FROM watched_items wi2
-						WHERE wi2.id = ci2.id
-						AND wi2.type = ci2.type
-						AND wi2.user_id = wi.user_id
-					)
-				)
-				GROUP BY ci.parent, wi.user_id;
-			"#,
-		))
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.get_connection()
-		.execute_raw(Statement::from_string(
-			DbBackend::Sqlite,
-			r#"
-				DROP VIEW flix_watched_collections
-				;
-			"#,
-		))
-		.await?;
-
-	Ok(())
-}

crates/db/src/migration/m_000004/episodes.rs

@@ -1,60 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer};
-
-use crate::migration::m_000001::FlixInfoEpisodes;
-
-#[derive(Iden)]
-pub enum FlixWatchedEpisodes {
-	Table,
-	Show,
-	Season,
-	Episode,
-	UserId,
-	WatchedDate,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixWatchedEpisodes::Table)
-				.col(integer(FlixWatchedEpisodes::Show))
-				.col(integer(FlixWatchedEpisodes::Season))
-				.col(integer(FlixWatchedEpisodes::Episode))
-				.col(integer(FlixWatchedEpisodes::UserId))
-				.col(date(FlixWatchedEpisodes::WatchedDate))
-				.primary_key(
-					Index::create()
-						.col(FlixWatchedEpisodes::Show)
-						.col(FlixWatchedEpisodes::Season)
-						.col(FlixWatchedEpisodes::Episode)
-						.col(FlixWatchedEpisodes::UserId),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_watched_episodes-show_season_episode")
-						.from_tbl(FlixWatchedEpisodes::Table)
-						.from_tbl(FlixWatchedEpisodes::Table)
-						.from_col(FlixWatchedEpisodes::Show)
-						.from_col(FlixWatchedEpisodes::Season)
-						.from_col(FlixWatchedEpisodes::Episode)
-						.to_tbl(FlixInfoEpisodes::Table)
-						.to_col(FlixInfoEpisodes::Show)
-						.to_col(FlixInfoEpisodes::Season)
-						.to_col(FlixInfoEpisodes::Episode),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixWatchedEpisodes::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000004/movies.rs

@@ -1,49 +0,0 @@
-use sea_orm::sea_query;
-use sea_orm::sea_query::{ForeignKeyCreateStatement, Index, Table};
-use sea_orm::{DbErr, Iden};
-use sea_orm_migration::SchemaManager;
-use sea_orm_migration::schema::{date, integer};
-
-use crate::migration::m_000001::FlixInfoMovies;
-
-#[derive(Iden)]
-pub enum FlixWatchedMovies {
-	Table,
-	Id,
-	UserId,
-	WatchedDate,
-}
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.create_table(
-			Table::create()
-				.table(FlixWatchedMovies::Table)
-				.col(integer(FlixWatchedMovies::Id))
-				.col(integer(FlixWatchedMovies::UserId))
-				.col(date(FlixWatchedMovies::WatchedDate))
-				.primary_key(
-					Index::create()
-						.col(FlixWatchedMovies::Id)
-						.col(FlixWatchedMovies::UserId),
-				)
-				.foreign_key(
-					ForeignKeyCreateStatement::new()
-						.name("fk-flix_watched_movies-id")
-						.from_tbl(FlixWatchedMovies::Table)
-						.from_col(FlixWatchedMovies::Id)
-						.to_tbl(FlixInfoMovies::Table)
-						.to_col(FlixInfoMovies::Id),
-				)
-				.to_owned(),
-		)
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.drop_table(Table::drop().table(FlixWatchedMovies::Table).to_owned())
-		.await
-}

crates/db/src/migration/m_000004/seasons.rs

@@ -1,54 +0,0 @@
-use sea_orm::DbErr;
-use sea_orm::{ConnectionTrait, DbBackend, Statement};
-use sea_orm_migration::SchemaManager;
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.get_connection()
-		.execute_raw(Statement::from_string(
-			DbBackend::Sqlite,
-			r#"
-				CREATE VIEW flix_watched_seasons AS
-				SELECT
-					w.show,
-					w.season,
-					w.user_id,
-					MAX(w.watched_date) AS watched_date
-				FROM flix_watched_episodes w
-				WHERE NOT EXISTS (
-					SELECT 1
-					FROM flix_episodes e
-					WHERE e.show = w.show
-					AND e.season = w.season
-					AND NOT EXISTS (
-						SELECT 1
-						FROM flix_watched_episodes wc
-						WHERE wc.show = e.show
-						AND wc.season = e.season
-						AND wc.episode = e.episode
-						AND wc.user_id = w.user_id
-					)
-				)
-				GROUP BY w.show, w.season, w.user_id
-				;
-			"#,
-		))
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.get_connection()
-		.execute_raw(Statement::from_string(
-			DbBackend::Sqlite,
-			r#"
-				DROP VIEW flix_watched_seasons
-				;
-			"#,
-		))
-		.await?;
-
-	Ok(())
-}

crates/db/src/migration/m_000004/shows.rs

@@ -1,51 +0,0 @@
-use sea_orm::DbErr;
-use sea_orm::{ConnectionTrait, DbBackend, Statement};
-use sea_orm_migration::SchemaManager;
-
-pub async fn up(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.get_connection()
-		.execute_raw(Statement::from_string(
-			DbBackend::Sqlite,
-			r#"
-				CREATE VIEW flix_watched_shows AS
-				SELECT
-					w.show as id,
-					w.user_id,
-					MAX(w.watched_date) AS watched_date
-				FROM flix_watched_seasons w
-				WHERE NOT EXISTS (
-					SELECT 1
-					FROM flix_seasons s
-					WHERE s.show = w.show
-					AND NOT EXISTS (
-						SELECT 1
-						FROM flix_watched_seasons wc
-						WHERE wc.show = s.show
-						AND wc.season = s.season
-						AND wc.user_id = w.user_id
-					)
-				)
-				GROUP BY w.show, w.user_id
-				;
-			"#,
-		))
-		.await?;
-
-	Ok(())
-}
-
-pub async fn down(manager: &SchemaManager<'_>) -> Result<(), DbErr> {
-	manager
-		.get_connection()
-		.execute_raw(Statement::from_string(
-			DbBackend::Sqlite,
-			r#"
-				DROP VIEW flix_watched_shows
-				;
-			"#,
-		))
-		.await?;
-
-	Ok(())
-}

crates/db/src/migration/mod.rs

@@ -3,7 +3,4 @@
 seamantic::migrations! {
 	"seaql_migrations_flix";
 	m_000001,
-	m_000002,
-	m_000003,
-	m_000004,
 }

crates/flix/Cargo.toml

@@ -1,32 +1,31 @@
 [package]
 name = "flix"
-version = "0.0.12"
+version = "0.0.19"
+license-file.workspace = true
 
-categories = []
 description = "Mechanisms for interacting with flix media"
 repository = "https://github.com/QuantumShade/flix"
+categories = []
 
-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
-
-[features]
-default = []
-fs = ["dep:flix-fs"]
-serde = ["flix-model/serde"]
-tmdb = ["dep:flix-tmdb", "flix-db/tmdb"]
-
 [dependencies]
 flix-db = { workspace = true }
 flix-model = { workspace = true }
 
 flix-fs = { workspace = true, optional = true }
 flix-tmdb = { workspace = true, optional = true }
+
+[features]
+default = []
+fs = ["dep:flix-fs"]
+serde = ["flix-model/serde"]
+tmdb = ["dep:flix-tmdb", "flix-db/tmdb"]
+
+[lints]
+workspace = true

crates/fs/Cargo.toml

@@ -1,28 +1,27 @@
 [package]
 name = "flix-fs"
-version = "0.0.12"
+version = "0.0.19"
+license-file.workspace = true
 
-categories = []
 description = "Filesystem scanner for flix media"
 repository = "https://github.com/QuantumShade/flix"
+categories = []
 
-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
-
 [dependencies]
-flix-model = { workspace = true }
-
 async-stream = { workspace = true }
-regex = { workspace = true, features = ["std", "perf"] }
+either = { workspace = true }
+flix-model = { workspace = true }
+regex = { workspace = true, features = ["perf", "std"] }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true, features = ["fs"] }
+
+[lints]
+workspace = true

crates/fs/src/scanner/collection.rs

@@ -4,8 +4,7 @@ use core::pin::Pin;
 use std::ffi::OsStr;
 use std::path::Path;
 
-use flix_model::id::{CollectionId, MovieId, ShowId};
-use flix_model::numbers::{EpisodeNumbers, SeasonNumber};
+use flix_model::id::CollectionId;
 
 use async_stream::stream;
 use tokio::fs;
@@ -14,7 +13,9 @@ use tokio_stream::wrappers::ReadDirStream;
 
 use crate::Error;
 use crate::macros::is_image_extension;
-use crate::scanner::{generic, movie, show};
+use crate::scanner::{
+	CollectionScan, EpisodeScan, MediaRef, MovieScan, SeasonScan, ShowScan, generic, movie, show,
+};
 
 /// A collection item
 pub type Item = crate::Item<Scanner>;
@@ -22,74 +23,21 @@ pub type Item = crate::Item<Scanner>;
 /// The scanner for collections
 pub enum Scanner {
 	/// A scanned collection
-	Collection {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the collection
-		id: CollectionId,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
-
+	Collection(CollectionScan),
 	/// A scanned movie
-	Movie {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the movie
-		id: MovieId,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
-
+	Movie(MovieScan),
 	/// A scanned show
-	Show {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the show
-		id: ShowId,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Show(ShowScan),
 	/// A scanned episode
-	Season {
-		/// The ID of the show this season belongs to
-		show: ShowId,
-		/// The number of this season
-		season: SeasonNumber,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Season(SeasonScan),
 	/// A scanned episode
-	Episode {
-		/// The ID of the show this episode belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The number(s) of this episode
-		episode: EpisodeNumbers,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Episode(EpisodeScan),
 }
 
 impl From<movie::Scanner> for Scanner {
 	fn from(value: movie::Scanner) -> Self {
 		match value {
-			movie::Scanner::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			} => Self::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			},
+			movie::Scanner::Movie(m) => Self::Movie(m),
 		}
 	}
 }
@@ -97,37 +45,9 @@ impl From<movie::Scanner> for Scanner {
 impl From<show::Scanner> for Scanner {
 	fn from(value: show::Scanner) -> Self {
 		match value {
-			show::Scanner::Show {
-				parent,
-				id,
-				poster_file_name,
-			} => Self::Show {
-				parent,
-				id,
-				poster_file_name,
-			},
-			show::Scanner::Season {
-				show,
-				season,
-				poster_file_name,
-			} => Self::Season {
-				show,
-				season,
-				poster_file_name,
-			},
-			show::Scanner::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			} => Self::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			},
+			show::Scanner::Show(s) => Self::Show(s),
+			show::Scanner::Season(s) => Self::Season(s),
+			show::Scanner::Episode(e) => Self::Episode(e),
 		}
 	}
 }
@@ -135,57 +55,11 @@ impl From<show::Scanner> for Scanner {
 impl From<generic::Scanner> for Scanner {
 	fn from(value: generic::Scanner) -> Self {
 		match value {
-			generic::Scanner::Collection {
-				parent,
-				id,
-				poster_file_name,
-			} => Self::Collection {
-				parent,
-				id,
-				poster_file_name,
-			},
-			generic::Scanner::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			} => Self::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			},
-			generic::Scanner::Show {
-				parent,
-				id,
-				poster_file_name,
-			} => Self::Show {
-				parent,
-				id,
-				poster_file_name,
-			},
-			generic::Scanner::Season {
-				show,
-				season,
-				poster_file_name,
-			} => Self::Season {
-				show,
-				season,
-				poster_file_name,
-			},
-			generic::Scanner::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			} => Self::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			},
+			generic::Scanner::Collection(c) => Self::Collection(c),
+			generic::Scanner::Movie(m) => Self::Movie(m),
+			generic::Scanner::Show(s) => Self::Show(s),
+			generic::Scanner::Season(s) => Self::Season(s),
+			generic::Scanner::Episode(e) => Self::Episode(e),
 		}
 	}
 }
@@ -194,8 +68,8 @@ impl Scanner {
 	/// Scan a folder for a collection
 	pub fn scan_collection(
 		path: &Path,
-		parent: Option<CollectionId>,
-		id: CollectionId,
+		parent_ref: Option<MediaRef<CollectionId>>,
+		id_ref: MediaRef<CollectionId>,
 	) -> Pin<Box<impl Stream<Item = Item>>> {
 		Box::pin(stream!({
 			let dirs = match fs::read_dir(path).await {
@@ -215,18 +89,19 @@ impl Scanner {
 			for await dir in ReadDirStream::new(dirs) {
 				match dir {
 					Ok(dir) => {
+						let path = dir.path();
+
 						let filetype = match dir.file_type().await {
 							Ok(filetype) => filetype,
 							Err(err) => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::FileType(err)),
 								};
 								continue;
 							}
 						};
 
-						let path = dir.path();
 						if filetype.is_dir() {
 							subdirs_to_scan.push(path);
 							continue;
@@ -236,7 +111,7 @@ impl Scanner {
 							is_image_extension!() => {
 								if poster_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicatePosterFile),
 									};
 									continue;
@@ -248,7 +123,7 @@ impl Scanner {
 							}
 							Some(_) | None => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::UnexpectedFile),
 								};
 							}
@@ -265,15 +140,17 @@ impl Scanner {
 
 			yield Item {
 				path: path.to_owned(),
-				event: Ok(Self::Collection {
-					parent,
-					id,
+				event: Ok(Self::Collection(CollectionScan {
+					parent_ref,
+					id_ref: id_ref.clone(),
 					poster_file_name,
-				}),
+				})),
 			};
 
 			for subdir in subdirs_to_scan {
-				for await event in generic::Scanner::scan_detect_folder(&subdir, Some(id)) {
+				for await event in
+					generic::Scanner::scan_detect_folder(&subdir, Some(id_ref.clone()))
+				{
 					yield event.map(|e| e.into());
 				}
 			}

crates/fs/src/scanner/episode.rs

@@ -13,6 +13,7 @@ use tokio_stream::wrappers::ReadDirStream;
 
 use crate::Error;
 use crate::macros::{is_image_extension, is_media_extension};
+use crate::scanner::{EpisodeScan, MediaRef};
 
 /// An episode item
 pub type Item = crate::Item<Scanner>;
@@ -20,25 +21,14 @@ pub type Item = crate::Item<Scanner>;
 /// The scanner for epispdes
 pub enum Scanner {
 	/// A scanned episode
-	Episode {
-		/// The ID of the show this episode belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The number(s) of this episode
-		episode: EpisodeNumbers,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Episode(EpisodeScan),
 }
 
 impl Scanner {
 	/// Scan a folder for an episode
 	pub fn scan_episode(
 		path: &Path,
-		show: ShowId,
+		show_ref: MediaRef<ShowId>,
 		season: SeasonNumber,
 		episode: EpisodeNumbers,
 	) -> impl Stream<Item = Item> {
@@ -60,11 +50,13 @@ impl Scanner {
 			for await dir in ReadDirStream::new(dirs) {
 				match dir {
 					Ok(dir) => {
+						let path = dir.path();
+
 						let filetype = match dir.file_type().await {
 							Ok(filetype) => filetype,
 							Err(err) => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::FileType(err)),
 								};
 								continue;
@@ -72,18 +64,17 @@ impl Scanner {
 						};
 						if !filetype.is_file() {
 							yield Item {
-								path: path.to_owned(),
+								path,
 								event: Err(Error::UnexpectedNonFile),
 							};
 							continue;
 						}
 
-						let path = dir.path();
 						match path.extension().and_then(OsStr::to_str) {
 							is_media_extension!() => {
 								if media_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicateMediaFile),
 									};
 									continue;
@@ -97,7 +88,7 @@ impl Scanner {
 							is_image_extension!() => {
 								if poster_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicatePosterFile),
 									};
 									continue;
@@ -109,7 +100,7 @@ impl Scanner {
 							}
 							Some(_) | None => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::UnexpectedFile),
 								};
 							}
@@ -134,13 +125,13 @@ impl Scanner {
 
 			yield Item {
 				path: path.to_owned(),
-				event: Ok(Self::Episode {
-					show,
+				event: Ok(Self::Episode(EpisodeScan {
+					show_ref,
 					season,
 					episode,
 					media_file_name,
 					poster_file_name,
-				}),
+				})),
 			};
 		})
 	}

crates/fs/src/scanner/generic.rs

@@ -6,16 +6,18 @@ use std::path::Path;
 use std::sync::OnceLock;
 
 use flix_model::id::{CollectionId, MovieId, RawId, ShowId};
-use flix_model::numbers::{EpisodeNumbers, SeasonNumber};
 
 use async_stream::stream;
+use either::Either;
 use regex::Regex;
 use tokio::fs;
 use tokio_stream::Stream;
 use tokio_stream::wrappers::ReadDirStream;
 
 use crate::Error;
-use crate::scanner::{collection, movie, show};
+use crate::scanner::{
+	CollectionScan, EpisodeScan, MediaRef, MovieScan, SeasonScan, ShowScan, collection, movie, show,
+};
 
 static MEDIA_FOLDER_REGEX: OnceLock<Regex> = OnceLock::new();
 static SEASON_FOLDER_REGEX: OnceLock<Regex> = OnceLock::new();
@@ -24,116 +26,28 @@ static SEASON_FOLDER_REGEX: OnceLock<Regex> = OnceLock::new();
 pub type Item = crate::Item<Scanner>;
 
 /// The scanner for collections
+#[derive(Debug)]
 pub enum Scanner {
 	/// A scanned collection
-	Collection {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the collection
-		id: CollectionId,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
-
+	Collection(CollectionScan),
 	/// A scanned movie
-	Movie {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the movie
-		id: MovieId,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
-
+	Movie(MovieScan),
 	/// A scanned show
-	Show {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the show
-		id: ShowId,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Show(ShowScan),
 	/// A scanned episode
-	Season {
-		/// The ID of the show this season belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Season(SeasonScan),
 	/// A scanned episode
-	Episode {
-		/// The ID of the show this episode belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The number(s) of this episode
-		episode: EpisodeNumbers,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Episode(EpisodeScan),
 }
 
 impl From<collection::Scanner> for Scanner {
 	fn from(value: collection::Scanner) -> Self {
 		match value {
-			collection::Scanner::Collection {
-				parent,
-				id,
-				poster_file_name,
-			} => Self::Collection {
-				parent,
-				id,
-				poster_file_name,
-			},
-			collection::Scanner::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			} => Self::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			},
-			collection::Scanner::Show {
-				parent,
-				id,
-				poster_file_name,
-			} => Self::Show {
-				parent,
-				id,
-				poster_file_name,
-			},
-			collection::Scanner::Season {
-				show,
-				season,
-				poster_file_name,
-			} => Self::Season {
-				show,
-				season,
-				poster_file_name,
-			},
-			collection::Scanner::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			} => Self::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			},
+			collection::Scanner::Collection(c) => Self::Collection(c),
+			collection::Scanner::Movie(m) => Self::Movie(m),
+			collection::Scanner::Show(s) => Self::Show(s),
+			collection::Scanner::Season(s) => Self::Season(s),
+			collection::Scanner::Episode(e) => Self::Episode(e),
 		}
 	}
 }
@@ -141,17 +55,7 @@ impl From<collection::Scanner> for Scanner {
 impl From<movie::Scanner> for Scanner {
 	fn from(value: movie::Scanner) -> Self {
 		match value {
-			movie::Scanner::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			} => Self::Movie {
-				parent,
-				id,
-				media_file_name,
-				poster_file_name,
-			},
+			movie::Scanner::Movie(m) => Self::Movie(m),
 		}
 	}
 }
@@ -159,42 +63,23 @@ impl From<movie::Scanner> for Scanner {
 impl From<show::Scanner> for Scanner {
 	fn from(value: show::Scanner) -> Self {
 		match value {
-			show::Scanner::Show {
-				parent,
-				id,
-				poster_file_name,
-			} => Self::Show {
-				parent,
-				id,
-				poster_file_name,
-			},
-			show::Scanner::Season {
-				show,
-				season,
-				poster_file_name,
-			} => Self::Season {
-				show,
-				season,
-				poster_file_name,
-			},
-			show::Scanner::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			} => Self::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			},
+			show::Scanner::Show(s) => Self::Show(s),
+			show::Scanner::Season(s) => Self::Season(s),
+			show::Scanner::Episode(e) => Self::Episode(e),
 		}
 	}
 }
 
 impl Scanner {
+	/// Helper function for stripping allowed numerical prefixes for sorting ("01 - ")
+	fn strip_numeric_prefix(original: &str) -> &str {
+		let mut s = original;
+		while let Some('0'..='9') = s.chars().next() {
+			s = &s[1..]
+		}
+		s.strip_prefix(" - ").unwrap_or(original)
+	}
+
 	/// Detect the type of a folder and call the correct scanner. Use
 	/// this only for detecting possibly ambiguous media:
 	///   - Collections
@@ -202,7 +87,7 @@ impl Scanner {
 	///   - Shows
 	pub fn scan_detect_folder(
 		path: &Path,
-		parent: Option<CollectionId>,
+		parent: Option<MediaRef<CollectionId>>,
 	) -> impl Stream<Item = Item> {
 		enum MediaType {
 			Collection,
@@ -211,7 +96,7 @@ impl Scanner {
 		}
 
 		let media_folder_re = MEDIA_FOLDER_REGEX.get_or_init(|| {
-			Regex::new(r"^[[[:alnum:]] -]+ \([[:digit:]]+\) \[[[:digit:]]+\]$")
+			Regex::new(r"^[[[:alnum:]]' -]+ \([[:digit:]]+\)( \[[[:digit:]]+\])?$")
 				.unwrap_or_else(|err| panic!("regex is invalid: {err}"))
 		});
 		let season_folder_re = SEASON_FOLDER_REGEX.get_or_init(|| {
@@ -227,17 +112,24 @@ impl Scanner {
 				return;
 			};
 
-			let Some(Ok(id)) = dir_name
+			let dir_name = Self::strip_numeric_prefix(dir_name);
+
+			// Use the explicit ID ("[X]") if it exists, otherwise parse the folder name
+			let media_id = if let Some((id_str, _)) = dir_name
 				.split_once('[')
 				.and_then(|(_, s)| s.split_once(']'))
-				.map(|(s, _)| s.parse::<RawId>())
-			else {
+			{
+				let Ok(id) = id_str.parse::<RawId>() else {
 					yield Item {
 						path: path.to_owned(),
 						event: Err(Error::UnexpectedFolder),
 					};
 					return;
 				};
+				Either::Left(id)
+			} else {
+				Either::Right(flix_model::text::normalize_fs_name(dir_name))
+			};
 
 			let media_type: MediaType;
 			if media_folder_re.is_match(dir_name) {
@@ -257,11 +149,13 @@ impl Scanner {
 				for await dir in ReadDirStream::new(dirs) {
 					match dir {
 						Ok(dir) => {
+							let path = dir.path();
+
 							let filetype = match dir.file_type().await {
 								Ok(filetype) => filetype,
 								Err(err) => {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::FileType(err)),
 									};
 									continue;
@@ -271,11 +165,9 @@ impl Scanner {
 								continue;
 							}
 
-							let dir_path = dir.path();
-							let Some(folder_name) = dir_path.file_name().and_then(OsStr::to_str)
-							else {
+							let Some(folder_name) = path.file_name().and_then(OsStr::to_str) else {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::UnexpectedFolder),
 								};
 								continue;
@@ -306,24 +198,32 @@ impl Scanner {
 
 			match media_type {
 				MediaType::Collection => {
-					for await event in collection::Scanner::scan_collection(
-						path,
-						parent,
-						CollectionId::from_raw(id),
-					) {
+					let id = match media_id {
+						Either::Left(raw) => MediaRef::Id(CollectionId::from_raw(raw)),
+						Either::Right(slug) => MediaRef::Slug(slug),
+					};
+
+					for await event in collection::Scanner::scan_collection(path, parent, id) {
 						yield event.map(|e| e.into());
 					}
 				}
 				MediaType::Movie => {
-					for await event in
-						movie::Scanner::scan_movie(path, parent, MovieId::from_raw(id))
-					{
+					let id = match media_id {
+						Either::Left(raw) => MediaRef::Id(MovieId::from_raw(raw)),
+						Either::Right(slug) => MediaRef::Slug(slug),
+					};
+
+					for await event in movie::Scanner::scan_movie(path, parent, id) {
 						yield event.map(|e| e.into());
 					}
 				}
 				MediaType::Show => {
-					for await event in show::Scanner::scan_show(path, parent, ShowId::from_raw(id))
-					{
+					let id = match media_id {
+						Either::Left(raw) => MediaRef::Id(ShowId::from_raw(raw)),
+						Either::Right(slug) => MediaRef::Slug(slug),
+					};
+
+					for await event in show::Scanner::scan_show(path, parent, id) {
 						yield event.map(|e| e.into());
 					}
 				}

crates/fs/src/scanner/mod.rs

@@ -3,6 +3,9 @@
 //! The most common scanner to use is [generic::Scanner] which will
 //! automatically detect and use the appropriate scanner.
 
+use flix_model::id::{CollectionId, MovieId, ShowId};
+use flix_model::numbers::{EpisodeNumbers, SeasonNumber};
+
 pub mod library;
 
 pub mod generic;
@@ -14,3 +17,83 @@ pub mod movie;
 pub mod episode;
 pub mod season;
 pub mod show;
+
+/// A reference to a piece of media
+#[derive(Debug, Clone)]
+pub enum MediaRef<ID> {
+	/// An explicit ID
+	Id(ID),
+	/// A filesystem slug
+	Slug(String),
+}
+
+impl<ID> MediaRef<ID> {
+	/// Get the slug if it exists
+	pub fn into_slug(self) -> Option<String> {
+		match self {
+			MediaRef::Id(_) => None,
+			MediaRef::Slug(slug) => Some(slug),
+		}
+	}
+}
+
+/// A scanned collection
+#[derive(Debug)]
+pub struct CollectionScan {
+	/// The ID of the parent collection (if any)
+	pub parent_ref: Option<MediaRef<CollectionId>>,
+	/// The ID of the collection
+	pub id_ref: MediaRef<CollectionId>,
+	/// The file name of the poster file
+	pub poster_file_name: Option<String>,
+}
+
+/// A scanned movie
+#[derive(Debug)]
+pub struct MovieScan {
+	/// The ID of the parent collection (if any)
+	pub parent_ref: Option<MediaRef<CollectionId>>,
+	/// The ID of the movie
+	pub id_ref: MediaRef<MovieId>,
+	/// The file name of the media file
+	pub media_file_name: String,
+	/// The file name of the poster file
+	pub poster_file_name: Option<String>,
+}
+
+/// A scanned show
+#[derive(Debug)]
+pub struct ShowScan {
+	/// The ID of the parent collection (if any)
+	pub parent_ref: Option<MediaRef<CollectionId>>,
+	/// The ID of the show
+	pub id_ref: MediaRef<ShowId>,
+	/// The file name of the poster file
+	pub poster_file_name: Option<String>,
+}
+
+/// A scanned season
+#[derive(Debug)]
+pub struct SeasonScan {
+	/// The ID of the show this season belongs to
+	pub show_ref: MediaRef<ShowId>,
+	/// The season this episode belongs to
+	pub season: SeasonNumber,
+	/// The file name of the poster file
+	pub poster_file_name: Option<String>,
+}
+
+/// A scanned episode
+#[derive(Debug)]
+pub struct EpisodeScan {
+	/// The ID of the show this episode belongs to
+	pub show_ref: MediaRef<ShowId>,
+	/// The season this episode belongs to
+	pub season: SeasonNumber,
+	/// The number(s) of this episode
+	pub episode: EpisodeNumbers,
+	/// The file name of the media file
+	pub media_file_name: String,
+	/// The file name of the poster file
+	pub poster_file_name: Option<String>,
+}

crates/fs/src/scanner/movie.rs

@@ -12,6 +12,7 @@ use tokio_stream::wrappers::ReadDirStream;
 
 use crate::Error;
 use crate::macros::{is_image_extension, is_media_extension};
+use crate::scanner::{MediaRef, MovieScan};
 
 /// An movie item
 pub type Item = crate::Item<Scanner>;
@@ -19,24 +20,15 @@ pub type Item = crate::Item<Scanner>;
 /// The scanner for movies
 pub enum Scanner {
 	/// A scanned movie
-	Movie {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the movie
-		id: MovieId,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Movie(MovieScan),
 }
 
 impl Scanner {
 	/// Scan a folder for a movie
 	pub fn scan_movie(
 		path: &Path,
-		parent: Option<CollectionId>,
-		id: MovieId,
+		parent_ref: Option<MediaRef<CollectionId>>,
+		id_ref: MediaRef<MovieId>,
 	) -> impl Stream<Item = Item> {
 		stream!({
 			let dirs = match fs::read_dir(path).await {
@@ -56,11 +48,13 @@ impl Scanner {
 			for await dir in ReadDirStream::new(dirs) {
 				match dir {
 					Ok(dir) => {
+						let path = dir.path();
+
 						let filetype = match dir.file_type().await {
 							Ok(filetype) => filetype,
 							Err(err) => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::FileType(err)),
 								};
 								continue;
@@ -68,18 +62,17 @@ impl Scanner {
 						};
 						if !filetype.is_file() {
 							yield Item {
-								path: path.to_owned(),
+								path,
 								event: Err(Error::UnexpectedNonFile),
 							};
 							continue;
 						}
 
-						let path = dir.path();
 						match path.extension().and_then(OsStr::to_str) {
 							is_media_extension!() => {
 								if media_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicateMediaFile),
 									};
 									continue;
@@ -93,7 +86,7 @@ impl Scanner {
 							is_image_extension!() => {
 								if poster_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicatePosterFile),
 									};
 									continue;
@@ -105,7 +98,7 @@ impl Scanner {
 							}
 							Some(_) | None => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::UnexpectedFile),
 								};
 							}
@@ -130,12 +123,12 @@ impl Scanner {
 
 			yield Item {
 				path: path.to_owned(),
-				event: Ok(Self::Movie {
-					parent,
-					id,
+				event: Ok(Self::Movie(MovieScan {
+					parent_ref,
+					id_ref,
 					media_file_name,
 					poster_file_name,
-				}),
+				})),
 			};
 		})
 	}

crates/fs/src/scanner/season.rs

@@ -13,53 +13,23 @@ use tokio_stream::wrappers::ReadDirStream;
 
 use crate::Error;
 use crate::macros::is_image_extension;
-use crate::scanner::episode;
+use crate::scanner::{EpisodeScan, MediaRef, SeasonScan, episode};
 
 /// A season item
 pub type Item = crate::Item<Scanner>;
 
 /// The scanner for seasons
 pub enum Scanner {
+	/// A scanned season
+	Season(SeasonScan),
 	/// A scanned episode
-	Season {
-		/// The ID of the show this season belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
-	/// A scanned episode
-	Episode {
-		/// The ID of the show this episode belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The number(s) of this episode
-		episode: EpisodeNumbers,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Episode(EpisodeScan),
 }
 
 impl From<episode::Scanner> for Scanner {
 	fn from(value: episode::Scanner) -> Self {
 		match value {
-			episode::Scanner::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			} => Self::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			},
+			episode::Scanner::Episode(e) => Self::Episode(e),
 		}
 	}
 }
@@ -68,7 +38,7 @@ impl Scanner {
 	/// Scan a folder for a season and its episodes
 	pub fn scan_season(
 		path: &Path,
-		show: ShowId,
+		show_ref: MediaRef<ShowId>,
 		season: SeasonNumber,
 	) -> impl Stream<Item = Item> {
 		stream!({
@@ -89,18 +59,19 @@ impl Scanner {
 			for await dir in ReadDirStream::new(dirs) {
 				match dir {
 					Ok(dir) => {
+						let path = dir.path();
+
 						let filetype = match dir.file_type().await {
 							Ok(filetype) => filetype,
 							Err(err) => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::FileType(err)),
 								};
 								continue;
 							}
 						};
 
-						let path = dir.path();
 						if filetype.is_dir() {
 							episode_dirs_to_scan.push(path);
 							continue;
@@ -110,7 +81,7 @@ impl Scanner {
 							is_image_extension!() => {
 								if poster_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicatePosterFile),
 									};
 									continue;
@@ -122,7 +93,7 @@ impl Scanner {
 							}
 							Some(_) | None => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::UnexpectedFile),
 								};
 							}
@@ -139,17 +110,17 @@ impl Scanner {
 
 			yield Item {
 				path: path.to_owned(),
-				event: Ok(Self::Season {
-					show,
+				event: Ok(Self::Season(SeasonScan {
+					show_ref: show_ref.clone(),
 					season,
 					poster_file_name,
-				}),
+				})),
 			};
 
 			for episode_dir in episode_dirs_to_scan {
 				let Some(episode_dir_name) = episode_dir.file_name().and_then(OsStr::to_str) else {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
@@ -157,14 +128,14 @@ impl Scanner {
 
 				let Some((_, s_e_str)) = episode_dir_name.split_once('S') else {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
 				};
 				let Some((s_str, e_str)) = s_e_str.split_once('E') else {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
@@ -172,14 +143,14 @@ impl Scanner {
 
 				let Ok(season_number) = s_str.parse::<SeasonNumber>() else {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
 				};
 				if season_number != season {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::Inconsistent),
 					};
 					continue;
@@ -191,14 +162,14 @@ impl Scanner {
 					.collect::<Result<Vec<_>, _>>()
 				else {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
 				};
 				let Ok(episode_numbers) = EpisodeNumbers::try_from(episode_numbers.as_ref()) else {
 					yield Item {
-						path: path.to_owned(),
+						path: episode_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
@@ -206,7 +177,7 @@ impl Scanner {
 
 				for await event in episode::Scanner::scan_episode(
 					&episode_dir,
-					show,
+					show_ref.clone(),
 					season_number,
 					episode_numbers,
 				) {

crates/fs/src/scanner/show.rs

@@ -4,7 +4,7 @@ use std::ffi::OsStr;
 use std::path::Path;
 
 use flix_model::id::{CollectionId, ShowId};
-use flix_model::numbers::{EpisodeNumbers, SeasonNumber};
+use flix_model::numbers::SeasonNumber;
 
 use async_stream::stream;
 use tokio::fs;
@@ -13,7 +13,7 @@ use tokio_stream::wrappers::ReadDirStream;
 
 use crate::Error;
 use crate::macros::is_image_extension;
-use crate::scanner::season;
+use crate::scanner::{EpisodeScan, MediaRef, SeasonScan, ShowScan, season};
 
 /// A show item
 pub type Item = crate::Item<Scanner>;
@@ -21,63 +21,18 @@ pub type Item = crate::Item<Scanner>;
 /// The scanner for shows
 pub enum Scanner {
 	/// A scanned show
-	Show {
-		/// The ID of the parent collection (if any)
-		parent: Option<CollectionId>,
-		/// The ID of the show
-		id: ShowId,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Show(ShowScan),
+	/// A scanned season
+	Season(SeasonScan),
 	/// A scanned episode
-	Season {
-		/// The ID of the show this season belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
-	/// A scanned episode
-	Episode {
-		/// The ID of the show this episode belongs to
-		show: ShowId,
-		/// The season this episode belongs to
-		season: SeasonNumber,
-		/// The number(s) of this episode
-		episode: EpisodeNumbers,
-		/// The file name of the media file
-		media_file_name: String,
-		/// The file name of the poster file
-		poster_file_name: Option<String>,
-	},
+	Episode(EpisodeScan),
 }
 
 impl From<season::Scanner> for Scanner {
 	fn from(value: season::Scanner) -> Self {
 		match value {
-			season::Scanner::Season {
-				show,
-				season,
-				poster_file_name,
-			} => Self::Season {
-				show,
-				season,
-				poster_file_name,
-			},
-			season::Scanner::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			} => Self::Episode {
-				show,
-				season,
-				episode,
-				media_file_name,
-				poster_file_name,
-			},
+			season::Scanner::Season(s) => Self::Season(s),
+			season::Scanner::Episode(e) => Self::Episode(e),
 		}
 	}
 }
@@ -86,8 +41,8 @@ impl Scanner {
 	/// Scan a folder for a show and its seasons/episodes
 	pub fn scan_show(
 		path: &Path,
-		parent: Option<CollectionId>,
-		id: ShowId,
+		parent_ref: Option<MediaRef<CollectionId>>,
+		id_ref: MediaRef<ShowId>,
 	) -> impl Stream<Item = Item> {
 		stream!({
 			let dirs = match fs::read_dir(path).await {
@@ -107,18 +62,19 @@ impl Scanner {
 			for await dir in ReadDirStream::new(dirs) {
 				match dir {
 					Ok(dir) => {
+						let path = dir.path();
+
 						let filetype = match dir.file_type().await {
 							Ok(filetype) => filetype,
 							Err(err) => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::FileType(err)),
 								};
 								continue;
 							}
 						};
 
-						let path = dir.path();
 						if filetype.is_dir() {
 							season_dirs_to_scan.push(path);
 							continue;
@@ -128,7 +84,7 @@ impl Scanner {
 							is_image_extension!() => {
 								if poster_file_name.is_some() {
 									yield Item {
-										path: path.to_owned(),
+										path,
 										event: Err(Error::DuplicatePosterFile),
 									};
 									continue;
@@ -140,7 +96,7 @@ impl Scanner {
 							}
 							Some(_) | None => {
 								yield Item {
-									path: path.to_owned(),
+									path,
 									event: Err(Error::UnexpectedFile),
 								};
 							}
@@ -157,17 +113,17 @@ impl Scanner {
 
 			yield Item {
 				path: path.to_owned(),
-				event: Ok(Self::Show {
-					parent,
-					id,
+				event: Ok(Self::Show(ShowScan {
+					parent_ref,
+					id_ref: id_ref.clone(),
 					poster_file_name,
-				}),
+				})),
 			};
 
 			for season_dir in season_dirs_to_scan {
 				let Some(season_dir_name) = season_dir.file_name().and_then(OsStr::to_str) else {
 					yield Item {
-						path: path.to_owned(),
+						path: season_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
@@ -178,13 +134,15 @@ impl Scanner {
 					.map(|(_, s)| s.parse::<SeasonNumber>())
 				else {
 					yield Item {
-						path: path.to_owned(),
+						path: season_dir,
 						event: Err(Error::UnexpectedFolder),
 					};
 					continue;
 				};
 
-				for await event in season::Scanner::scan_season(&season_dir, id, season_number) {
+				for await event in
+					season::Scanner::scan_season(&season_dir, id_ref.clone(), season_number)
+				{
 					yield event.map(|e| e.into());
 				}
 			}

crates/model/Cargo.toml

@@ -1,29 +1,29 @@
 [package]
 name = "flix-model"
-version = "0.0.12"
+version = "0.0.19"
+license-file.workspace = true
 
-categories = []
 description = "Core types for flix data"
 repository = "https://github.com/QuantumShade/flix"
+categories = []
 
-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
+[dependencies]
+itertools = { workspace = true }
+seamantic = { workspace = true }
+thiserror = { workspace = true }
+
+serde = { workspace = true, features = ["derive", "std"], optional = true }
 
 [features]
 default = []
 serde = ["dep:serde"]
 
-[dependencies]
-seamantic = { workspace = true }
-
-serde = { workspace = true, optional = true, features = ["std", "derive"] }
-thiserror = { workspace = true }
+[lints]
+workspace = true

crates/model/src/lib.rs

@@ -4,3 +4,4 @@
 
 pub mod id;
 pub mod numbers;
+pub mod text;

crates/model/src/numbers.rs

@@ -1,12 +1,76 @@
 //! This module contains season and episode numbers and related errors
 
+use core::fmt;
 use core::ops::RangeInclusive;
+use core::str::FromStr;
 use std::collections::HashSet;
 
-/// Type alias for representing season numbers
-pub type SeasonNumber = u32;
-/// Type alias for representing episode numbers
-pub type EpisodeNumber = u32;
+use seamantic::sea_orm;
+
+/// Newtype for representing season numbers
+#[derive(
+	Debug, Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash, sea_orm::DeriveValueType,
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(transparent))]
+#[repr(transparent)]
+pub struct SeasonNumber(u32);
+
+impl SeasonNumber {
+	/// Create a `SeasonNumber` from an integer
+	pub fn new(value: u32) -> Self {
+		Self(value)
+	}
+}
+
+impl fmt::Display for SeasonNumber {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		self.0.fmt(f)
+	}
+}
+
+impl FromStr for SeasonNumber {
+	type Err = <u32 as FromStr>::Err;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		u32::from_str(s).map(Self)
+	}
+}
+
+/// Newtype for representing episode numbers
+#[derive(
+	Debug, Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash, sea_orm::DeriveValueType,
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(transparent))]
+#[repr(transparent)]
+pub struct EpisodeNumber(u32);
+
+impl EpisodeNumber {
+	/// Create an `EpisodeNumber` from an integer
+	pub fn new(value: u32) -> Self {
+		Self(value)
+	}
+
+	/// Get the underlying value
+	pub fn into_inner(self) -> u32 {
+		self.0
+	}
+}
+
+impl fmt::Display for EpisodeNumber {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		self.0.fmt(f)
+	}
+}
+
+impl FromStr for EpisodeNumber {
+	type Err = <u32 as FromStr>::Err;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		u32::from_str(s).map(Self)
+	}
+}
 
 /// Potential errors when building EpisodeNumbers
 #[derive(Debug, thiserror::Error)]
@@ -20,7 +84,7 @@ pub enum Error {
 }
 
 /// A wrapper for handling single and multi-episode entries
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct EpisodeNumbers(RangeInclusive<EpisodeNumber>);
 
@@ -37,7 +101,7 @@ impl TryFrom<&[EpisodeNumber]> for EpisodeNumbers {
 				let max = value.iter().copied().max().unwrap_or_default();
 				let len = value.len();
 
-				if usize::try_from(max.saturating_sub(min).saturating_add(1)) != Ok(len) {
+				if usize::try_from(max.0.saturating_sub(min.0).saturating_add(1)) != Ok(len) {
 					return Err(Error::Noncontiguous);
 				}
 
@@ -53,8 +117,27 @@ impl TryFrom<&[EpisodeNumber]> for EpisodeNumbers {
 }
 
 impl EpisodeNumbers {
+	/// Create an [EpisodeNumbers] from a starting number and a count.
+	/// `count` should be zero for single episodes.
+	pub fn new(start: EpisodeNumber, count: u8) -> Self {
+		Self(start..=EpisodeNumber(start.0.saturating_add(count.into())))
+	}
+
 	/// Get the range of episodes
 	pub fn as_range(&self) -> &RangeInclusive<EpisodeNumber> {
 		&self.0
 	}
+
+	/// Render this [EpisodeNumbers] as a range. If only one episode is
+	/// is present it renders as `01`, if multiple it renders as `01-02`
+	pub fn range_string(&self) -> String {
+		let start = self.0.start();
+		let end = self.0.end();
+
+		if start == end {
+			format!("{:02}", start)
+		} else {
+			format!("{:02}-{:02}", start, end)
+		}
+	}
 }

crates/model/src/text.rs

@@ -0,0 +1,168 @@
+//! This module contains helper functions for normalizing media titles
+
+use core::iter::Peekable;
+
+use itertools::Itertools;
+
+/// # Panics
+///
+/// Panics if `input` is not ASCII.
+fn split_normalized_words(input: &str) -> impl Iterator<Item = String> {
+	if !input.is_ascii() {
+		panic!("Input is not ASCII: {input}");
+	}
+
+	input
+		.split_ascii_whitespace()
+		.map(|s| {
+			let chars = s
+				.chars()
+				.filter(|c| c.is_ascii_alphanumeric() || *c == '-')
+				.map(|c| c.to_ascii_lowercase());
+
+			if s.len() > 4
+				&& s.len().is_multiple_of(2)
+				&& chars.clone().tuples().all(|(l, r)| l != '.' && r == '.')
+			{
+				// Collapse acronym
+				chars.tuples().map(|(l, _)| l).collect()
+			} else {
+				chars.collect()
+			}
+		})
+		.filter(|part: &String| !part.is_empty())
+}
+
+fn split_leading_article<I: Iterator<Item = String>>(iter: I) -> (Option<String>, Peekable<I>) {
+	let mut iter = iter.peekable();
+	match iter.peek().map(String::as_str) {
+		Some("a" | "an" | "the") => (iter.next(), iter),
+		_ => (None, iter),
+	}
+}
+
+/// Convert a media title to be sortable and searchable
+///
+///     use flix_model::text::make_sortable_title;
+///
+///     assert_eq!(make_sortable_title("The Matrix"), "matrix, the");
+///     assert_eq!(make_sortable_title("Marvel's Agents of S.H.I.E.L.D."), "marvels agents of shield");
+///     assert_eq!(make_sortable_title("Avatar: The Last Airbender"), "avatar the last airbender");
+///
+/// # Panics
+///
+/// Panics if `input` is not ASCII.
+pub fn make_sortable_title(title: &str) -> String {
+	let words = split_normalized_words(title);
+	let (article, words) = split_leading_article(words);
+
+	let output = Itertools::intersperse(words, " ".to_string());
+	if let Some(article) = article {
+		output.chain([", ".to_string(), article]).collect()
+	} else {
+		output.collect()
+	}
+}
+
+/// Convert a media title to a folder name representable on filesystems
+///
+///     use flix_model::text::make_fs_slug;
+///
+///     assert_eq!(make_fs_slug("The Matrix"), "matrix");
+///     assert_eq!(make_fs_slug("Marvel's Agents of S.H.I.E.L.D."), "marvels agents of shield");
+///     assert_eq!(make_fs_slug("Avatar: The Last Airbender"), "avatar the last airbender");
+///
+/// # Panics
+///
+/// Panics if `input` is not ASCII.
+pub fn make_fs_slug(title: &str) -> String {
+	let words = split_normalized_words(title);
+	let (_, words) = split_leading_article(words);
+
+	Itertools::intersperse(words, " ".to_string()).collect()
+}
+
+/// Convert a media title and year to a folder name representable on filesystems
+///
+///     use flix_model::text::make_fs_slug_year;
+///
+///     assert_eq!(make_fs_slug_year("The Matrix", 1999), "matrix (1999)");
+///     assert_eq!(make_fs_slug_year("Marvel's Agents of S.H.I.E.L.D.", 2013), "marvels agents of shield (2013)");
+///     assert_eq!(make_fs_slug_year("Avatar: The Last Airbender", 2005), "avatar the last airbender (2005)");
+///
+/// # Panics
+///
+/// Panics if `input` is not ASCII.
+pub fn make_fs_slug_year(title: &str, year: i32) -> String {
+	let words = split_normalized_words(title);
+	let (_, words) = split_leading_article(words);
+
+	Itertools::intersperse(words, " ".to_string())
+		.chain([format!(" ({year})")])
+		.collect()
+}
+
+/// Normalize a filesystem name
+///
+///     use flix_model::text::normalize_fs_name;
+///
+///     assert_eq!(normalize_fs_name("Matrix (1999)"), "matrix (1999)");
+///     assert_eq!(normalize_fs_name("Marvel's Agents of SHIELD (2013)"), "marvels agents of shield (2013)");
+///     assert_eq!(normalize_fs_name("Avatar The Last Airbender (2005)"), "avatar the last airbender (2005)");
+pub fn normalize_fs_name(input: &str) -> String {
+	let chars = input.split_ascii_whitespace().map(|s| {
+		let chars = s
+			.chars()
+			.filter(|c| c.is_ascii_alphanumeric() || *c == '-' || *c == '(' || *c == ')')
+			.map(|c| c.to_ascii_lowercase());
+
+		if s.len() > 4
+			&& s.len().is_multiple_of(2)
+			&& chars.clone().tuples().all(|(l, r)| l != '.' && r == '.')
+		{
+			// Collapse acronym
+			chars.tuples().map(|(l, _)| l).collect()
+		} else {
+			chars.collect()
+		}
+	});
+	Itertools::intersperse(chars, " ".to_string()).collect()
+}
+
+/// Convert a media title to a url compatible string
+///
+///     use flix_model::text::make_web_slug;
+///
+///     assert_eq!(make_web_slug("The Matrix"), "matrix");
+///     assert_eq!(make_web_slug("Marvel's Agents of S.H.I.E.L.D."), "marvels-agents-of-shield");
+///     assert_eq!(make_web_slug("Avatar: The Last Airbender"), "avatar-the-last-airbender");
+///
+/// # Panics
+///
+/// Panics if `input` is not ASCII.
+pub fn make_web_slug(title: &str) -> String {
+	let words = split_normalized_words(title);
+	let (_, words) = split_leading_article(words);
+
+	Itertools::intersperse(words, "-".to_string()).collect()
+}
+
+/// Convert a media title and year to a url compatible string
+///
+///     use flix_model::text::make_web_slug_year;
+///
+///     assert_eq!(make_web_slug_year("The Matrix", 1999), "matrix-1999");
+///     assert_eq!(make_web_slug_year("Marvel's Agents of S.H.I.E.L.D.", 2013), "marvels-agents-of-shield-2013");
+///     assert_eq!(make_web_slug_year("Avatar: The Last Airbender", 2005), "avatar-the-last-airbender-2005");
+///
+/// # Panics
+///
+/// Panics if `input` is not ASCII.
+pub fn make_web_slug_year(title: &str, year: i32) -> String {
+	let words = split_normalized_words(title);
+	let (_, words) = split_leading_article(words);
+
+	Itertools::intersperse(words, "-".to_string())
+		.chain([format!("-{year}")])
+		.collect()
+}

crates/tmdb/Cargo.toml

@@ -1,35 +1,29 @@
 [package]
 name = "flix-tmdb"
-version = "0.0.12"
+version = "0.0.19"
+license-file.workspace = true
 
-categories = []
 description = "Clients and models for fetching data from TMDB"
 repository = "https://github.com/QuantumShade/flix"
+categories = []
 
-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
-
-[features]
-default = []
-sea-orm = ["dep:sea-orm"]
-
 [dependencies]
-flix-model = { workspace = true }
-
+bytes = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
-governor = { workspace = true, features = ["std", "jitter"] }
+flix-model = { workspace = true, features = ["serde"] }
+governor = { workspace = true, features = ["jitter", "std"] }
 nonzero_ext = { workspace = true }
-reqwest = { workspace = true, features = ["json", "rustls-tls"] }
+redb = { workspace = true }
+reqwest = { workspace = true, features = ["query", "rustls"] }
 serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 url-macro = { workspace = true }
@@ -38,3 +32,10 @@ sea-orm = { workspace = true, optional = true }
 
 [dev-dependencies]
 serde_test = { workspace = true }
+
+[features]
+default = []
+sea-orm = ["dep:sea-orm"]
+
+[lints]
+workspace = true

crates/tmdb/src/api/collections.rs

@@ -1,25 +1,30 @@
 //! Collections API
 
-use core::time::Duration;
 use std::rc::Rc;
+use std::sync::RwLock;
 
-use governor::Jitter;
-
-use crate::Config;
+use crate::api::exec_request;
 use crate::model::Collection;
 use crate::model::id::CollectionId;
+use crate::{Cache, CachePolicy, Config};
 
 use super::{Error, make_request};
 
 /// TMDB Collections API client
 pub struct Client {
 	config: Rc<Config>,
+	cache: Rc<dyn Cache>,
+	policy: Rc<RwLock<CachePolicy>>,
 }
 
 impl Client {
 	/// Create a new client with the given configuration
-	pub fn new(config: Rc<Config>) -> Self {
-		Self { config }
+	pub fn new(config: Rc<Config>, cache: Rc<dyn Cache>, policy: Rc<RwLock<CachePolicy>>) -> Self {
+		Self {
+			config,
+			cache,
+			policy,
+		}
 	}
 }
 
@@ -30,25 +35,11 @@ impl Client {
 		id: impl Into<CollectionId>,
 		language: Option<&str>,
 	) -> Result<Collection, Error> {
-		self.config
-			.limiter
-			.until_ready_with_jitter(Jitter::new(
-				Duration::from_millis(0),
-				Duration::from_millis(50),
-			))
-			.await;
-
-		Ok(self
-			.config
-			.client
-			.execute(make_request(
+		let request = make_request(
 			&self.config,
 			&format!("/3/collection/{}", id.into().into_raw()),
 			language,
-			)?)
-			.await?
-			.error_for_status()?
-			.json()
-			.await?)
+		)?;
+		exec_request(&self.config, &*self.cache, &self.policy, request).await
 	}
 }