Skip to content

chore: remove unmaintained boolinator dep #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anikettuli wants to merge 2 commits into from
Closed

chore: remove unmaintained boolinator dep #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c142e
chore: remove unmaintained boolinator dep
anikettuli Apr 20, 2026
082e3f6
chore: apply cargo fmt and sync Cargo.lock after boolinator removal
anikettuli Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ either = "1.6"
enclose = "1.1"
derivative = "2.2"
derive_more = { version = "2", features = ["from", "into", "into_iterator", "try_into", "deref"] }
boolinator = "2.4"
strum = { version = "0.27", features = ["derive"] }

lazysort = "0.2"
Expand Down
44 changes: 20 additions & 24 deletions src/models/catalog_with_filters.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::types::addon::{
};
use crate::types::profile::Profile;
use crate::types::resource::MetaItemPreview;
use boolinator::Boolinator;
use derivative::Derivative;
use itertools::Itertools;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -417,32 +416,29 @@ fn selectable_update<T: CatalogResourceAdapter>(
extra_prop.name != SKIP_EXTRA_PROP.name && !extra_prop.options.is_empty()
})
.map(|extra_prop| {
let none_option =
(!extra_prop.is_required)
.as_option()
.map(|_| SelectableExtraOption {
value: None,
selected: selected
let none_option = (!extra_prop.is_required).then(|| SelectableExtraOption {
value: None,
selected: selected
.request
.path
.extra
.iter()
.all(|extra_value| extra_value.name != extra_prop.name),
request: ResourceRequest {
base: selected.request.base.to_owned(),
path: ResourcePath {
id: manifest_catalog.id.to_owned(),
r#type: manifest_catalog.r#type.to_owned(),
resource: selected.request.path.resource.to_owned(),
extra: selected
.request
.path
.extra
.iter()
.all(|extra_value| extra_value.name != extra_prop.name),
request: ResourceRequest {
base: selected.request.base.to_owned(),
path: ResourcePath {
id: manifest_catalog.id.to_owned(),
r#type: manifest_catalog.r#type.to_owned(),
resource: selected.request.path.resource.to_owned(),
extra: selected
.request
.path
.extra
.to_owned()
.extend_one(&extra_prop, None),
},
},
});
.to_owned()
.extend_one(&extra_prop, None),
},
},
});
let options = extra_prop
.options
.iter()
Expand Down
5 changes: 2 additions & 3 deletions src/types/resource/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::{collections::HashMap, io::Write};
use tracing::trace;

use base64::Engine;
use boolinator::Boolinator;
use flate2::{
write::{ZlibDecoder, ZlibEncoder},
Compression,
Expand Down Expand Up @@ -117,9 +116,9 @@ impl Stream {
pub fn youtube(video_id: &str) -> Option<Self> {
video_id
.starts_with(YOUTUBE_ADDON_ID_PREFIX)
.as_option()
// video id is in format: yt_id:YT_CHANNEL_ID:YT_VIDEO_ID
.and_then(|_| video_id.split(':').nth(2))
.then(|| video_id.split(':').nth(2))
.flatten()
.map(|yt_id| Self {
source: StreamSource::YouTube {
yt_id: yt_id.to_owned(),
Expand Down
1 change: 0 additions & 1 deletion stremio-core-web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ hex = { version = "0.4", optional = true }
either = "1.6.*"
enclose = "1.1.*"
itertools = "0.14.*"
boolinator = "2.4.*"

# WASM
wasm-bindgen = { version = "=0.2.78", features = ["serde-serialize"], optional = true }
Expand Down
3 changes: 1 addition & 2 deletions stremio-core-web/src/model/serialize_discover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#[cfg(feature = "wasm")]
use {
crate::model::deep_links_ext::DeepLinksExt,
boolinator::Boolinator,
gloo_utils::format::JsValueSerdeExt,
itertools::Itertools,
stremio_core::deep_links::{DiscoverDeepLinks, MetaItemDeepLinks, StreamDeepLinks},
Expand Down Expand Up @@ -171,7 +170,7 @@ pub fn serialize_discover(
.collect(),
next_page: discover.selectable.next_page.is_some(),
},
catalog: (!discover.catalog.is_empty()).as_option().map(|_| {
catalog: (!discover.catalog.is_empty()).then(|| {
let first_page = discover
.catalog
.first()
Expand Down