Remove custom my_select_all

allevo · Nov 8, 2021 · 6c665da · 6c665da
1 parent dbd5584
commit 6c665da
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 296 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -20,7 +20,6 @@ extern crate log;
 mod chat_service;
 mod credential_service;
 mod models;
-mod my_select_all;
 mod web_service;
 mod ws_pool;
 

diff --git a/src/models.rs b/src/models.rs
@@ -2,7 +2,6 @@ use async_trait::async_trait;
 use futures::{Stream, StreamExt};
 use std::{collections::HashSet, fmt::Debug, pin::Pin, str::FromStr, sync::Arc};
 
-use crate::my_select_all::GetId;
 use serde::{Deserialize, Serialize};
 
 #[async_trait]
@@ -33,8 +32,8 @@ impl Stream for ReceiverStream {
         self.1.poll_next_unpin(cx)
     }
 }
-impl GetId for ReceiverStream {
-    fn get_id(&self) -> &DeviceId {
+impl ReceiverStream {
+    pub fn get_id(&self) -> &DeviceId {
         &self.0
     }
 }

diff --git a/src/my_select_all.rs b/src/my_select_all.rs
diff --git a/src/ws_pool.rs b/src/ws_pool.rs
@@ -3,25 +3,21 @@ use std::{
     sync::Arc,
 };
 
-use futures::{
-    channel::mpsc::{UnboundedReceiver, UnboundedSender},
-    lock::Mutex,
-    SinkExt, StreamExt,
-};
+use futures::{SinkExt, StreamExt, channel::mpsc::{UnboundedReceiver, UnboundedSender}, lock::Mutex, stream::{SelectAll, select_all}};
 
 use warp::{ws::Message, Error};
 
-use crate::{
-    chat_service::ChatService,
-    models::{
+use crate::{chat_service::ChatService, models::{
         AddDevice, DeviceId, Item, PublishedMessage, ReceiverStream, SendMessageInChat,
         SenderStream, WsContext,
-    },
-    my_select_all,
-};
+    }};
+
+trait GetId {
+    fn get_id(&self) -> &DeviceId;
+}
 
 pub struct WsPool {
-    incoming_streams: my_select_all::MySelectAll<ReceiverStream>,
+    incoming_streams: SelectAll<ReceiverStream>,
     devices: HashMap<DeviceId, SenderStream>,
 }
 
@@ -30,7 +26,7 @@ impl WsPool {
         let recv: Vec<ReceiverStream> =
             vec![ReceiverStream::new("".into(), Box::pin(item_receiver))];
 
-        let select_all = my_select_all::my_select_all(recv);
+        let select_all = select_all(recv);
 
         Self {
             incoming_streams: select_all,
@@ -62,7 +58,16 @@ impl WsPool {
         info!("remove device {:?}", device_id);
 
         self.devices.remove(device_id);
-        self.incoming_streams.remove_by_device_id(device_id)
+
+
+        let new = SelectAll::new();
+        let old_new = std::mem::replace(&mut self.incoming_streams, new);
+        for s in old_new {
+            if s.get_id() == device_id {
+                continue
+            }
+            self.incoming_streams.push(s);
+        }
     }
 }