You've already forked flix
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 davidskrundz
|
66168c120f
|
||
|
davidskrundz
|
0e2a8e425b
|
||
|
davidskrundz
|
994a80c45c
|
||
|
davidskrundz
|
dd2cf5c942
|
@@ -5,3 +5,7 @@
|
||||
|
||||
# Rust
|
||||
/target
|
||||
|
||||
# Flix
|
||||
flix.db
|
||||
flix.redb
|
||||
|
||||
Vendored
-9
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"vadimcn.vscode-lldb",
|
||||
"barbosshack.crates-io",
|
||||
"usernamehw.errorlens",
|
||||
"tamasfe.even-better-toml",
|
||||
"rust-lang.rust-analyzer",
|
||||
]
|
||||
}
|
||||
Vendored
-33
@@ -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,
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"project_name": null,
|
||||
|
||||
"auto_install_extensions": {
|
||||
"tombi": true,
|
||||
"cargo-appraiser": true,
|
||||
},
|
||||
|
||||
"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",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
Generated
+627
-262
File diff suppressed because it is too large
Load Diff
+46
-45
@@ -1,18 +1,46 @@
|
||||
[workspace]
|
||||
members = ["crates/*"]
|
||||
resolver = "2"
|
||||
members = ["crates/*"]
|
||||
|
||||
[workspace.package]
|
||||
authors = []
|
||||
edition = "2024"
|
||||
rust-version = "1.89.0"
|
||||
license-file = "LICENSE.md"
|
||||
rust-version = "1.85.0"
|
||||
|
||||
[workspace.lints.rust]
|
||||
arithmetic_overflow = "forbid"
|
||||
missing_docs = "forbid"
|
||||
unsafe_code = "forbid"
|
||||
unused_doc_comments = "forbid"
|
||||
[workspace.dependencies]
|
||||
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 }
|
||||
either = { version = "^1", default-features = false }
|
||||
flix = { path = "crates/flix", version = "=0.0.17", default-features = false }
|
||||
flix-cli = { path = "crates/cli", version = "=0.0.17", default-features = false }
|
||||
flix-db = { path = "crates/db", version = "=0.0.17", default-features = false }
|
||||
flix-fs = { path = "crates/fs", version = "=0.0.17", default-features = false }
|
||||
flix-model = { path = "crates/model", version = "=0.0.17", default-features = false }
|
||||
flix-tmdb = { path = "crates/tmdb", version = "=0.0.17", default-features = false }
|
||||
futures = { version = "^0.3", default-features = false }
|
||||
governor = { version = "^0.10", default-features = false }
|
||||
itertools = { version = "^0.14", default-features = false }
|
||||
nonzero_ext = { version = "^0.3", default-features = false }
|
||||
redb = { version = "^3", default-features = false }
|
||||
regex = { version = "^1", default-features = false }
|
||||
reqwest = { version = "^0.13", default-features = false }
|
||||
sea-orm = { version = "2.0.0-rc.27", default-features = false }
|
||||
sea-orm-migration = { version = "2.0.0-rc.27", default-features = false }
|
||||
seamantic = { version = "^0.0.12", 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 = "^0.9", 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 }
|
||||
|
||||
[workspace.lints.clippy]
|
||||
arithmetic_side_effects = "forbid"
|
||||
@@ -24,45 +52,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.15", default-features = false }
|
||||
flix-cli = { path = "crates/cli", version = "=0.0.15", default-features = false }
|
||||
flix-db = { path = "crates/db", version = "=0.0.15", default-features = false }
|
||||
flix-fs = { path = "crates/fs", version = "=0.0.15", default-features = false }
|
||||
flix-model = { path = "crates/model", version = "=0.0.15", default-features = false }
|
||||
flix-tmdb = { path = "crates/tmdb", version = "=0.0.15", default-features = false }
|
||||
|
||||
seamantic = { version = "0.0.10", default-features = false }
|
||||
|
||||
sea-orm = { version = "2.0.0-rc.17", default-features = false }
|
||||
sea-orm-migration = { version = "2.0.0-rc.17", 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 }
|
||||
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 }
|
||||
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 }
|
||||
overflow-checks = true
|
||||
lto = "fat"
|
||||
codegen-units = 1
|
||||
|
||||
@@ -7,9 +7,13 @@ 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.85 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`
|
||||
- semver: `cargo semver-checks --all-features`
|
||||
- publish: `cargo publish --dry-run --workspace`
|
||||
|
||||
## Building flix.db
|
||||
|
||||
`./flix.sh`
|
||||
|
||||
+28
-31
@@ -1,15 +1,12 @@
|
||||
[package]
|
||||
name = "flix-cli"
|
||||
version = "0.0.15"
|
||||
|
||||
categories = ["command-line-utilities"]
|
||||
version = "0.0.17"
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
description = "CLI for interacting with a flix database"
|
||||
repository = "https://github.com/QuantumShade/flix"
|
||||
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license-file.workspace = true
|
||||
rust-version.workspace = true
|
||||
categories = ["command-line-utilities"]
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
@@ -20,9 +17,26 @@ doc = false
|
||||
name = "flix"
|
||||
path = "src/main.rs"
|
||||
|
||||
[lints.rust]
|
||||
arithmetic_overflow = "forbid"
|
||||
unsafe_code = "forbid"
|
||||
[dependencies]
|
||||
anyhow = { workspace = true }
|
||||
chrono = { workspace = true, features = ["now"] }
|
||||
clap = { workspace = true, features = [
|
||||
"color",
|
||||
"derive",
|
||||
"error-context",
|
||||
"help",
|
||||
"std",
|
||||
"suggestions",
|
||||
"usage",
|
||||
] }
|
||||
flix = { workspace = true, features = ["tmdb"] }
|
||||
futures = { workspace = true }
|
||||
sea-orm = { workspace = true, features = ["debug-print", "runtime-tokio"] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
tokio = { workspace = true, features = ["fs", "macros", "rt"] }
|
||||
toml = { workspace = true, features = ["parse", "serde"] }
|
||||
tracing = { workspace = true }
|
||||
tracing-subscriber = { workspace = true }
|
||||
|
||||
[lints.clippy]
|
||||
arithmetic_side_effects = "deny"
|
||||
@@ -34,26 +48,9 @@ indexing_slicing = "deny"
|
||||
integer_division = "deny"
|
||||
integer_division_remainder_used = "deny"
|
||||
transmute_undefined_repr = "deny"
|
||||
unchecked_duration_subtraction = "deny"
|
||||
unchecked_time_subtraction = "deny"
|
||||
unwrap_used = "deny"
|
||||
|
||||
[dependencies]
|
||||
flix = { workspace = true, features = ["tmdb"] }
|
||||
|
||||
anyhow = { workspace = true }
|
||||
chrono = { workspace = true, features = ["now"] }
|
||||
clap = { workspace = true, features = [
|
||||
"derive",
|
||||
"color",
|
||||
"error-context",
|
||||
"help",
|
||||
"suggestions",
|
||||
"usage",
|
||||
] }
|
||||
futures = { workspace = true }
|
||||
sea-orm = { workspace = true, features = ["runtime-tokio", "debug-print"] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
tokio = { workspace = true, features = ["rt", "fs", "macros"] }
|
||||
toml = { workspace = true, features = ["parse", "serde"] }
|
||||
tracing = { workspace = true }
|
||||
tracing-subscriber = { workspace = true }
|
||||
[lints.rust]
|
||||
arithmetic_overflow = "forbid"
|
||||
unsafe_code = "forbid"
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
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)]
|
||||
@@ -12,8 +13,12 @@ pub struct Cli {
|
||||
#[arg(short, long, value_name = "FILE", default_value = "~/.flix")]
|
||||
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
|
||||
@@ -37,6 +42,10 @@ impl Cli {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn cache_path(&self) -> &Path {
|
||||
&self.cache
|
||||
}
|
||||
|
||||
pub fn database_path(&self) -> Result<String> {
|
||||
self.database
|
||||
.as_os_str()
|
||||
@@ -50,24 +59,38 @@ 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,
|
||||
command: UpdateCommand,
|
||||
},
|
||||
/// Delete an existing item in the database
|
||||
Delete {
|
||||
#[command(subcommand)]
|
||||
command: BackendCommand,
|
||||
command: DeleteCommand,
|
||||
},
|
||||
/// Create a toml backup of the database
|
||||
Backup {
|
||||
@@ -84,7 +107,12 @@ pub enum Command {
|
||||
}
|
||||
|
||||
#[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)]
|
||||
@@ -92,7 +120,43 @@ 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 }
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Subcommand)]
|
||||
pub enum DeleteCommand {
|
||||
/// Use the TMDB backend
|
||||
Tmdb {
|
||||
#[command(subcommand)]
|
||||
command: tmdb::Command,
|
||||
},
|
||||
}
|
||||
|
||||
impl From<tmdb::Command> for DeleteCommand {
|
||||
fn from(value: tmdb::Command) -> Self {
|
||||
Self::Tmdb { command: value }
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
//! Placeholder
|
||||
|
||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||
+31
-19
@@ -1,17 +1,20 @@
|
||||
use std::path::PathBuf;
|
||||
use std::rc::Rc;
|
||||
|
||||
use flix::tmdb::Client;
|
||||
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, DeleteCommand, UpdateCommand};
|
||||
|
||||
mod config;
|
||||
use config::Config;
|
||||
|
||||
use crate::cli::AddOverrides;
|
||||
|
||||
mod db;
|
||||
mod run;
|
||||
|
||||
@@ -26,7 +29,11 @@ async fn main() -> Result<()> {
|
||||
|
||||
let database_path = cli.database_path()?;
|
||||
|
||||
let client = Client::new(config.tmdb().bearer_token().to_owned());
|
||||
let client = Client::new(
|
||||
tmdb::Config::new(config.tmdb().bearer_token().to_owned()),
|
||||
Rc::new(RedbCache::new(cli.cache_path())?),
|
||||
CachePolicy::Full,
|
||||
);
|
||||
|
||||
if cli.trace {
|
||||
tracing_subscriber::fmt()
|
||||
@@ -37,7 +44,9 @@ async fn main() -> Result<()> {
|
||||
|
||||
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?,
|
||||
@@ -53,23 +62,31 @@ 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?;
|
||||
}
|
||||
}
|
||||
@@ -77,16 +94,11 @@ async fn exec_update(client: Client, database_path: String, command: BackendComm
|
||||
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_delete(client: Client, database_path: String, command: DeleteCommand) -> Result<()> {
|
||||
_ = client;
|
||||
_ = database_path;
|
||||
_ = command;
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
async fn exec_backup(database_path: String, output: PathBuf) -> Result<()> {
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
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;
|
||||
|
||||
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(())
|
||||
}
|
||||
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;
|
||||
|
||||
let (flix_show, season_number, episode_number) = match result {
|
||||
Ok(id) => id,
|
||||
Err(TransactionError::Connection(err)) => Err(err)?,
|
||||
Err(TransactionError::Transaction(err)) => Err(err)?,
|
||||
};
|
||||
println!(
|
||||
"Created Episode: {} [{} S{} E{}]",
|
||||
title,
|
||||
flix_show.into_raw(),
|
||||
season_number,
|
||||
episode_number
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1 +1,2 @@
|
||||
pub mod flix;
|
||||
pub mod tmdb;
|
||||
|
||||
+88
-19
@@ -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?;
|
||||
@@ -65,7 +88,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
|
||||
Err(TransactionError::Connection(err)) => Err(err)?,
|
||||
Err(TransactionError::Transaction(err)) => Err(err)?,
|
||||
};
|
||||
println!("Created Collection: {}", flix_id.into_raw());
|
||||
println!("Created Collection: {} [{}]", title, flix_id.into_raw());
|
||||
|
||||
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?;
|
||||
@@ -116,7 +156,12 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
|
||||
Err(TransactionError::Connection(err)) => Err(err)?,
|
||||
Err(TransactionError::Transaction(err)) => Err(err)?,
|
||||
};
|
||||
println!("Created Movie: {}", flix_id.into_raw());
|
||||
println!(
|
||||
"Created Movie: {} ({}) [{}]",
|
||||
title,
|
||||
year,
|
||||
flix_id.into_raw(),
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -137,13 +182,20 @@ 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)
|
||||
})?;
|
||||
}) {
|
||||
Ok(season) => season,
|
||||
Err(err) => {
|
||||
eprintln!("{err:?}");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
if season.air_date > Utc::now().naive_utc().date() {
|
||||
eprintln!(
|
||||
"skipping season ({}, {})",
|
||||
@@ -153,7 +205,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,6 +214,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
|
||||
|
||||
let mut season_episodes = Vec::new();
|
||||
for episode in 1..=number_of_episodes {
|
||||
let episode = EpisodeNumber::new(episode);
|
||||
let Ok(episode) = client
|
||||
.episodes()
|
||||
.get_details(id, season.season_number, episode, None)
|
||||
@@ -182,15 +235,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?;
|
||||
@@ -264,7 +334,12 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
|
||||
Err(TransactionError::Connection(err)) => Err(err)?,
|
||||
Err(TransactionError::Transaction(err)) => Err(err)?,
|
||||
};
|
||||
println!("Created Show: {}", flix_id.into_raw());
|
||||
println!(
|
||||
"Created Show: {} ({}) [{}]",
|
||||
title,
|
||||
year,
|
||||
flix_id.into_raw()
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -296,7 +371,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,6 +379,7 @@ pub async fn add(client: Client, db: &DatabaseConnection, command: Command) -> R
|
||||
};
|
||||
|
||||
for episode in 1..=number_of_episodes {
|
||||
let episode = EpisodeNumber::new(episode);
|
||||
let Ok(episode) = client
|
||||
.episodes()
|
||||
.get_details(id, season.season_number, episode, None)
|
||||
@@ -498,10 +574,3 @@ pub async fn update(client: Client, database: &DatabaseConnection, command: Comm
|
||||
_ = command;
|
||||
unimplemented!("updates")
|
||||
}
|
||||
|
||||
pub async fn delete(client: Client, database: &DatabaseConnection, command: Command) -> Result<()> {
|
||||
_ = client;
|
||||
_ = database;
|
||||
_ = command;
|
||||
unimplemented!("deletions")
|
||||
}
|
||||
|
||||
+15
-21
@@ -1,45 +1,39 @@
|
||||
[package]
|
||||
name = "flix-db"
|
||||
version = "0.0.15"
|
||||
|
||||
categories = []
|
||||
version = "0.0.17"
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
description = "Types for storing persistent data about media"
|
||||
repository = "https://github.com/QuantumShade/flix"
|
||||
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license-file.workspace = true
|
||||
rust-version.workspace = true
|
||||
categories = []
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
[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 }
|
||||
flix-model = { workspace = true }
|
||||
flix-tmdb = { workspace = true, features = ["sea-orm"], optional = true }
|
||||
sea-orm = { workspace = true, features = [
|
||||
"entity-registry",
|
||||
"schema-sync",
|
||||
"with-chrono",
|
||||
] }
|
||||
sea-orm-migration = { workspace = true }
|
||||
seamantic = { workspace = true, features = ["sqlite"] }
|
||||
|
||||
[dev-dependencies]
|
||||
sea-orm-migration = { workspace = true, features = ["runtime-tokio-rustls"] }
|
||||
tokio = { version = "^1", default-features = false, features = [
|
||||
"rt",
|
||||
"macros",
|
||||
"rt",
|
||||
] }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
tmdb = ["dep:flix-tmdb"]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
+173
-93
@@ -15,7 +15,7 @@ pub mod libraries {
|
||||
#[sea_orm(table_name = "flix_libraries")]
|
||||
pub struct Model {
|
||||
/// The library's ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub id: LibraryId,
|
||||
/// The library's directory
|
||||
pub directory: PathBytes,
|
||||
@@ -23,19 +23,19 @@ pub mod libraries {
|
||||
pub last_scan: Option<DateTime<Utc>>,
|
||||
|
||||
/// Collections that are part of this library
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub collections: HasMany<super::collections::Entity>,
|
||||
/// Movies that are part of this library
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub movies: HasMany<super::movies::Entity>,
|
||||
/// Shows that are part of this library
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub shows: HasMany<super::shows::Entity>,
|
||||
/// Seasons that are part of this library
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub seasons: HasMany<super::seasons::Entity>,
|
||||
/// Episodes that are part of this library
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub episodes: HasMany<super::episodes::Entity>,
|
||||
}
|
||||
|
||||
@@ -58,14 +58,11 @@ pub mod collections {
|
||||
#[sea_orm(table_name = "flix_collections")]
|
||||
pub struct Model {
|
||||
/// The collection's ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[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 slug
|
||||
#[sea_orm(unique)]
|
||||
pub slug: String,
|
||||
/// The collection's library ID
|
||||
pub library_id: LibraryId,
|
||||
/// The collection's directory
|
||||
@@ -74,14 +71,35 @@ pub mod collections {
|
||||
pub relative_poster_path: Option<String>,
|
||||
|
||||
/// This collection's parent
|
||||
#[sea_orm(self_ref, relation_enum = "Parent", from = "parent_id", to = "id")]
|
||||
#[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")]
|
||||
#[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")]
|
||||
#[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>,
|
||||
@@ -106,14 +124,11 @@ pub mod movies {
|
||||
#[sea_orm(table_name = "flix_movies")]
|
||||
pub struct Model {
|
||||
/// The movie's ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[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 slug
|
||||
#[sea_orm(unique)]
|
||||
pub slug: String,
|
||||
/// The movie's library
|
||||
pub library_id: LibraryId,
|
||||
/// The movie's directory
|
||||
@@ -124,14 +139,34 @@ pub mod movies {
|
||||
pub relative_poster_path: Option<String>,
|
||||
|
||||
/// This movie's parent
|
||||
#[sea_orm(belongs_to, from = "parent_id", to = "id")]
|
||||
#[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")]
|
||||
#[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")]
|
||||
#[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>,
|
||||
@@ -156,14 +191,11 @@ pub mod shows {
|
||||
#[sea_orm(table_name = "flix_shows")]
|
||||
pub struct Model {
|
||||
/// The show's ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[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 slug
|
||||
#[sea_orm(unique)]
|
||||
pub slug: String,
|
||||
/// The show's library
|
||||
pub library_id: LibraryId,
|
||||
/// The show's directory
|
||||
@@ -172,14 +204,40 @@ pub mod shows {
|
||||
pub relative_poster_path: Option<String>,
|
||||
|
||||
/// This show's parent
|
||||
#[sea_orm(belongs_to, from = "parent_id", to = "id")]
|
||||
#[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")]
|
||||
#[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")]
|
||||
#[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>,
|
||||
@@ -210,9 +268,6 @@ pub mod seasons {
|
||||
/// The season's number
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub season_number: SeasonNumber,
|
||||
/// The season's slug
|
||||
#[sea_orm(unique)]
|
||||
pub slug: String,
|
||||
/// The season's library
|
||||
pub library_id: LibraryId,
|
||||
/// The season's directory
|
||||
@@ -220,17 +275,38 @@ pub mod seasons {
|
||||
/// 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")]
|
||||
#[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)"
|
||||
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,
|
||||
@@ -271,9 +347,6 @@ pub mod episodes {
|
||||
pub episode_number: EpisodeNumber,
|
||||
/// The number of additional contained episodes
|
||||
pub count: u8,
|
||||
/// The episode's slug
|
||||
#[sea_orm(unique)]
|
||||
pub slug: String,
|
||||
/// The episode's library
|
||||
pub library_id: LibraryId,
|
||||
/// The episode's directory
|
||||
@@ -283,17 +356,44 @@ pub mod episodes {
|
||||
/// 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")]
|
||||
#[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)"
|
||||
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,
|
||||
@@ -311,7 +411,7 @@ pub mod episodes {
|
||||
#[cfg(test)]
|
||||
pub mod test {
|
||||
macro_rules! make_content_library {
|
||||
($db:expr, $id:literal) => {
|
||||
($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()),
|
||||
@@ -325,12 +425,11 @@ pub mod test {
|
||||
pub(crate) use make_content_library;
|
||||
|
||||
macro_rules! make_content_collection {
|
||||
($db:expr, $lid:literal, $id:literal, $pid:expr) => {
|
||||
($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)),
|
||||
slug: Set(concat!("C ", $id).to_string()),
|
||||
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),
|
||||
@@ -343,12 +442,11 @@ pub mod test {
|
||||
pub(crate) use make_content_collection;
|
||||
|
||||
macro_rules! make_content_movie {
|
||||
($db:expr, $lid:literal, $id:literal, $pid:expr) => {
|
||||
($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)),
|
||||
slug: Set(concat!("< ", $id).to_string()),
|
||||
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()),
|
||||
@@ -362,12 +460,11 @@ pub mod test {
|
||||
pub(crate) use make_content_movie;
|
||||
|
||||
macro_rules! make_content_show {
|
||||
($db:expr, $lid:literal, $id:literal, $pid:expr) => {
|
||||
($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)),
|
||||
slug: Set(concat!("S ", $id).to_string()),
|
||||
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),
|
||||
@@ -380,12 +477,11 @@ pub mod test {
|
||||
pub(crate) use make_content_show;
|
||||
|
||||
macro_rules! make_content_season {
|
||||
($db:expr, $lid:literal, $show:literal, $season:literal) => {
|
||||
($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($season),
|
||||
slug: Set(concat!("SS ", $show, $season).to_string()),
|
||||
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),
|
||||
@@ -398,20 +494,19 @@ pub mod test {
|
||||
pub(crate) use make_content_season;
|
||||
|
||||
macro_rules! make_content_episode {
|
||||
($db:expr, $lid:literal, $show:literal, $season:literal, $episode:literal) => {
|
||||
($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:literal, $show:literal, $season:literal, $episode:literal, $count:literal) => {
|
||||
(@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($season),
|
||||
episode_number: Set($episode),
|
||||
season_number: Set(::flix_model::numbers::SeasonNumber::new($season)),
|
||||
episode_number: Set(::flix_model::numbers::EpisodeNumber::new($episode)),
|
||||
count: Set($count),
|
||||
slug: Set(concat!("SSE ", $show, $season, $episode).to_string()),
|
||||
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()),
|
||||
@@ -507,7 +602,6 @@ mod tests {
|
||||
|
||||
assert_eq!(model.id, CollectionId::from_raw($id));
|
||||
assert_eq!(model.parent_id, $pid.map(CollectionId::from_raw));
|
||||
assert_eq!(model.slug, concat!("C Slug ", $id).to_string());
|
||||
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),+)?));
|
||||
@@ -522,7 +616,6 @@ mod tests {
|
||||
super::collections::ActiveModel {
|
||||
id: notsettable!(id, CollectionId::from_raw($id) $(, $($skip),+)?),
|
||||
parent_id: notsettable!(parent_id, $pid.map(CollectionId::from_raw) $(, $($skip),+)?),
|
||||
slug: notsettable!(slug, concat!("C Slug ", $id).to_string() $(, $($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),+)?),
|
||||
@@ -548,10 +641,9 @@ mod tests {
|
||||
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; slug);
|
||||
assert_collection!(&db, 6, None, 1, NotNullViolation; library_id);
|
||||
assert_collection!(&db, 7, None, 1, NotNullViolation; directory);
|
||||
assert_collection!(&db, 8, None, 1, Success; relative_poster_path);
|
||||
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]
|
||||
@@ -565,7 +657,6 @@ mod tests {
|
||||
|
||||
assert_eq!(model.id, MovieId::from_raw($id));
|
||||
assert_eq!(model.parent_id, $pid.map(CollectionId::from_raw));
|
||||
assert_eq!(model.slug, concat!("M Slug ", $id).to_string());
|
||||
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));
|
||||
@@ -581,7 +672,6 @@ mod tests {
|
||||
super::movies::ActiveModel {
|
||||
id: notsettable!(id, MovieId::from_raw($id) $(, $($skip),+)?),
|
||||
parent_id: notsettable!(parent_id, $pid.map(CollectionId::from_raw) $(, $($skip),+)?),
|
||||
slug: notsettable!(slug, concat!("M Slug ", $id).to_string() $(, $($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),+)?),
|
||||
@@ -612,11 +702,10 @@ mod tests {
|
||||
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; slug);
|
||||
assert_movie!(&db, 6, None, 1, NotNullViolation; library_id);
|
||||
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);
|
||||
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]
|
||||
@@ -630,7 +719,6 @@ mod tests {
|
||||
|
||||
assert_eq!(model.id, ShowId::from_raw($id));
|
||||
assert_eq!(model.parent_id, $pid.map(CollectionId::from_raw));
|
||||
assert_eq!(model.slug, concat!("S Slug ", $id).to_string());
|
||||
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),+)?));
|
||||
@@ -645,7 +733,6 @@ mod tests {
|
||||
super::shows::ActiveModel {
|
||||
id: notsettable!(id, ShowId::from_raw($id) $(, $($skip),+)?),
|
||||
parent_id: notsettable!(parent_id, $pid.map(CollectionId::from_raw) $(, $($skip),+)?),
|
||||
slug: notsettable!(slug, concat!("S Slug ", $id).to_string() $(, $($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),+)?),
|
||||
@@ -674,10 +761,9 @@ mod tests {
|
||||
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; slug);
|
||||
assert_show!(&db, 6, None, 1, NotNullViolation; library_id);
|
||||
assert_show!(&db, 7, None, 1, NotNullViolation; directory);
|
||||
assert_show!(&db, 8, None, 1, Success; relative_poster_path);
|
||||
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]
|
||||
@@ -690,8 +776,7 @@ mod tests {
|
||||
.expect("insert");
|
||||
|
||||
assert_eq!(model.show_id, ShowId::from_raw($id));
|
||||
assert_eq!(model.season_number, $season);
|
||||
assert_eq!(model.slug, concat!("SS Slug ", $id, ",", $season).to_string());
|
||||
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),+)?));
|
||||
@@ -705,8 +790,7 @@ mod tests {
|
||||
(@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, $season $(, $($skip),+)?),
|
||||
slug: notsettable!(slug, concat!("SS Slug ", $id, ",", $season).to_string() $(, $($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),+)?),
|
||||
@@ -715,7 +799,7 @@ mod tests {
|
||||
}
|
||||
|
||||
make_content_library!(&db, 1);
|
||||
make_info_show!(&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);
|
||||
@@ -729,10 +813,9 @@ mod tests {
|
||||
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; slug);
|
||||
assert_season!(&db, 1, 6, 1, NotNullViolation; library_id);
|
||||
assert_season!(&db, 1, 7, 1, NotNullViolation; directory);
|
||||
assert_season!(&db, 1, 8, 1, Success; relative_poster_path);
|
||||
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]
|
||||
@@ -745,9 +828,8 @@ mod tests {
|
||||
.expect("insert");
|
||||
|
||||
assert_eq!(model.show_id, ShowId::from_raw($id));
|
||||
assert_eq!(model.season_number, $season);
|
||||
assert_eq!(model.episode_number, $episode);
|
||||
assert_eq!(model.slug, concat!("SS Slug ", $id, ",", $season, $episode).to_string());
|
||||
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));
|
||||
@@ -762,10 +844,9 @@ mod tests {
|
||||
(@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, $season $(, $($skip),+)?),
|
||||
episode_number: notsettable!(episode_number, $episode $(, $($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),+)?),
|
||||
slug: notsettable!(slug, concat!("SS Slug ", $id, ",", $season, $episode).to_string() $(, $($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),+)?),
|
||||
@@ -775,8 +856,8 @@ mod tests {
|
||||
}
|
||||
|
||||
make_content_library!(&db, 1);
|
||||
make_info_show!(&db, 1);
|
||||
make_info_season!(&db, 1, 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);
|
||||
@@ -793,10 +874,9 @@ mod tests {
|
||||
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; slug);
|
||||
assert_episode!(&db, 1, 1, 7, 1, NotNullViolation; library_id);
|
||||
assert_episode!(&db, 1, 1, 8, 1, NotNullViolation; directory);
|
||||
assert_episode!(&db, 1, 1, 9, 1, NotNullViolation; relative_media_path);
|
||||
assert_episode!(&db, 1, 1, 10, 1, Success; relative_poster_path);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
+124
-26
@@ -7,19 +7,34 @@ pub mod collections {
|
||||
|
||||
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(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub id: CollectionId,
|
||||
/// The collection's title
|
||||
#[sea_orm(indexed)]
|
||||
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 {}
|
||||
@@ -32,16 +47,17 @@ pub mod movies {
|
||||
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(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub id: MovieId,
|
||||
/// The movie's title
|
||||
#[sea_orm(indexed)]
|
||||
pub title: String,
|
||||
/// The movie's tagline
|
||||
pub tagline: String,
|
||||
@@ -50,6 +66,20 @@ pub mod movies {
|
||||
/// 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 {}
|
||||
@@ -62,16 +92,17 @@ pub mod shows {
|
||||
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(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub id: ShowId,
|
||||
/// The show's title
|
||||
#[sea_orm(indexed)]
|
||||
pub title: String,
|
||||
/// The show's tagline
|
||||
pub tagline: String,
|
||||
@@ -81,12 +112,26 @@ pub mod shows {
|
||||
#[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, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub seasons: HasMany<super::seasons::Entity>,
|
||||
/// Episodes that are part of this show
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[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 {}
|
||||
@@ -100,6 +145,8 @@ pub mod seasons {
|
||||
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)]
|
||||
@@ -120,11 +167,21 @@ pub mod seasons {
|
||||
pub date: NaiveDate,
|
||||
|
||||
/// The show this season belongs to
|
||||
#[sea_orm(belongs_to, from = "show_id", to = "id")]
|
||||
#[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, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[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 {}
|
||||
@@ -138,6 +195,8 @@ pub mod episodes {
|
||||
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)]
|
||||
@@ -161,15 +220,27 @@ pub mod episodes {
|
||||
pub date: NaiveDate,
|
||||
|
||||
/// The show this episode belongs to
|
||||
#[sea_orm(belongs_to, from = "show_id", to = "id")]
|
||||
#[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)"
|
||||
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 {}
|
||||
@@ -179,11 +250,14 @@ pub mod episodes {
|
||||
#[cfg(test)]
|
||||
pub mod test {
|
||||
macro_rules! make_info_collection {
|
||||
($db:expr, $id:literal) => {
|
||||
($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
|
||||
@@ -193,13 +267,16 @@ pub mod test {
|
||||
pub(crate) use make_info_collection;
|
||||
|
||||
macro_rules! make_info_movie {
|
||||
($db:expr, $id:literal) => {
|
||||
($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
|
||||
@@ -209,13 +286,16 @@ pub mod test {
|
||||
pub(crate) use make_info_movie;
|
||||
|
||||
macro_rules! make_info_show {
|
||||
($db:expr, $id:literal) => {
|
||||
($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
|
||||
@@ -225,10 +305,10 @@ pub mod test {
|
||||
pub(crate) use make_info_show;
|
||||
|
||||
macro_rules! make_info_season {
|
||||
($db:expr, $show:literal, $season:literal) => {
|
||||
($db:expr, $show:expr, $season:expr) => {
|
||||
$crate::entity::info::seasons::ActiveModel {
|
||||
show_id: Set(::flix_model::id::ShowId::from_raw($show)),
|
||||
season_number: Set($season),
|
||||
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")),
|
||||
@@ -241,11 +321,11 @@ pub mod test {
|
||||
pub(crate) use make_info_season;
|
||||
|
||||
macro_rules! make_info_episode {
|
||||
($db:expr, $show:literal, $season:literal, $episode:literal) => {
|
||||
($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($season),
|
||||
episode_number: Set($episode),
|
||||
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")),
|
||||
@@ -310,6 +390,9 @@ mod tests {
|
||||
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
|
||||
};
|
||||
}
|
||||
@@ -321,6 +404,9 @@ mod tests {
|
||||
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]
|
||||
@@ -351,6 +437,9 @@ mod tests {
|
||||
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
|
||||
};
|
||||
}
|
||||
@@ -364,6 +453,9 @@ mod tests {
|
||||
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]
|
||||
@@ -397,6 +489,9 @@ mod tests {
|
||||
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
|
||||
};
|
||||
}
|
||||
@@ -410,6 +505,9 @@ mod tests {
|
||||
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]
|
||||
@@ -422,7 +520,7 @@ mod tests {
|
||||
.expect("insert");
|
||||
|
||||
assert_eq!(model.show_id, ShowId::from_raw($show));
|
||||
assert_eq!(model.season_number, $season);
|
||||
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"));
|
||||
@@ -439,7 +537,7 @@ mod tests {
|
||||
(@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, $season $(, $($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),+)?),
|
||||
@@ -473,8 +571,8 @@ mod tests {
|
||||
.expect("insert");
|
||||
|
||||
assert_eq!(model.show_id, ShowId::from_raw($show));
|
||||
assert_eq!(model.season_number, $season);
|
||||
assert_eq!(model.episode_number, $episode);
|
||||
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"));
|
||||
@@ -491,8 +589,8 @@ mod tests {
|
||||
(@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, $season $(, $($skip),+)?),
|
||||
episode_number: notsettable!(episode_number, $episode $(, $($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),+)?),
|
||||
|
||||
+1740
-1
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,7 @@ pub mod collections {
|
||||
#[sea_orm(table_name = "flix_tmdb_collections")]
|
||||
pub struct Model {
|
||||
/// The collection's TMDB ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub tmdb_id: CollectionId,
|
||||
/// The collection's ID
|
||||
#[sea_orm(unique)]
|
||||
@@ -26,12 +26,19 @@ pub mod collections {
|
||||
/// The number of movies in the collection
|
||||
pub movie_count: u16,
|
||||
|
||||
/// Movies that are in this collection
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
pub movies: HasMany<super::movies::Entity>,
|
||||
/// The info for this collection
|
||||
#[sea_orm(belongs_to, from = "flix_id", to = "id")]
|
||||
#[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 {}
|
||||
@@ -55,7 +62,7 @@ pub mod movies {
|
||||
#[sea_orm(table_name = "flix_tmdb_movies")]
|
||||
pub struct Model {
|
||||
/// The movie's TMDB ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub tmdb_id: MovieId,
|
||||
/// The movie's ID
|
||||
#[sea_orm(unique)]
|
||||
@@ -68,11 +75,23 @@ pub mod movies {
|
||||
#[sea_orm(indexed)]
|
||||
pub collection_id: Option<CollectionId>,
|
||||
|
||||
/// The info for this collection
|
||||
#[sea_orm(belongs_to, from = "collection_id", to = "tmdb_id")]
|
||||
/// 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")]
|
||||
#[sea_orm(
|
||||
belongs_to,
|
||||
from = "flix_id",
|
||||
to = "id",
|
||||
on_update = "Cascade",
|
||||
on_delete = "Cascade"
|
||||
)]
|
||||
pub info: HasOne<entity::info::movies::Entity>,
|
||||
}
|
||||
|
||||
@@ -95,7 +114,7 @@ pub mod shows {
|
||||
#[sea_orm(table_name = "flix_tmdb_shows")]
|
||||
pub struct Model {
|
||||
/// The show's TMDB ID
|
||||
#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
|
||||
#[sea_orm(primary_key, auto_increment = false)]
|
||||
pub tmdb_id: ShowId,
|
||||
/// The show's ID
|
||||
#[sea_orm(unique)]
|
||||
@@ -105,15 +124,22 @@ pub mod shows {
|
||||
/// 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, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub seasons: HasMany<super::seasons::Entity>,
|
||||
/// Episodes that are part of this show
|
||||
#[sea_orm(has_many, on_update = "Cascade", on_delete = "Cascade")]
|
||||
#[sea_orm(has_many)]
|
||||
pub episodes: HasMany<super::episodes::Entity>,
|
||||
/// The info for this show
|
||||
#[sea_orm(belongs_to, from = "flix_id", to = "id")]
|
||||
pub info: HasOne<entity::info::shows::Entity>,
|
||||
}
|
||||
|
||||
impl ActiveModelBehavior for ActiveModel {}
|
||||
@@ -151,15 +177,27 @@ pub mod seasons {
|
||||
pub last_update: DateTime<Utc>,
|
||||
|
||||
/// The show this season belongs to
|
||||
#[sea_orm(belongs_to, from = "tmdb_show", to = "tmdb_id")]
|
||||
#[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)"
|
||||
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 {}
|
||||
@@ -206,20 +244,30 @@ pub mod episodes {
|
||||
pub runtime: Seconds,
|
||||
|
||||
/// The show this episode belongs to
|
||||
#[sea_orm(belongs_to, from = "tmdb_show", to = "tmdb_id")]
|
||||
#[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)"
|
||||
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)"
|
||||
to = "(show_id, season_number, episode_number)",
|
||||
on_update = "Cascade",
|
||||
on_delete = "Cascade"
|
||||
)]
|
||||
pub info: HasOne<entity::info::episodes::Entity>,
|
||||
}
|
||||
@@ -231,7 +279,7 @@ pub mod episodes {
|
||||
#[cfg(test)]
|
||||
pub mod test {
|
||||
macro_rules! make_tmdb_collection {
|
||||
($db:expr, $id:literal, $flix_id:literal) => {
|
||||
($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)),
|
||||
@@ -246,7 +294,7 @@ pub mod test {
|
||||
pub(crate) use make_tmdb_collection;
|
||||
|
||||
macro_rules! make_tmdb_movie {
|
||||
($db:expr, $id:literal, $flix_id:literal) => {
|
||||
($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)),
|
||||
@@ -262,7 +310,7 @@ pub mod test {
|
||||
pub(crate) use make_tmdb_movie;
|
||||
|
||||
macro_rules! make_tmdb_show {
|
||||
($db:expr, $id:literal, $flix_id:literal) => {
|
||||
($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)),
|
||||
@@ -277,12 +325,12 @@ pub mod test {
|
||||
pub(crate) use make_tmdb_show;
|
||||
|
||||
macro_rules! make_tmdb_season {
|
||||
($db:expr, $show:literal, $season:literal, $flix_show:literal, $flix_season:literal) => {
|
||||
($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($season),
|
||||
tmdb_season: Set(::flix_model::numbers::SeasonNumber::new($season)),
|
||||
flix_show: Set(::flix_model::id::ShowId::from_raw($flix_show)),
|
||||
flix_season: Set($flix_season),
|
||||
flix_season: Set(::flix_model::numbers::SeasonNumber::new($flix_season)),
|
||||
last_update: Set(::chrono::Utc::now()),
|
||||
}
|
||||
.insert($db)
|
||||
@@ -293,14 +341,14 @@ pub mod test {
|
||||
pub(crate) use make_tmdb_season;
|
||||
|
||||
macro_rules! make_tmdb_episode {
|
||||
($db:expr, $show:literal, $season:literal, $episode:literal, $flix_show:literal, $flix_season:literal, $flix_episode:literal) => {
|
||||
($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($season),
|
||||
tmdb_episode: Set($episode),
|
||||
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_season),
|
||||
flix_episode: Set($flix_episode),
|
||||
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()),
|
||||
}
|
||||
@@ -514,9 +562,9 @@ mod tests {
|
||||
.expect("insert");
|
||||
|
||||
assert_eq!(model.tmdb_show, TmdbShowId::from_raw($tshow));
|
||||
assert_eq!(model.tmdb_season, $tseason);
|
||||
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, $season);
|
||||
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),+)?) => {
|
||||
@@ -531,9 +579,9 @@ mod tests {
|
||||
(@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),+)?),
|
||||
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, $season $(, $($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
|
||||
};
|
||||
@@ -569,11 +617,11 @@ mod tests {
|
||||
.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.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, $season);
|
||||
assert_eq!(model.flix_episode, $episode);
|
||||
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());
|
||||
};
|
||||
@@ -589,11 +637,11 @@ mod tests {
|
||||
(@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),+)?),
|
||||
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, $season $(, $($skip),+)?),
|
||||
flix_episode: notsettable!(flix_episode, $episode $(, $($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
|
||||
|
||||
@@ -24,7 +24,14 @@ pub mod collections {
|
||||
pub watched_date: DateTime<Utc>,
|
||||
|
||||
/// The info for this collection
|
||||
#[sea_orm(belongs_to, relation_enum = "Info", from = "id", to = "id")]
|
||||
#[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)]
|
||||
@@ -58,7 +65,13 @@ pub mod movies {
|
||||
pub watched_date: DateTime<Utc>,
|
||||
|
||||
/// The info for this movie
|
||||
#[sea_orm(belongs_to, from = "id", to = "id")]
|
||||
#[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)]
|
||||
@@ -92,7 +105,14 @@ pub mod shows {
|
||||
pub watched_date: DateTime<Utc>,
|
||||
|
||||
/// The info for this show
|
||||
#[sea_orm(belongs_to, relation_enum = "Info", from = "id", to = "id")]
|
||||
#[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)]
|
||||
@@ -134,7 +154,9 @@ pub mod seasons {
|
||||
belongs_to,
|
||||
relation_enum = "Info",
|
||||
from = "(show_id, season_number)",
|
||||
to = "(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
|
||||
@@ -186,7 +208,9 @@ pub mod episodes {
|
||||
belongs_to,
|
||||
relation_enum = "Info",
|
||||
from = "(show_id, season_number, episode_number)",
|
||||
to = "(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
|
||||
@@ -207,7 +231,7 @@ pub mod episodes {
|
||||
#[cfg(test)]
|
||||
pub mod test {
|
||||
macro_rules! make_watched_movie {
|
||||
($db:expr, $id:literal, $user:literal) => {
|
||||
($db:expr, $id:expr, $user:expr) => {
|
||||
$crate::entity::watched::movies::ActiveModel {
|
||||
id: Set(::flix_model::id::MovieId::from_raw($id)),
|
||||
user_id: Set($user),
|
||||
@@ -221,11 +245,11 @@ pub mod test {
|
||||
pub(crate) use make_watched_movie;
|
||||
|
||||
macro_rules! make_watched_episode {
|
||||
($db:expr, $show:literal, $season:literal, $episode:literal, $user:literal) => {
|
||||
($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($season),
|
||||
episode_number: Set($episode),
|
||||
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()),
|
||||
}
|
||||
@@ -326,8 +350,8 @@ mod tests {
|
||||
.expect("insert");
|
||||
|
||||
assert_eq!(model.show_id, ShowId::from_raw($show));
|
||||
assert_eq!(model.season_number, $season);
|
||||
assert_eq!(model.episode_number, $episode);
|
||||
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());
|
||||
};
|
||||
@@ -340,8 +364,8 @@ mod tests {
|
||||
(@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, $season $(, $($skip),+)?),
|
||||
episode_number: notsettable!(episode_number, $episode $(, $($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
|
||||
|
||||
+11
-15
@@ -1,22 +1,22 @@
|
||||
[package]
|
||||
name = "flix"
|
||||
version = "0.0.15"
|
||||
|
||||
categories = []
|
||||
version = "0.0.17"
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
description = "Mechanisms for interacting with flix media"
|
||||
repository = "https://github.com/QuantumShade/flix"
|
||||
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license-file.workspace = true
|
||||
rust-version.workspace = true
|
||||
categories = []
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
[dependencies]
|
||||
flix-db = { workspace = true }
|
||||
flix-fs = { workspace = true, optional = true }
|
||||
flix-model = { workspace = true }
|
||||
flix-tmdb = { workspace = true, optional = true }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
@@ -24,9 +24,5 @@ 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 }
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
+10
-13
@@ -1,28 +1,25 @@
|
||||
[package]
|
||||
name = "flix-fs"
|
||||
version = "0.0.15"
|
||||
|
||||
categories = []
|
||||
version = "0.0.17"
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
description = "Filesystem scanner for flix media"
|
||||
repository = "https://github.com/QuantumShade/flix"
|
||||
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license-file.workspace = true
|
||||
rust-version.workspace = true
|
||||
categories = []
|
||||
|
||||
[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
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
}),
|
||||
})),
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -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,22 @@ 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(mut s: &str) -> &str {
|
||||
while let Some('0'..='9') = s.chars().next() {
|
||||
s = &s[1..]
|
||||
}
|
||||
s.strip_prefix(" - ").unwrap_or(s)
|
||||
}
|
||||
|
||||
/// Detect the type of a folder and call the correct scanner. Use
|
||||
/// this only for detecting possibly ambiguous media:
|
||||
/// - Collections
|
||||
@@ -202,7 +86,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 +95,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 +111,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 +148,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 +164,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 +197,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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,73 @@ 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),
|
||||
}
|
||||
|
||||
/// 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>,
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
}),
|
||||
})),
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
) {
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
+11
-14
@@ -1,29 +1,26 @@
|
||||
[package]
|
||||
name = "flix-model"
|
||||
version = "0.0.15"
|
||||
|
||||
categories = []
|
||||
version = "0.0.17"
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
description = "Core types for flix data"
|
||||
repository = "https://github.com/QuantumShade/flix"
|
||||
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license-file.workspace = true
|
||||
rust-version.workspace = true
|
||||
categories = []
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
[dependencies]
|
||||
itertools = { workspace = true }
|
||||
seamantic = { workspace = true }
|
||||
serde = { workspace = true, features = ["derive", "std"], optional = true }
|
||||
thiserror = { workspace = true }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
serde = ["dep:serde"]
|
||||
|
||||
[dependencies]
|
||||
seamantic = { workspace = true }
|
||||
|
||||
serde = { workspace = true, optional = true, features = ["std", "derive"] }
|
||||
thiserror = { workspace = true }
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
@@ -4,3 +4,4 @@
|
||||
|
||||
pub mod id;
|
||||
pub mod numbers;
|
||||
pub mod text;
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
//! 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()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
+23
-25
@@ -1,40 +1,38 @@
|
||||
[package]
|
||||
name = "flix-tmdb"
|
||||
version = "0.0.15"
|
||||
|
||||
categories = []
|
||||
version = "0.0.17"
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
description = "Clients and models for fetching data from TMDB"
|
||||
repository = "https://github.com/QuantumShade/flix"
|
||||
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license-file.workspace = true
|
||||
rust-version.workspace = true
|
||||
categories = []
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
[dependencies]
|
||||
bytes = { workspace = true }
|
||||
chrono = { workspace = true, features = ["serde"] }
|
||||
flix-model = { workspace = true, features = ["serde"] }
|
||||
governor = { workspace = true, features = ["jitter", "std"] }
|
||||
nonzero_ext = { workspace = true }
|
||||
redb = { workspace = true }
|
||||
reqwest = { workspace = true, features = ["query", "rustls"] }
|
||||
sea-orm = { workspace = true, optional = true }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
url = { workspace = true }
|
||||
url-macro = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
serde_test = { workspace = true }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
sea-orm = ["dep:sea-orm"]
|
||||
|
||||
[dependencies]
|
||||
flix-model = { workspace = true }
|
||||
|
||||
chrono = { workspace = true, features = ["serde"] }
|
||||
governor = { workspace = true, features = ["std", "jitter"] }
|
||||
nonzero_ext = { workspace = true }
|
||||
reqwest = { workspace = true, features = ["json", "rustls-tls"] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
thiserror = { workspace = true }
|
||||
url = { workspace = true }
|
||||
url-macro = { workspace = true }
|
||||
|
||||
sea-orm = { workspace = true, optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
serde_test = { workspace = true }
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,27 +1,32 @@
|
||||
//! Episodes API
|
||||
|
||||
use core::time::Duration;
|
||||
use std::rc::Rc;
|
||||
use std::sync::RwLock;
|
||||
|
||||
use flix_model::numbers::{EpisodeNumber, SeasonNumber};
|
||||
|
||||
use governor::Jitter;
|
||||
|
||||
use crate::Config;
|
||||
use crate::api::exec_request;
|
||||
use crate::model::Episode;
|
||||
use crate::model::id::ShowId;
|
||||
use crate::{Cache, CachePolicy, Config};
|
||||
|
||||
use super::{Error, make_request};
|
||||
|
||||
/// TMDB Episodes 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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,18 +39,7 @@ impl Client {
|
||||
episode: impl Into<EpisodeNumber>,
|
||||
language: Option<&str>,
|
||||
) -> Result<Episode, 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/tv/{}/season/{}/episode/{}",
|
||||
@@ -54,10 +48,7 @@ impl Client {
|
||||
episode.into()
|
||||
),
|
||||
language,
|
||||
)?)
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json()
|
||||
.await?)
|
||||
)?;
|
||||
exec_request(&self.config, &*self.cache, &self.policy, request).await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
//! TMDB API clients
|
||||
|
||||
use core::ops::Deref;
|
||||
use core::time::Duration;
|
||||
use std::sync::RwLock;
|
||||
|
||||
use governor::Jitter;
|
||||
use reqwest::Request;
|
||||
use reqwest::header;
|
||||
use serde::de::DeserializeOwned;
|
||||
|
||||
use crate::Config;
|
||||
use crate::{Cache, CachePolicy, Config};
|
||||
|
||||
pub mod collections;
|
||||
pub mod episodes;
|
||||
@@ -20,6 +26,9 @@ pub enum Error {
|
||||
/// Reqwest error wrapper
|
||||
#[error("reqwest error: {0}")]
|
||||
Reqwest(#[from] reqwest::Error),
|
||||
/// Json error wrapper
|
||||
#[error("json error: {0}")]
|
||||
Json(#[from] serde_json::Error),
|
||||
}
|
||||
|
||||
fn make_request(config: &Config, path: &str, language: Option<&str>) -> Result<Request, Error> {
|
||||
@@ -38,3 +47,58 @@ fn make_request(config: &Config, path: &str, language: Option<&str>) -> Result<R
|
||||
|
||||
Ok(builder.build()?)
|
||||
}
|
||||
|
||||
async fn exec_request<T: DeserializeOwned>(
|
||||
config: &Config,
|
||||
cache: &dyn Cache,
|
||||
policy: &RwLock<CachePolicy>,
|
||||
request: Request,
|
||||
) -> Result<T, Error> {
|
||||
let (read_cache, write_cache) = if let Ok(guard) = policy.read() {
|
||||
match guard.deref() {
|
||||
CachePolicy::None => (None, None),
|
||||
CachePolicy::Full => (Some(cache), Some(cache)),
|
||||
CachePolicy::Read => (Some(cache), None),
|
||||
CachePolicy::Update => (None, Some(cache)),
|
||||
}
|
||||
} else {
|
||||
(None, None)
|
||||
};
|
||||
|
||||
let path = request.url().path().to_owned();
|
||||
|
||||
// read the cache and fall back to reqwest
|
||||
let mut response = None;
|
||||
if let Some(cache) = read_cache {
|
||||
response = cache.get(&path);
|
||||
}
|
||||
let needs_cache_write = response.is_none();
|
||||
let response = match response {
|
||||
Some(response) => response,
|
||||
None => {
|
||||
config
|
||||
.limiter
|
||||
.until_ready_with_jitter(Jitter::new(
|
||||
Duration::from_millis(0),
|
||||
Duration::from_millis(50),
|
||||
))
|
||||
.await;
|
||||
config
|
||||
.client
|
||||
.execute(request)
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.bytes()
|
||||
.await?
|
||||
}
|
||||
};
|
||||
|
||||
// write to the cache if needed
|
||||
if let Some(cache) = write_cache
|
||||
&& needs_cache_write
|
||||
{
|
||||
cache.set(&path, &response);
|
||||
}
|
||||
|
||||
Ok(serde_json::from_slice(&response)?)
|
||||
}
|
||||
|
||||
@@ -1,25 +1,30 @@
|
||||
//! Movies 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::Movie;
|
||||
use crate::model::id::MovieId;
|
||||
use crate::{Cache, CachePolicy, Config};
|
||||
|
||||
use super::{Error, make_request};
|
||||
|
||||
/// TMDB Movies 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<MovieId>,
|
||||
language: Option<&str>,
|
||||
) -> Result<Movie, 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/movie/{}", id.into().into_raw()),
|
||||
language,
|
||||
)?)
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json()
|
||||
.await?)
|
||||
)?;
|
||||
exec_request(&self.config, &*self.cache, &self.policy, request).await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,27 +1,32 @@
|
||||
//! Seasons API
|
||||
|
||||
use core::time::Duration;
|
||||
use std::rc::Rc;
|
||||
use std::sync::RwLock;
|
||||
|
||||
use flix_model::numbers::SeasonNumber;
|
||||
|
||||
use governor::Jitter;
|
||||
|
||||
use crate::Config;
|
||||
use crate::api::exec_request;
|
||||
use crate::model::Season;
|
||||
use crate::model::id::ShowId;
|
||||
use crate::{Cache, CachePolicy, Config};
|
||||
|
||||
use super::{Error, make_request};
|
||||
|
||||
/// TMDB Seasons 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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,25 +38,11 @@ impl Client {
|
||||
season: impl Into<SeasonNumber>,
|
||||
language: Option<&str>,
|
||||
) -> Result<Season, 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/tv/{}/season/{}", id.into().into_raw(), season.into()),
|
||||
language,
|
||||
)?)
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json()
|
||||
.await?)
|
||||
)?;
|
||||
exec_request(&self.config, &*self.cache, &self.policy, request).await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,25 +1,30 @@
|
||||
//! Shows 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::Show;
|
||||
use crate::model::id::ShowId;
|
||||
use crate::{Cache, CachePolicy, Config};
|
||||
|
||||
use super::{Error, make_request};
|
||||
|
||||
/// TMDB Shows 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<ShowId>,
|
||||
language: Option<&str>,
|
||||
) -> Result<Show, 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/tv/{}", id.into().into_raw()),
|
||||
language,
|
||||
)?)
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json()
|
||||
.await?)
|
||||
)?;
|
||||
exec_request(&self.config, &*self.cache, &self.policy, request).await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
use std::path::Path;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use bytes::Bytes;
|
||||
use redb::{Database, DatabaseError, ReadableDatabase, TableDefinition};
|
||||
|
||||
/// The client cache policy
|
||||
pub enum CachePolicy {
|
||||
/// Do not use a cache
|
||||
None,
|
||||
/// Use and update the cache
|
||||
Full,
|
||||
/// Use the cache but don't update it
|
||||
Read,
|
||||
/// Ignore the cache but update it
|
||||
Update,
|
||||
}
|
||||
|
||||
/// The trait representing a caching backend
|
||||
pub trait Cache {
|
||||
/// Get a cached value, or None
|
||||
fn get(&self, query: &str) -> Option<Bytes>;
|
||||
/// Set a value in the cache
|
||||
fn set(&self, query: &str, response: &Bytes);
|
||||
}
|
||||
|
||||
const TABLE: TableDefinition<&str, (u64, &[u8])> = TableDefinition::new("tmdb_responses");
|
||||
|
||||
/// A [Cache] implementation using [redb] as the backend
|
||||
pub struct RedbCache {
|
||||
db: Database,
|
||||
}
|
||||
|
||||
impl RedbCache {
|
||||
/// Create/open a [redb] database at the path
|
||||
pub fn new(path: &Path) -> Result<Self, DatabaseError> {
|
||||
Ok(Self {
|
||||
db: Database::create(path)?,
|
||||
})
|
||||
}
|
||||
|
||||
/// Helper function allowing for `.ok()?`
|
||||
fn write(&self, timestamp: u64, query: &str, response: &Bytes) -> Option<()> {
|
||||
let write_txn = self.db.begin_write().ok()?;
|
||||
{
|
||||
let mut table = write_txn.open_table(TABLE).ok()?;
|
||||
table
|
||||
.insert(query, (timestamp, response.iter().as_slice()))
|
||||
.ok()?;
|
||||
}
|
||||
write_txn.commit().ok()
|
||||
}
|
||||
}
|
||||
|
||||
impl Cache for RedbCache {
|
||||
fn get(&self, query: &str) -> Option<Bytes> {
|
||||
let read_txn = self.db.begin_read().ok()?;
|
||||
let table = read_txn.open_table(TABLE).ok()?;
|
||||
|
||||
let result = table.get(query).ok()??;
|
||||
let (timestamp, data) = result.value();
|
||||
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
|
||||
if now.saturating_sub(timestamp) >= 60 * 60 * 24 * 30 * 6 {
|
||||
None
|
||||
} else {
|
||||
Some(Bytes::copy_from_slice(data))
|
||||
}
|
||||
}
|
||||
|
||||
fn set(&self, query: &str, response: &Bytes) {
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
|
||||
self.write(now, query, response);
|
||||
}
|
||||
}
|
||||
+33
-13
@@ -1,6 +1,7 @@
|
||||
use std::rc::Rc;
|
||||
use std::sync::RwLock;
|
||||
|
||||
use crate::{Config, api};
|
||||
use crate::{Cache, CachePolicy, Config, api};
|
||||
|
||||
/// The primary client that references all other clients
|
||||
pub struct Client {
|
||||
@@ -9,23 +10,42 @@ pub struct Client {
|
||||
shows: api::shows::Client,
|
||||
seasons: api::seasons::Client,
|
||||
episodes: api::episodes::Client,
|
||||
|
||||
cache_policy: Rc<RwLock<CachePolicy>>,
|
||||
}
|
||||
|
||||
impl Client {
|
||||
/// Create a new client from a default configuration using the bearer token
|
||||
pub fn new(bearer_token: String) -> Self {
|
||||
Self::new_with_config(Config::new(bearer_token))
|
||||
/// Create a new client with the given configuration
|
||||
pub fn new(config: Config, cache: Rc<dyn Cache>, cache_policy: CachePolicy) -> Self {
|
||||
let config = Rc::new(config);
|
||||
let cache_policy = Rc::new(RwLock::new(cache_policy));
|
||||
Self {
|
||||
collections: api::collections::Client::new(
|
||||
config.clone(),
|
||||
cache.clone(),
|
||||
cache_policy.clone(),
|
||||
),
|
||||
movies: api::movies::Client::new(config.clone(), cache.clone(), cache_policy.clone()),
|
||||
shows: api::shows::Client::new(config.clone(), cache.clone(), cache_policy.clone()),
|
||||
seasons: api::seasons::Client::new(config.clone(), cache.clone(), cache_policy.clone()),
|
||||
episodes: api::episodes::Client::new(
|
||||
config.clone(),
|
||||
cache.clone(),
|
||||
cache_policy.clone(),
|
||||
),
|
||||
|
||||
cache_policy,
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a new client with the given configuration
|
||||
pub fn new_with_config(config: Config) -> Self {
|
||||
let config = Rc::new(config);
|
||||
Self {
|
||||
collections: api::collections::Client::new(config.clone()),
|
||||
movies: api::movies::Client::new(config.clone()),
|
||||
shows: api::shows::Client::new(config.clone()),
|
||||
seasons: api::seasons::Client::new(config.clone()),
|
||||
episodes: api::episodes::Client::new(config.clone()),
|
||||
/// Modify the [CachePolicy]
|
||||
pub fn set_cache_policy(&self, new_policy: CachePolicy) {
|
||||
match self.cache_policy.write() {
|
||||
Ok(mut policy) => *policy = new_policy,
|
||||
Err(mut poison) => {
|
||||
**poison.get_mut() = new_policy;
|
||||
self.cache_policy.clear_poison();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
pub mod api;
|
||||
pub mod model;
|
||||
|
||||
mod cache;
|
||||
pub use cache::{Cache, CachePolicy, RedbCache};
|
||||
|
||||
mod client;
|
||||
pub use client::Client;
|
||||
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# Init database
|
||||
rm flix.db
|
||||
cargo run -- init
|
||||
|
||||
|
||||
###############
|
||||
# Collections #
|
||||
###############
|
||||
|
||||
# DC
|
||||
cargo run -- add flix collection "DC Collection" ""
|
||||
cargo run -- add tmdb show 60708 # Gotham (2014)
|
||||
|
||||
# DCEU
|
||||
cargo run -- add --sort-title "dceu" flix collection "Worlds of DC" "American media franchise and shared universe that is centered on a series of superhero films, distributed by Warner Bros. Pictures and based on characters that appear in American comic books by DC Comics."
|
||||
cargo run -- add tmdb collection 573693 # Aquaman Collection
|
||||
cargo run -- add tmdb movie 297802 # Aquaman (2018)
|
||||
cargo run -- add tmdb movie 572802 # Aquaman and the Lost Kingdom (2023)
|
||||
|
||||
# Marvel
|
||||
cargo run -- add --sort-title "marvel" flix collection "In Association With Marvel" "Movies based on Marvel Comics properties not produced by Marvel Studios"
|
||||
cargo run -- add --fs-slug "cloak and dagger (2018)" --web-slug "cloak-and-dagger-2018" tmdb show 66190 # Marvel's Cloak & Dagger (2018)
|
||||
cargo run -- add --fs-slug "daredevil (2015)" --web-slug "daredevil-2015" tmdb show 61889 # Marvel's Daredevil (2015)
|
||||
cargo run -- add --fs-slug "inhumans (2017)" --web-slug "inhumans-2017" tmdb show 68716 # Marvel's Inhumans (2017)
|
||||
cargo run -- add --fs-slug "iron fist (2017)" --web-slug "iron-fist-2017" tmdb show 62127 # Marvel's Iron Fist (2017)
|
||||
cargo run -- add --fs-slug "jessica jones (2015)" --web-slug "jessica-jones-2015" tmdb show 38472 # Marvel's Jessica Jones (2015)
|
||||
cargo run -- add --fs-slug "luke cage (2016)" --web-slug "luke-cage-2016" tmdb show 62126 # Marvel's Luke Cage (2016)
|
||||
cargo run -- add --fs-slug "runaways (2017)" --web-slug "runaways-2017" tmdb show 67466 # Marvel's Runaways (2017)
|
||||
cargo run -- add --fs-slug "defenders (2017)" --web-slug "defenders-2017" tmdb show 62285 # Marvel's The Defenders (2017)
|
||||
cargo run -- add --fs-slug "punisher (2017)" --web-slug "punisher-2017" tmdb show 67178 # Marvel's The Punisher (2017)
|
||||
|
||||
# Marvel Cinematic Universe
|
||||
cargo run -- add flix collection "Marvel Cinematic Universe" ""
|
||||
cargo run -- add tmdb show 84958 # Loki (2021)
|
||||
cargo run -- add --fs-slug "agent carter (2015)" --web-slug "agent-carter-2015" tmdb show 61550 # Marvel's Agent Carter (2015)
|
||||
cargo run -- add --fs-slug "agents of shield (2013)" --web-slug "agents-of-shield-2013" tmdb show 1403 # Marvel's Agents of S.H.I.E.L.D. (2013)
|
||||
|
||||
# Star Wars
|
||||
cargo run -- add tmdb collection 10 # Star Wars Collection
|
||||
cargo run -- add --title "Star Wars: Episode I - The Phantom Menace" --sort-title "star wars 1 - the phantom menace" --fs-slug "the phantom menace (1999)" --web-slug "star-wars-the-phantom-menace-1999" tmdb movie 1893 # Star Wars: Episode I - The Phantom Menace (1999)
|
||||
cargo run -- add --title "Star Wars: Episode II - Attack of the Clones" --sort-title "star wars 2 - attack of the clones" --fs-slug "attack of the clones (2002)" --web-slug "star-wars-attack-of-the-clones-2002" tmdb movie 1894 # Star Wars: Episode II - Attack of the Clones (2002)
|
||||
cargo run -- add --title "Star Wars: Episode III - Revenge of the Sith" --sort-title "star wars 3 - revenge of the sith" --fs-slug "revenge of the sith (2005)" --web-slug "star-wars-revenge-of-the-sith-2005" tmdb movie 1895 # Star Wars: Episode III - Revenge of the Sith (2005)
|
||||
cargo run -- add --title "Star Wars: Episode IV - A New Hope" --sort-title "star wars 4 - a new hope" --fs-slug "a new hope (1977)" --web-slug "star-wars-a-new-hope-1977" tmdb movie 11 # Star Wars (1977)
|
||||
cargo run -- add --title "Star Wars: Episode V - The Empire Strikes Back" --sort-title "star wars 5 - the empire strikes back" --fs-slug "the empire strikes back (1980)" --web-slug "star-wars-the-empire-strikes-back-1980" tmdb movie 1891 # The Empire Strikes Back (1980)
|
||||
cargo run -- add --title "Star Wars: Episode VI - Return of the Jedi" --sort-title "star wars 6 - return of the jedi" --fs-slug "return of the jedi (1983)" --web-slug "star-wars-return-of-the-jedi-1983" tmdb movie 1892 # Return of the Jedi (1983)
|
||||
cargo run -- add --title "Star Wars: Episode VII - The Force Awakens" --sort-title "star wars 7 - the force awakens" --fs-slug "the force awakens (2015)" --web-slug "star-wars-the-force-awakens-2015" tmdb movie 140607 # Star Wars: The Force Awakens (2015)
|
||||
cargo run -- add --title "Star Wars: Episode VIII - The Last Jedi" --sort-title "star wars 8 - the last jedi" --fs-slug "the last jedi (2017)" --web-slug "star-wars-the-last-jedi-2017" tmdb movie 181808 # Star Wars: The Last Jedi (2017)
|
||||
cargo run -- add --title "Star Wars: Episode IX - The Rise of Skywalker" --sort-title "star wars 9 - the rise of skywalker" --fs-slug "the rise of skywalker (2019)" --web-slug "star-wars-the-rise-of-skywalker-2019" tmdb movie 181812 # Star Wars: The Rise of Skywalker (2019)
|
||||
cargo run -- add tmdb show 82856 # The Mandalorian (2019)
|
||||
|
||||
# Twin Peaks
|
||||
cargo run -- add flix collection "Twin Peaks Collection" ""
|
||||
cargo run -- add tmdb show 1920 # Twin Peaks (1990)
|
||||
|
||||
|
||||
#####################
|
||||
# Movie Collections #
|
||||
#####################
|
||||
|
||||
# Disney Live-Action Remakes
|
||||
cargo run -- add flix collection "Disney Live-Action Remakes" "Live-action or photorealistic remakes produced by Walt Disney Pictures of its animated films."
|
||||
cargo run -- add tmdb movie 447273 # Snow White (2025)
|
||||
|
||||
# Happy Gilmore
|
||||
cargo run -- add tmdb collection 1263259 # Happy Gilmore Collection
|
||||
cargo run -- add tmdb movie 9614 # Happy Gilmore (1996)
|
||||
cargo run -- add tmdb movie 1263256 # Happy Gilmore 2 (2025)
|
||||
|
||||
# Minecraft
|
||||
cargo run -- add tmdb collection 1461530 # The Minecraft Movie Collection
|
||||
cargo run -- add tmdb movie 950387 # A Minecraft Movie (2025)
|
||||
|
||||
|
||||
####################
|
||||
# Show Collections #
|
||||
####################
|
||||
|
||||
# Arrowverse
|
||||
cargo run -- add flix collection "Arrowverse" "A television franchise that is based on characters that appear in publications by DC Comics."
|
||||
cargo run -- add tmdb show 1412 # Arrow (2012)
|
||||
cargo run -- add tmdb show 89247 # Batwoman (2019)
|
||||
cargo run -- add tmdb show 71663 # Black Lightning (2018)
|
||||
cargo run -- add tmdb show 60735 # The Flash (2014)
|
||||
cargo run -- add --fs-slug "legends of tomorrow (2016)" --web-slug "legends-of-tomorrow-2016" tmdb show 62643
|
||||
cargo run -- add tmdb show 62688 # Supergirl (2015)
|
||||
|
||||
# Avatar Universe
|
||||
cargo run -- add flix collection "Avatar Universe" "Avatar: The Last Airbender is set in an Asiatic-like world in which some people can manipulate the classical elements with psychokinetic variants of the Chinese martial arts known as 'bending'."
|
||||
cargo run -- add tmdb show 246 # Avatar: The Last Airbender (2005)
|
||||
cargo run -- add tmdb show 33880 # The Legend of Korra (2012)
|
||||
|
||||
# Breaking Bad
|
||||
cargo run -- add flix collection "Breaking Bad Collection" "Collection containing the original Breaking Bad show along with a documentary chronicling the process of making the final season, a sequel movie and prequel show."
|
||||
cargo run -- add tmdb show 1396 # Breaking Bad (2008)
|
||||
|
||||
# Buffyverse
|
||||
cargo run -- add flix collection "Buffyverse" "The Buffyverse is a setting in which supernatural phenomena exist, and supernatural evil can be challenged by people willing to fight against such forces."
|
||||
cargo run -- add tmdb show 2426 # Angel (1999)
|
||||
cargo run -- add tmdb show 95 # Buffy the Vampire Slayer (1997)
|
||||
|
||||
|
||||
##########
|
||||
# Movies #
|
||||
##########
|
||||
cargo run -- add tmdb movie 940551 # Migration (2023)
|
||||
|
||||
|
||||
#########
|
||||
# Shows #
|
||||
#########
|
||||
cargo run -- add tmdb show 62110 # Assassination Classroom (2015)
|
||||
cargo run -- add tmdb show 1429 # Attack on Titan (2013)
|
||||
cargo run -- add tmdb show 42009 # Black Mirror (2011)
|
||||
cargo run -- add tmdb show 1911 # Bones (2005)
|
||||
cargo run -- add tmdb show 48891 # Brooklyn Nine-Nine (2013)
|
||||
cargo run -- add flix episode "brooklyn-nine-nine-2013" 8 10 "The Last Day (Part 2)" "The squad takes stock of its eight years together and looks toward the future." "2021-09-16"
|
||||
cargo run -- add tmdb show 3787 # Chaotic (2006)
|
||||
cargo run -- add tmdb show 2557 # Class of the Titans (2006)
|
||||
cargo run -- add tmdb show 13916 # Death Note (2006)
|
||||
cargo run -- add tmdb show 1405 # Dexter (2006)
|
||||
cargo run -- add tmdb show 1399 # Game of Thrones (2011)
|
||||
cargo run -- add tmdb show 40075 # Gravity Falls (2012)
|
||||
cargo run -- add tmdb show 1639 # Heroes (2006)
|
||||
cargo run -- add tmdb show 60858 # Heroes Reborn (2015)
|
||||
cargo run -- add tmdb show 71340 # Krypton (2018)
|
||||
cargo run -- add tmdb show 62687 # Limitless (2015)
|
||||
cargo run -- add tmdb show 60846 # Log Horizon (2013)
|
||||
cargo run -- add tmdb show 64432 # The Magicians (2015)
|
||||
cargo run -- add tmdb show 5920 # The Mentalist (2008)
|
||||
cargo run -- add tmdb show 12786 # Murdoch Mysteries (2008)
|
||||
cargo run -- add tmdb show 65930 # My Hero Academia (2016)
|
||||
cargo run -- add tmdb show 2288 # Prison Break (2005)
|
||||
cargo run -- add tmdb show 95396 # Severance (2022)
|
||||
cargo run -- add tmdb show 60573 # Silicon Valley (2014)
|
||||
cargo run -- add tmdb show 37680 # Suits (2011)
|
||||
cargo run -- add tmdb show 45782 # Sword Art Online (2012)
|
||||
cargo run -- add tmdb show 48860 # The Tomorrow People (2013)
|
||||
cargo run -- add tmdb show 46331 # Under the Dome (2013)
|
||||
cargo run -- add tmdb show 1432 # Veronica Mars (2004)
|
||||
cargo run -- add tmdb show 186 # Weeds (2005)
|
||||
cargo run -- add tmdb show 63247 # Westworld (2016)
|
||||
cargo run -- add tmdb show 71912 # The Witcher (2019)
|
||||
@@ -0,0 +1,5 @@
|
||||
toml-version = "v1.0.0"
|
||||
|
||||
[format.rules]
|
||||
indent-style = "tab"
|
||||
indent-width = 4
|
||||
Reference in New Issue
Block a user