Fix --max-volume not working as expected (#200)

* Vastly simplified the volume change logic

Fixes: #90

* Fixed clippy complaints

* Removed code to unmute device when volume changes

Author: ErikReider

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "swayosd"
 version = "0.2.1"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "swayosd-server"

src/client/main.rs

@@ -129,16 +129,16 @@ fn parse_args(args: &ArgsClient, proxy: &ServerProxyBlocking<'_>) {
 		actions.push((ArgTypes::ScrollLock, Some(value)));
 	}
 	// Output volume
-	if let Some(value) = args.output_volume.as_deref() {
-		if let Ok(parsed) = volume_parser(false, value) {
-			actions.push(parsed);
-		}
+	if let Some(value) = args.output_volume.as_deref()
+		&& let Ok(parsed) = volume_parser(false, value)
+	{
+		actions.push(parsed);
 	}
 	// Input volume
-	if let Some(value) = args.input_volume.as_deref() {
-		if let Ok(parsed) = volume_parser(true, value) {
-			actions.push(parsed);
-		}
+	if let Some(value) = args.input_volume.as_deref()
+		&& let Ok(parsed) = volume_parser(true, value)
+	{
+		actions.push(parsed);
 	}
 	// Brightness
 	if let Some(value) = args.brightness.as_deref() {

src/input-backend/main.rs

@@ -129,14 +129,14 @@ fn event(
 				continue;
 			}
 
-			if let Some(path) = device.devnode() {
-				if let Some(path) = path.to_str() {
-					let event_info = EventInfo {
-						device_path: path.to_owned(),
-						ev_key,
-					};
-					task::spawn(call(event_info, iface_ref.clone()));
-				}
+			if let Some(path) = device.devnode()
+				&& let Some(path) = path.to_str()
+			{
+				let event_info = EventInfo {
+					device_path: path.to_owned(),
+					ev_key,
+				};
+				task::spawn(call(event_info, iface_ref.clone()));
 			}
 		}
 	}

src/mpris-backend/mod.rs

@@ -77,10 +77,10 @@ impl Playerctl {
 			PlayerctlDevice::All(players) => {
 				for player in players {
 					let icon_new = self.run_single(player);
-					if let Ok(icon_new) = icon_new {
-						if icon.is_err() {
-							icon = Ok(icon_new);
-						}
+					if let Ok(icon_new) = icon_new
+						&& icon.is_err()
+					{
+						icon = Ok(icon_new);
 					};
 					if metadata.is_none() {
 						metadata = self.get_metadata(player);
@@ -141,10 +141,10 @@ impl Playerctl {
 	fn get_metadata(&self, player: &Player) -> Option<Metadata> {
 		match self.action {
 			Next | Prev => {
-				if let Ok(track_list) = player.get_track_list() {
-					if let Some(track) = track_list.get(0) {
-						return player.get_track_metadata(track).ok();
-					}
+				if let Ok(track_list) = player.get_track_list()
+					&& let Some(track) = track_list.get(0)
+				{
+					return player.get_track_metadata(track).ok();
 				}
 				let metadata = player.get_metadata().ok()?;
 				let name1 = metadata.url()?;

src/server/application.rs

@@ -63,10 +63,10 @@ impl SwayOSDApplication {
 		};
 
 		// Apply Server Config
-		if let Some(margin) = server_config.top_margin {
-			if (0_f32..1_f32).contains(&margin) {
-				set_top_margin(margin);
-			}
+		if let Some(margin) = server_config.top_margin
+			&& (0_f32..1_f32).contains(&margin)
+		{
+			set_top_margin(margin);
 		}
 		if let Some(max_volume) = server_config.max_volume {
 			set_default_max_volume(max_volume);
@@ -363,10 +363,10 @@ impl SwayOSDApplication {
 		match get_monitor_name() {
 			Some(monitor_name) => {
 				for window in self.windows.borrow().to_owned() {
-					if let Some(monitor_connector) = window.monitor.connector() {
-						if monitor_name == monitor_connector {
-							selected_windows.push(window);
-						}
+					if let Some(monitor_connector) = window.monitor.connector()
+						&& monitor_name == monitor_connector
+					{
+						selected_windows.push(window);
 					}
 				}
 			}
@@ -578,11 +578,11 @@ impl SwayOSDApplication {
 				reset_player();
 			}
 			(ArgTypes::KbdBacklight, values) => {
-				if let Some(values) = values {
-					if let Ok((value, n_segments)) = segmented_progress_parser(&values) {
-						for window in self.choose_windows() {
-							window.changed_kbd_backlight(value, n_segments);
-						}
+				if let Some(values) = values
+					&& let Ok((value, n_segments)) = segmented_progress_parser(&values)
+				{
+					for window in self.choose_windows() {
+						window.changed_kbd_backlight(value, n_segments);
 					}
 				}
 				reset_monitor_name();
@@ -620,16 +620,16 @@ impl SwayOSDApplication {
 				reset_monitor_name();
 			}
 			(ArgTypes::CustomSegmentedProgress, values) => {
-				if let Some(values) = values {
-					if let Ok((value, n_segments)) = segmented_progress_parser(&values) {
-						for window in self.choose_windows() {
-							window.custom_segmented_progress(
-								value,
-								n_segments,
-								get_progress_text(),
-								get_icon_name().as_deref(),
-							);
-						}
+				if let Some(values) = values
+					&& let Ok((value, n_segments)) = segmented_progress_parser(&values)
+				{
+					for window in self.choose_windows() {
+						window.custom_segmented_progress(
+							value,
+							n_segments,
+							get_progress_text(),
+							get_icon_name().as_deref(),
+						);
 					}
 				}
 				reset_progress_text();