Merge pull request #27 from sunriseL/fix-some-bug

Fix two bugs: no sound and crash on some songs

src/player/fetch.rs

@@ -1,6 +1,6 @@
 use std::io::prelude::*;
 use futures::channel::oneshot::Sender;
-use reqwest::header::{HOST, CACHE_CONTROL, PRAGMA, HeaderMap, UPGRADE_INSECURE_REQUESTS, ACCEPT, ACCEPT_ENCODING, USER_AGENT};
+use reqwest::header::{CACHE_CONTROL, PRAGMA, HeaderMap, UPGRADE_INSECURE_REQUESTS, ACCEPT, ACCEPT_ENCODING, USER_AGENT};
 use reqwest::Method;
 use tempfile::NamedTempFile;
 
@@ -14,7 +14,6 @@ pub async fn fetch_data(url: &str, buffer: NamedTempFile, tx: Sender<String>) ->
     headers.insert(CACHE_CONTROL, "no-cache".parse().unwrap());
     headers.insert(PRAGMA, "no-cache".parse().unwrap());
     headers.insert(UPGRADE_INSECURE_REQUESTS, "1".parse().unwrap());
-    headers.insert(HOST, "m7.music.126.net".parse().unwrap());
     headers.insert(ACCEPT, "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3".parse().unwrap());
     headers.insert(ACCEPT_ENCODING, "gzip,deflate".parse().unwrap());
     headers.insert(

src/player/player.rs

@@ -36,6 +36,8 @@ pub struct Player {
     pub state: PlayerState,
     pub current: Option<Track>,
     pub sink: rodio::Sink,
+    pub stream: rodio::OutputStream,
+    pub stream_handle: rodio::OutputStreamHandle,
 }
 
 // player
@@ -57,7 +59,9 @@ impl Player {
         Player {
             state: PlayerState::Stopped,
             current: None,
-            sink: sink,
+            sink,
+            stream,
+            stream_handle,
             // endpoint: endpoint,
         }
     }
@@ -131,7 +135,7 @@ impl Player {
     pub fn start(&mut self) {
         let vol = self.sink.volume();
         self.sink.stop();
-        // self.sink = rodio::Sink::new(&self.endpoint);
+        self.sink = rodio::Sink::try_new(&self.stream_handle).unwrap();
         self.set_volume(vol);
     }