refactor: Remove some pub(super)

Author: alixinne

src/global.rs

@@ -62,20 +62,20 @@ impl Global {
             None
         };
 
-        Ok(InputSourceHandle {
-            input_source: self.0.write().await.register_input_source(name, priority),
-            global: self.clone(),
-        })
+        Ok(InputSourceHandle::new(
+            self.0.write().await.register_input_source(name, priority),
+            self.clone(),
+        ))
     }
 
     pub async fn register_muxed_source(
         &self,
         name: InputSourceName,
     ) -> Result<InputSourceHandle<MuxedMessage>, InputSourceError> {
-        Ok(InputSourceHandle {
-            input_source: self.0.write().await.register_muxed_source(name),
-            global: self.clone(),
-        })
+        Ok(InputSourceHandle::new(
+            self.0.write().await.register_muxed_source(name),
+            self.clone(),
+        ))
     }
 
     pub async fn subscribe_input(&self) -> broadcast::Receiver<InputMessage> {
@@ -130,12 +130,7 @@ impl GlobalData {
         let id = self.next_input_source_id;
         self.next_input_source_id += 1;
 
-        let input_source = Arc::new(InputSource {
-            id,
-            name,
-            priority,
-            tx: self.input_tx.clone(),
-        });
+        let input_source = Arc::new(InputSource::new(id, name, priority, self.input_tx.clone()));
 
         info!("registered new input source {}", *input_source);
 
@@ -145,7 +140,7 @@ impl GlobalData {
     }
 
     fn unregister_input_source(&mut self, source: &InputSource<InputMessage>) {
-        if let Some(is) = self.input_sources.remove(&source.id) {
+        if let Some(is) = self.input_sources.remove(&source.id()) {
             info!("unregistered input source {}", *is);
         }
     }
@@ -154,12 +149,7 @@ impl GlobalData {
         let id = self.next_muxed_source_id;
         self.next_muxed_source_id += 1;
 
-        let input_source = Arc::new(InputSource {
-            id,
-            name,
-            priority: None,
-            tx: self.muxed_tx.clone(),
-        });
+        let input_source = Arc::new(InputSource::new(id, name, None, self.muxed_tx.clone()));
 
         info!("registered new muxed source {}", *input_source);
 
@@ -169,7 +159,7 @@ impl GlobalData {
     }
 
     fn unregister_muxed_source(&mut self, source: &InputSource<MuxedMessage>) {
-        if let Some(is) = self.muxed_sources.remove(&source.id) {
+        if let Some(is) = self.muxed_sources.remove(&source.id()) {
             info!("unregistered muxed source {}", *is);
         }
     }

src/global/input_source.rs

@@ -9,13 +9,27 @@ use super::{Global, InputSourceName, Message};
 #[derive(Display)]
 #[display("`{name}` (id = {id}, priority = {priority:?})")]
 pub struct InputSource<T: Message> {
-    pub(super) id: usize,
-    pub(super) name: InputSourceName,
-    pub(super) priority: Option<i32>,
-    pub(super) tx: broadcast::Sender<T>,
+    id: usize,
+    name: InputSourceName,
+    priority: Option<i32>,
+    tx: broadcast::Sender<T>,
 }
 
 impl<T: Message> InputSource<T> {
+    pub fn new(
+        id: usize,
+        name: InputSourceName,
+        priority: Option<i32>,
+        tx: broadcast::Sender<T>,
+    ) -> Self {
+        Self {
+            id,
+            name,
+            priority,
+            tx,
+        }
+    }
+
     pub fn id(&self) -> usize {
         self.id
     }
@@ -30,8 +44,17 @@ impl<T: Message> InputSource<T> {
 }
 
 pub struct InputSourceHandle<T: Message> {
-    pub(super) input_source: Arc<InputSource<T>>,
-    pub(super) global: Global,
+    input_source: Arc<InputSource<T>>,
+    global: Global,
+}
+
+impl<T: Message> InputSourceHandle<T> {
+    pub fn new(input_source: Arc<InputSource<T>>, global: Global) -> Self {
+        Self {
+            input_source,
+            global,
+        }
+    }
 }
 
 impl<T: Message> std::ops::Deref for InputSourceHandle<T> {