Fix bug with & in movie names; update catalog

This commit is contained in:
2026-09-08 20:52:08 -07:00
parent 5e49f653f1
commit d2a867fa19
15 changed files with 66 additions and 54 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix-mux"
version = "0.1.0"
version = "0.1.1"
description = "CLI for bulk media muxing"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix-cli"
version = "0.1.0"
version = "0.1.1"
description = "CLI for interacting with a flix database"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]
+4
View File
@@ -93,6 +93,9 @@ pub(crate) struct AddOverrides {
/// Override the displayed title.
#[arg(long)]
pub title: Option<String>,
/// Override the displayed overview.
#[arg(long)]
pub overview: Option<String>,
/// Override the title used to sort.
#[arg(long)]
pub sort_title: Option<String>,
@@ -106,6 +109,7 @@ pub(crate) struct AddOverrides {
/// Top level cli commands.
#[derive(Subcommand)]
#[expect(clippy::large_enum_variant, reason = "not performance critical")]
pub(crate) enum Command {
/// Initialize a new database.
Init,
+2 -1
View File
@@ -52,6 +52,7 @@ pub(crate) async fn add(
.with_context(|| format!("collections().get_details({})", id.into_raw()))?;
let title = overrides.title.unwrap_or(collection.title);
let overview = overrides.overview.unwrap_or(collection.overview);
let sort_title = overrides
.sort_title
@@ -81,7 +82,7 @@ pub(crate) async fn add(
let flix = entity::info::collections::ActiveModel {
id: NotSet,
title: Set(title),
overview: Set(collection.overview),
overview: Set(overview),
sort_title: Set(sort_title),
fs_slug: Set(fs_slug),
web_slug: Set(web_slug),
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix-db"
version = "0.1.0"
version = "0.1.1"
description = "Types for storing persistent data about media"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix"
version = "0.1.0"
version = "0.1.1"
description = "Mechanisms for interacting with flix media"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix-fs"
version = "0.1.0"
version = "0.1.1"
description = "Filesystem scanner for flix media"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]
+1 -1
View File
@@ -110,7 +110,7 @@ impl Scanner {
#[expect(clippy::panic, reason = "static regex string")]
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}"))
});
#[expect(clippy::panic, reason = "static regex string")]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix-model"
version = "0.1.0"
version = "0.1.1"
description = "Core types for flix data"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "flix-tmdb"
version = "0.1.0"
version = "0.1.1"
description = "Clients and models for fetching data from TMDB"
repository = "https://git.skrundz.dev/quantumshade/flix"
keywords = ["flix"]