Update for rust 1.99

catalog/collections/avatar-universe.sh

@@ -2,7 +2,7 @@ run flix 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'."
 
-run flix add tmdb collection 1136366             # Avatar: The Last Airbender - Collection
+run flix add tmdb collection 1136366             # Avatar Aang: The Last Airbender Collection
 run flix add tmdb movie 980431                   # Avatar Aang: The Last Airbender (2026)
 # run flix add tmdb movie 1127274 # upcoming
 

catalog/collections/mu.sh

@@ -46,16 +46,15 @@ run flix add tmdb movie 49538                    # X-Men: First Class (2011)
 run flix add tmdb movie 127585                   # X-Men: Days of Future Past (2014)
 run flix add tmdb movie 246655                   # X-Men: Apocalypse (2016)
 run flix add tmdb movie 320288                   # Dark Phoenix (2019)
-run flix add tmdb collection 1645434             # X-Anthology
-run flix add tmdb movie 26623                    # Generation X (1996)
-run flix add tmdb movie 340102                   # The New Mutants (2020)
 
 run flix add tmdb collection 558216              # Venom Collection
 run flix add tmdb movie 335983                   # Venom (2018)
 run flix add tmdb movie 580489                   # Venom: Let There Be Carnage (2021)
 run flix add tmdb movie 912649                   # Venom: The Last Dance (2024)
 
+run flix add tmdb movie 26623                    # Generation X (1996)
 run flix add tmdb movie 1927                     # Hulk (2003)
+run flix add tmdb movie 340102                   # The New Mutants (2020)
 run flix add tmdb movie 634492                   # Madame Web (2024)
 
 run flix add \

catalog/movies/barbie.sh

@@ -1,16 +1,7 @@
-run flix add flix collection \
+run flix add \
-	"Barbie Animated Collection" \
+	--title "Barbie Collection" \
-	"Collection of the animated films based on Mattel's Barbie."
+	--overview "Collection of the animated films based on Mattel's Barbie." \
-
+	tmdb collection 1698073
-run flix add tmdb collection 411859              # Barbie Fairytopia Collection
-run flix add tmdb movie 13284                    # Barbie: Fairytopia (2005)
-run flix add tmdb movie 13285                    # Barbie Fairytopia: Mermaidia (2006)
-run flix add tmdb movie 16962                    # Barbie Fairytopia: Magic of the Rainbow (2007)
-
-run flix add tmdb collection 447622              # Barbie Mariposa Collection
-run flix add tmdb movie 18198                    # Barbie Mariposa (2008)
-run flix add tmdb movie 196254                   # Barbie Mariposa & the Fairy Princess (2013)
-
 run flix add tmdb movie 15167                    # Barbie in the Nutcracker (2001)
 run flix add tmdb movie 15015                    # Barbie as Rapunzel (2002)
 run flix add tmdb movie 15016                    # Barbie of Swan Lake (2003)
@@ -22,4 +13,14 @@ run flix add tmdb movie 13004                    # Barbie and the Diamond Castle
 run flix add tmdb movie 13459                    # Barbie in 'A Christmas Carol' (2008)
 run flix add tmdb movie 23566                    # Barbie and the Three Musketeers (2009)
 run flix add tmdb movie 16418                    # Barbie Presents: Thumbelina (2009)
+
+run flix add tmdb collection 411859              # Barbie Fairytopia Collection
+run flix add tmdb movie 13284                    # Barbie: Fairytopia (2005)
+run flix add tmdb movie 13285                    # Barbie Fairytopia: Mermaidia (2006)
+run flix add tmdb movie 16962                    # Barbie Fairytopia: Magic of the Rainbow (2007)
+
+run flix add tmdb collection 447622              # Barbie Mariposa Collection
+run flix add tmdb movie 18198                    # Barbie Mariposa (2008)
+run flix add tmdb movie 196254                   # Barbie Mariposa & the Fairy Princess (2013)
+
 run flix add tmdb movie 21705                    # The Barbie Diaries (2006)

catalog/shows/_shows.sh

@@ -23,6 +23,7 @@ run flix add tmdb show 59186                     # Impractical Jokers (2011)
 run flix add tmdb show 62687                     # Limitless (2015)
 run flix add tmdb show 60846                     # Log Horizon (2013)
 run flix add tmdb show 64432                     # The Magicians (2015)
+run flix add tmdb show 140                       # Martin Mystery (2003)
 run flix add tmdb show 5920                      # The Mentalist (2008)
 run flix add tmdb show 12786                     # Murdoch Mysteries (2008)
 run flix add tmdb show 65930                     # My Hero Academia (2016)
@@ -43,9 +44,11 @@ run flix add tmdb show 18165                     # The Vampire Diaries (2009)
 run flix add tmdb show 1432                      # Veronica Mars (2004)
 run flix add tmdb show 186                       # Weeds (2005)
 run flix add tmdb show 63247                     # Westworld (2016)
+run flix add tmdb show 652                       # What's New, Scooby-Doo? (2002)
 run flix add tmdb show 71912                     # The Witcher (2019)
 
 # Fixups
+run flix add tmdb season 15260 0                 # Adventure Time Specials
 run flix add flix episode \
 	"brooklyn-nine-nine-2013" 8 10 \
 	"The Last Day (Part 2)" \

crates/cli-mux/Cargo.toml

@@ -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"]

crates/cli/Cargo.toml

@@ -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"]

crates/cli/src/cli/mod.rs

@@ -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,

crates/cli/src/run/tmdb.rs

@@ -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),

crates/db/Cargo.toml

@@ -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"]

crates/flix/Cargo.toml

@@ -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"]

crates/fs/Cargo.toml

@@ -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"]

crates/fs/src/scanner/collection.rs

@@ -72,7 +72,6 @@ impl From<generic::Scanner> for Scanner {
 impl Scanner {
 	/// Scan a folder for a collection.
 	#[inline]
-	#[must_use]
 	#[expect(clippy::allow_attributes, reason = "for tail_expr_drop_order")]
 	#[allow(tail_expr_drop_order, reason = "bug in stream! macro")]
 	#[expect(clippy::semicolon_if_nothing_returned, reason = "false positive")]

crates/fs/src/scanner/generic.rs

@@ -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")]

crates/model/Cargo.toml

@@ -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"]

crates/tmdb/Cargo.toml

@@ -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"]

justfile

@@ -33,7 +33,7 @@ example:
 doc *args:
 	RUSTDOCFLAGS="--cfg docsrs -D warnings" cargo +nightly doc \
 		--workspace --all-features --document-private-items \
-		--lib --bins --no-deps --locked \
+		--lib --no-deps --locked \
 		{{ args }}
 
 format:

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.98"
+channel = "1.99"