Rename ChannelPayload struct to ChannelMessage

catuhana · Nov 29, 2023 · 41d4b1f · 41d4b1f
1 parent 4f6fbb2
commit 41d4b1f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/src/channel_listener.rs b/src/channel_listener.rs
@@ -1,10 +1,10 @@
 use rive_http::Client as RiveClient;
 use tokio::sync::mpsc::UnboundedReceiver;
 
-use crate::{config::StatusOptions, platforms::Track, rive::ClientExt, ChannelPayload};
+use crate::{config::StatusOptions, platforms::Track, rive::ClientExt, ChannelMessage};
 
 pub async fn listen(
-    mut rx: UnboundedReceiver<ChannelPayload>,
+    mut rx: UnboundedReceiver<ChannelMessage>,
     rive_client: RiveClient,
     status: StatusOptions,
 ) {
@@ -13,7 +13,7 @@ pub async fn listen(
     let mut previous_track: Option<Track> = None;
     while let Some(payload) = rx.recv().await {
         match payload {
-            ChannelPayload::Track(track) => {
+            ChannelMessage::Track(track) => {
                 if previous_track == track {
                     continue;
                 };
@@ -33,7 +33,7 @@ pub async fn listen(
                 rive_client.set_status(status).await;
                 previous_track = track;
             }
-            ChannelPayload::Exit(reset_status) => {
+            ChannelMessage::Exit(reset_status) => {
                 tracing::info!("stopping lure");
 
                 if reset_status {

diff --git a/src/exit_handler.rs b/src/exit_handler.rs
@@ -1,8 +1,8 @@
 use tokio::{signal, sync::mpsc::UnboundedSender};
 
-use crate::ChannelPayload;
+use crate::ChannelMessage;
 
-pub fn handle(tx: UnboundedSender<ChannelPayload>) {
+pub fn handle(tx: UnboundedSender<ChannelMessage>) {
     tracing::debug!("spawning exit signal handler");
 
     tokio::spawn(async move {
@@ -24,7 +24,7 @@ pub fn handle(tx: UnboundedSender<ChannelPayload>) {
         #[cfg(windows)]
         ctrl_c.await.expect("CTRL-C handler could not be created");
 
-        tx.send(ChannelPayload::Exit(true))
+        tx.send(ChannelMessage::Exit(true))
             .expect("CTRL-C handler could not be created");
     });
 

diff --git a/src/main.rs b/src/main.rs
@@ -1,7 +1,8 @@
 use clap::Parser;
 use confique::Config;
 use rive_models::authentication::Authentication;
-use tokio::sync;
+use tokio::sync::mpsc;
+use tracing_subscriber::EnvFilter;
 
 mod channel_listener;
 mod cli;
@@ -21,7 +22,7 @@ use crate::platforms::{Platform, Track};
 use crate::rive::ClientExt;
 
 #[derive(Clone, Debug)]
-pub enum ChannelPayload {
+pub enum ChannelMessage {
     Track(Option<Track>),
     Exit(bool),
 }
@@ -30,8 +31,7 @@ pub enum ChannelPayload {
 async fn main() -> anyhow::Result<()> {
     tracing_subscriber::fmt()
         .with_env_filter(
-            tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("lure=info")),
+            EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("lure=info")),
         )
         .init();
 
@@ -48,7 +48,7 @@ async fn main() -> anyhow::Result<()> {
                 }))
                 .load()?;
 
-            let (tx, rx) = sync::mpsc::unbounded_channel::<ChannelPayload>();
+            let (tx, rx) = mpsc::unbounded_channel::<ChannelMessage>();
 
             exit_handler::handle(tx.clone());
 
@@ -106,7 +106,7 @@ async fn main() -> anyhow::Result<()> {
             let rive_client =
                 rive_http::Client::new(Authentication::SessionToken(options.session_token));
             if rive_client.ping().await.is_err() {
-                tx.send(ChannelPayload::Exit(false))?;
+                tx.send(ChannelMessage::Exit(false))?;
             }
 
             channel_listener::listen(rx, rive_client, options.status).await;

diff --git a/src/platforms/lastfm.rs b/src/platforms/lastfm.rs
@@ -8,7 +8,7 @@ use tokio::{sync::mpsc::UnboundedSender, time};
 use super::{Platform, Track};
 
 use crate::models::lastfm;
-use crate::ChannelPayload;
+use crate::ChannelMessage;
 
 #[derive(Default)]
 pub struct LastFM {
@@ -26,7 +26,7 @@ pub trait LastFMPlatform: Platform {
 
     async fn event_loop(
         self,
-        tx: UnboundedSender<ChannelPayload>,
+        tx: UnboundedSender<ChannelMessage>,
         check_interval: u64,
     ) -> anyhow::Result<()>;
 }
@@ -37,7 +37,7 @@ impl LastFMPlatform for LastFM {
 
     async fn event_loop(
         self,
-        tx: UnboundedSender<ChannelPayload>,
+        tx: UnboundedSender<ChannelMessage>,
         check_interval: u64,
     ) -> anyhow::Result<()> {
         let mut interval = time::interval(Duration::from_secs(check_interval));
@@ -46,7 +46,7 @@ impl LastFMPlatform for LastFM {
 
             let track = self.get_current_track().await;
             match track {
-                Ok(track) => tx.send(ChannelPayload::Track(track))?,
+                Ok(track) => tx.send(ChannelMessage::Track(track))?,
                 Err(err) => tracing::error!("Last.fm API error: {err}"),
             }
         }

diff --git a/src/platforms/listenbrainz.rs b/src/platforms/listenbrainz.rs
@@ -8,7 +8,7 @@ use tokio::{sync::mpsc::UnboundedSender, time};
 use super::{Platform, Track};
 
 use crate::models::listenbrainz;
-use crate::ChannelPayload;
+use crate::ChannelMessage;
 
 #[derive(Default)]
 pub struct ListenBrainz {
@@ -20,7 +20,7 @@ pub struct ListenBrainz {
 impl ListenBrainz {
     pub async fn event_loop(
         self,
-        tx: UnboundedSender<ChannelPayload>,
+        tx: UnboundedSender<ChannelMessage>,
         check_interval: u64,
     ) -> anyhow::Result<()> {
         let mut interval = time::interval(Duration::from_secs(check_interval));
@@ -29,7 +29,7 @@ impl ListenBrainz {
 
             let track = self.get_current_track().await;
             match track {
-                Ok(track) => tx.send(ChannelPayload::Track(track))?,
+                Ok(track) => tx.send(ChannelMessage::Track(track))?,
                 Err(err) => tracing::error!("ListenBrainz API error: {err}"),
             }
         }