zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-16 22:31:03 +02:00
Code Activity

fix: regression - image prefixes not handled correctly

Browse source 
Fixes #1015
This commit is contained in:
Jake Stanger 2025-05-27 11:38:08 +01:00
parent 93489d6924
commit 448f461943
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/image/provider.rs
View file

@ -175,21 +175,21 @@ impl Provider {
.map_or((None, input), |(t, n)| (Some(t), n)); .map_or((None, input), |(t, n)| (Some(t), n));
let location = match input_type { let location = match input_type {
Some(_t @ "icon") => Some(ImageLocation::Icon(input.to_string())), Some(_t @ "icon") => Some(ImageLocation::Icon(input_name.to_string())),
Some(_t @ "file") => Some(ImageLocation::Local(PathBuf::from( Some(_t @ "file") => Some(ImageLocation::Local(PathBuf::from(
input_name[2..].to_string(), input_name[2..].to_string(),
))), ))),
#[cfg(feature = "http")] #[cfg(feature = "http")]
Some(_t @ ("http" | "https")) => input.parse().ok().map(ImageLocation::Remote), Some(_t @ ("http" | "https")) => input_name.parse().ok().map(ImageLocation::Remote),
None if input.starts_with("steam_app_") => Some(ImageLocation::Steam( None if input_name.starts_with("steam_app_") => Some(ImageLocation::Steam(
input_name.chars().skip("steam_app_".len()).collect(), input_name.chars().skip("steam_app_".len()).collect(),
)), )),
None if self None if self
.icon_theme() .icon_theme()
.lookup_icon(input, size, IconLookupFlags::empty()) .lookup_icon(input_name, size, IconLookupFlags::empty())
.is_some() => .is_some() =>
{ {
Some(ImageLocation::Icon(input.to_string())) Some(ImageLocation::Icon(input_name.to_string()))
} }
Some(input_type) => { Some(input_type) => {
warn!( warn!(
@ -211,7 +211,7 @@ impl Provider {
.and_then(|input| input.icon); .and_then(|input| input.icon);
if let Some(location) = location { if let Some(location) = location {
if location == input { if location == input_name {
None None
} else { } else {
Box::pin(self.resolve_location(&location, size, recurse_depth + 1)).await? Box::pin(self.resolve_location(&location, size, recurse_depth + 1)).await?