完善提示消息

Author: jadepeng

XMusicDownloader/Form1.cs

@@ -113,11 +113,9 @@ private void GetList(int page)
             resultListView.Items.Clear();
             toolStripStatusLabel1.Text = "搜索中...";
             List<ListViewItem> listViewItems = new List<ListViewItem>();
-          
 
 
-
-            var songs = tblSearch.SelectedIndex==0 ? provider.SearchSongs(textBox1.Text, page, 20): provider.SearchSongsList(txtSongListUrl.Text);
+            var songs = tblSearch.SelectedIndex == 0 ? provider.SearchSongs(textBox1.Text, page, 20) : provider.SearchSongsList(txtSongListUrl.Text);
 
             songs.ForEach(item =>
             {
@@ -136,6 +134,11 @@ private void GetList(int page)
 
             UpdateUI(listViewItems);
 
+            if(songs.Count == 0)
+            {
+                toolStripStatusLabel1.Text = "未找到记录";
+            }
+
         }
 
         /// <summary>
@@ -251,9 +254,7 @@ private void downBtn_Click(object sender, EventArgs e)
 
         private void timer1_Tick(object sender, EventArgs e)
         {
-
-
-            toolStripStatusLabel1.Text = "下载进度：" + (int)(downloader.totalPercent) + "%" + string.Format("，速度{0}", (downloader.totalSpeed / 1024.0 / 1024.0).ToString("F2") + "MB/s");
+            toolStripStatusLabel1.Text = "当前下载："+downloader.currentSongName+" 下载进度：" + (int)(downloader.totalPercent) + "%" + string.Format(" 下载速度：{0}", (downloader.totalSpeed / 1024.0 / 1024.0).ToString("F2") + "MB/s 排队数:" + downloader.queqeCount);
             toolStripProgressBar1.Value = (int)(downloader.totalPercent);
             if (downloader.totalPercent >= 100d)
             {

XMusicDownloader/Http/SongDownloader.cs

@@ -27,7 +27,8 @@ public SongDownloader(MusicProviders musicProviders, string target)
         MusicProviders musicProviders;
         string target;
         List<SongItemDownloader> songs = new List<SongItemDownloader>();
-
+        Queue<MergedSong> queqes = new Queue<MergedSong>();
+        int max_downloading_size = 3;
 
         public double totalPercent
         {
@@ -52,9 +53,31 @@ public double totalSpeed
             }
         }
 
+        public int queqeCount
+        {
+            get
+            {
+                return this.queqes.Count;
+            }
+        }
+
+        public string currentSongName
+        {
+            get
+            {
+                return string.Join(",", songs.Select(s => s.songName).ToList());
+            }
+        }
+
 
         public void AddDownload(MergedSong song)
         {
+            if (songs.Count >= max_downloading_size)
+            {
+                queqes.Enqueue(song);
+                return;
+            }
+
             SongItemDownloader downloader = new SongItemDownloader(musicProviders, target, song, rate);
             downloader.DownloadFinish += Downloader_DownloadFinish;
 
@@ -67,6 +90,11 @@ public void AddDownload(MergedSong song)
         private void Downloader_DownloadFinish(object sender, SongItemDownloader e)
         {
             songs.Remove(e);
+            if (songs.Count < max_downloading_size)
+            {
+                MergedSong song = queqes.Dequeue();
+                AddDownload(song);
+            }
         }
 
 
@@ -84,9 +112,18 @@ public class SongItemDownloader
         MergedSong song;
         string rate = "320";
 
+        public string songName
+        {
+            get
+            {
+                return song.name;
+            }
+        }
+
+
         public event DownloadFinishEvent DownloadFinish;
 
-        public SongItemDownloader(MusicProviders musicProviders, string target, MergedSong song,string rate)
+        public SongItemDownloader(MusicProviders musicProviders, string target, MergedSong song, string rate)
         {
             this.musicProviders = musicProviders;
             this.target = target;
@@ -117,15 +154,15 @@ public void Download()
                     try
                     {
                         client.DownloadFile(musicProviders.getDownloadUrl(item, rate), target + "\\" + item.getFileName());
-                        DownloadFinish?.Invoke(this, this);
                         break;
 
                     }
-                    catch(Exception ex)
+                    catch (Exception ex)
                     {
-                       Console.WriteLine(ex.Message);
+                        Console.WriteLine(ex.Message);
                     }
                 }
+                DownloadFinish?.Invoke(this, this);
 
             }).Start();
         }

XMusicDownloader/Http/WebClient.cs

@@ -287,7 +287,7 @@ public void DownloadFile(string URL, string fileName)
         {
             requestHeaders.Add("Connection", "close");
             SendRequestData(URL, "GET");
-            if (URL.ToLower().EndsWith("flac"))
+            if (URL.ToLower().Contains(".flac"))
             {
                 fileName = fileName.Replace(".mp3", ".flac");
             }

XMusicDownloader/Provider/MusicProviders.cs

@@ -40,18 +40,25 @@ public string getDownloadUrl(Song song)
             return type2Provider[song.source].getDownloadUrl(song);
         }
 
-        public string getDownloadUrl(Song song,string rate)
+        public string getDownloadUrl(Song song, string rate)
         {
-            return type2Provider[song.source].getDownloadUrl(song.id,rate);
+            return type2Provider[song.source].getDownloadUrl(song.id, rate);
         }
 
         public List<MergedSong> SearchSongs(string keyword, int page, int pageSize)
         {
             var songs = new List<Song>();
             Providers.AsParallel().ForAll(provider =>
             {
-                var currentSongs = provider.SearchSongs(keyword, page, pageSize);
-                songs.AddRange(currentSongs);
+                try
+                {
+                    var currentSongs = provider.SearchSongs(keyword, page, pageSize);
+                    songs.AddRange(currentSongs);
+                }
+                catch (Exception e)
+                {
+
+                }
             });
 
             // merge
@@ -65,10 +72,18 @@ public List<MergedSong> SearchSongsList(string url)
             var songs = new List<Song>();
             Providers.AsParallel().ForAll(provider =>
             {
-                if (provider.Support(url)) {
-                    var currentSongs = provider.GetSongList(url);
-                    songs.AddRange(currentSongs);
-                }  
+                try
+                {
+                    if (provider.Support(url))
+                    {
+                        var currentSongs = provider.GetSongList(url);
+                        songs.AddRange(currentSongs);
+                    }
+                }
+                catch (Exception e)
+                {
+
+                }
             });
 
             // merge