From f3bfe3eb1a3c8b5436499a8af79b322e0264b2e2 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Mon, 14 Apr 2025 16:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=AD=8C(=E5=85=A8)SQL=E6=9F=A5?= =?UTF-8?q?=E8=A9=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewSongAlert/PrimaryForm.NewSongAlert.cs | 13 +++++++++---- .../PrimaryForm.NewSongAlertCantonese.cs | 6 ++++-- .../NewSongAlert/PrimaryForm.NewSongAlertChinese.cs | 6 ++++-- .../NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs | 7 +++++-- .../PrimaryForm.NewSongAlertJapanese.cs | 6 ++++-- .../NewSongAlert/PrimaryForm.NewSongAlertKorean.cs | 6 ++++-- .../PrimaryForm.NewSongAlertTaiwanese.cs | 6 ++++-- 7 files changed, 34 insertions(+), 16 deletions(-) diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlert.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlert.cs index effe678..b0c3170 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlert.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlert.cs @@ -80,12 +80,13 @@ namespace DualScreenDemo riYuButtonNewSong.BackgroundImage = riYuNewSongNormalBackground; hanYuButtonNewSong.BackgroundImage = hanYuNewSongNormalBackground; - int songLimit = ReadNewSongLimit(); - - guoYuSongs2 = allSongs.Where(song => song.Category == "國語") + + /*guoYuSongs2 = allSongs.Where(song => song.Category == "國語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("國語"); + var guoYuSongs2 = SearchSongs_Mysql(query); currentPage = 0; currentSongList = guoYuSongs2; totalPages = (int)Math.Ceiling((double)guoYuSongs2.Count / itemsPerPage); @@ -249,5 +250,9 @@ namespace DualScreenDemo return 100; } + private string setQueryforNewSong(string category){ + string query = $"SELECT * FROM SongLibrary WHERE `語別` = '{category}' ORDER BY `新增日期` DESC LIMIT {ReadNewSongLimit()}"; + return query; + } } } \ No newline at end of file diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertCantonese.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertCantonese.cs index b8b7cdc..af31407 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertCantonese.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertCantonese.cs @@ -13,10 +13,12 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - yueYuSongs2 = allSongs.Where(song => song.Category == "粵語") + /*yueYuSongs2 = allSongs.Where(song => song.Category == "粵語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("粵語"); + var yueYuSongs2 = SearchSongs_Mysql(query); currentPage = 0; currentSongList = yueYuSongs2; totalPages = (int)Math.Ceiling((double)yueYuSongs2.Count / itemsPerPage); diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertChinese.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertChinese.cs index 8f1d618..1c6b556 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertChinese.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertChinese.cs @@ -13,10 +13,12 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - guoYuSongs2 = allSongs.Where(song => song.Category == "國語") + /*guoYuSongs2 = allSongs.Where(song => song.Category == "國語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("國語"); + var guoYuSongs2 = SearchSongs_Mysql(query); currentPage = 0; currentSongList = guoYuSongs2; totalPages = (int)Math.Ceiling((double)guoYuSongs2.Count / itemsPerPage); diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs index 7ea7456..4a3b963 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs @@ -13,10 +13,13 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - yingWenSongs2 = allSongs.Where(song => song.Category == "英文") + /*yingWenSongs2 = allSongs.Where(song => song.Category == "英文") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("英文"); + var yingWenSongs2 = SearchSongs_Mysql(query); + currentPage = 0; currentSongList = yingWenSongs2; totalPages = (int)Math.Ceiling((double)yingWenSongs2.Count / itemsPerPage); diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertJapanese.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertJapanese.cs index 8b5c15a..9c8ba3d 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertJapanese.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertJapanese.cs @@ -13,10 +13,12 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - riYuSongs2 = allSongs.Where(song => song.Category == "日語") + /*riYuSongs2 = allSongs.Where(song => song.Category == "日語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("日語"); + var riYuSongs2 = SearchSongs_Mysql(query); currentPage = 0; currentSongList = riYuSongs2; totalPages = (int)Math.Ceiling((double)riYuSongs2.Count / itemsPerPage); diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertKorean.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertKorean.cs index 02ddde7..73bf731 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertKorean.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertKorean.cs @@ -13,10 +13,12 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - hanYuSongs2 = allSongs.Where(song => song.Category == "韓語") + /*hanYuSongs2 = allSongs.Where(song => song.Category == "韓語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("韓語"); + var hanYuSongs2 = SearchSongs_Mysql(query); currentPage = 0; currentSongList = hanYuSongs2; totalPages = (int)Math.Ceiling((double)hanYuSongs2.Count / itemsPerPage); diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertTaiwanese.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertTaiwanese.cs index 82005b6..0785c2b 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertTaiwanese.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertTaiwanese.cs @@ -13,10 +13,12 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - taiYuSongs2 = allSongs.Where(song => song.Category == "台語") + /*taiYuSongs2 = allSongs.Where(song => song.Category == "台語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) - .ToList(); + .ToList();*/ + string query = setQueryforNewSong("台語"); + var taiYuSongs2 = SearchSongs_Mysql(query); currentPage = 0; currentSongList = taiYuSongs2; totalPages = (int)Math.Ceiling((double)taiYuSongs2.Count / itemsPerPage);