feat: search for file name in music gallery

jayfunc · jayfunc · commit a74dc705c960 · 2025-12-09T13:02:42.000-05:00
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -70,7 +70,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
 
-            _ = new SystemTrayWindow();
+            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
 
             if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)
             {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs
@@ -26,6 +26,8 @@ public string GetRawLyrics()
                 }
                 return "";
             }
+
+            public string GetFileName() => Path.GetFileName(track.Path);
         }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs
@@ -129,6 +129,10 @@ public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)
                 {
                     window = new LyricsWindowSwitchWindow();
                 }
+                else if (typeof(T) == typeof(SystemTrayWindow))
+                {
+                    window = new SystemTrayWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));
@@ -137,8 +141,11 @@ public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)
                 TrackWindow(window);
                 var castedWindow = (Window)window;
 
-                castedWindow.Restore();
-                castedWindow.Activate();
+                if (typeof(T) != typeof(SystemTrayWindow))
+                {
+                    castedWindow.Restore();
+                    castedWindow.Activate();
+                }
 
                 if (typeof(T) == typeof(NowPlayingWindow))
                 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/FluidBackgroundRenderer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/FluidBackgroundRenderer.cs
@@ -63,14 +63,14 @@ public void Update(TimeSpan deltaTime)
 
             _timeAccumulator += (float)deltaTime.TotalSeconds;
 
-            _fluidEffect.Properties["iTime"] = _timeAccumulator;
+            _fluidEffect?.Properties["iTime"] = _timeAccumulator;
 
-            _fluidEffect.Properties["color1"] = _c1;
-            _fluidEffect.Properties["color2"] = _c2;
-            _fluidEffect.Properties["color3"] = _c3;
-            _fluidEffect.Properties["color4"] = _c4;
+            _fluidEffect?.Properties["color1"] = _c1;
+            _fluidEffect?.Properties["color2"] = _c2;
+            _fluidEffect?.Properties["color3"] = _c3;
+            _fluidEffect?.Properties["color4"] = _c4;
 
-            _fluidEffect.Properties["EnableLightWave"] = EnableLightWave;
+            _fluidEffect?.Properties["EnableLightWave"] = EnableLightWave;
         }
 
         public void Draw(ICanvasAnimatedControl control, CanvasDrawingSession ds)
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -493,7 +493,7 @@
     <value>Single loop</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>Search for song title, artist, album or folder path</value>
+    <value>Search for the song name, artist, album, file name, or folder path where the file is located</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>Album</value>
@@ -1131,6 +1131,9 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>Normal</value>
   </data>
+  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
+    <value>Font opacity</value>
+  </data>
   <data name="SettingsPageLyricsRowFactor.Header" xml:space="preserve">
     <value>Lyrics area height factor</value>
   </data>
@@ -1266,9 +1269,6 @@
   <data name="SettingsPageOpacity.Header" xml:space="preserve">
     <value>Opacity</value>
   </data>
-  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
-    <value>Font opacity</value>
-  </data>
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>Open in file explorer</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -493,7 +493,7 @@
     <value>シングルループ</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>曲名、アーティスト、アルバム、フォルダパスを検索してください</value>
+    <value>ファイルが置かれている曲名、アーティスト、アルバム、ファイル名、またはフォルダパスを検索します</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>アルバム</value>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -493,7 +493,7 @@
     <value>단일 루프</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>노래 제목, 아티스트, 앨범 또는 폴더 경로를 검색하세요</value>
+    <value>파일이 있는 노래 이름, 아티스트, 앨범, 파일 이름 또는 폴더 경로를 검색하세요</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>앨범</value>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -492,9 +492,6 @@
   <data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
     <value>单曲循环</value>
   </data>
-  <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>搜索歌曲名、艺术家、专辑或所在文件夹路径</value>
-  </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>专辑</value>
   </data>
@@ -1623,4 +1620,7 @@
   <data name="UserGuide.Content" xml:space="preserve">
     <value>使用指南</value>
   </data>
+  <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
+    <value>搜索歌曲名、艺术家、专辑、文件名或文件所在文件夹路径</value>
+  </data>
 </root>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -494,7 +494,7 @@
     <value>單曲循環</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>搜尋歌曲名稱、藝人、專輯或所在資料夾路徑</value>
+    <value>搜尋歌曲名稱、藝人、專輯、檔案名稱或檔案所在資料夾路徑</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>專輯</value>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
@@ -374,6 +374,9 @@ public void ApplySongSearchQuery()
                     t.Title.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     t.Artist.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     t.Album.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
+                    // 文件名（包含后缀）
+                    t.GetFileName().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
+                    // 文件所在文件夹的路径
                     t.GetParentFolderPath().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase)).ToList();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)`
`70`	`70`	`{`
`71`	`71`	`var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();`
`72`	`72`
`73`		`- _ = new SystemTrayWindow();`
	`73`	`+ WindowHook.OpenOrShowWindow<SystemTrayWindow>();`
`74`	`74`
`75`	`75`	`if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)`
`76`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ public string GetRawLyrics()`
`26`	`26`	`}`
`27`	`27`	`return "";`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ public string GetFileName() => Path.GetFileName(track.Path);`
`29`	`31`	`}`
`30`	`32`	`}`
`31`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,10 @@ public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)`
`129`	`129`	`{`
`130`	`130`	`window = new LyricsWindowSwitchWindow();`
`131`	`131`	`}`
	`132`	`+ else if (typeof(T) == typeof(SystemTrayWindow))`
	`133`	`+ {`
	`134`	`+ window = new SystemTrayWindow();`
	`135`	`+ }`
`132`	`136`	`else`
`133`	`137`	`{`
`134`	`138`	`throw new ArgumentException("Unsupported window type", nameof(T));`
`@@ -137,8 +141,11 @@ public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)`
`137`	`141`	`TrackWindow(window);`
`138`	`142`	`var castedWindow = (Window)window;`
`139`	`143`
`140`		`- castedWindow.Restore();`
`141`		`- castedWindow.Activate();`
	`144`	`+ if (typeof(T) != typeof(SystemTrayWindow))`
	`145`	`+ {`
	`146`	`+ castedWindow.Restore();`
	`147`	`+ castedWindow.Activate();`
	`148`	`+ }`
`142`	`149`
`143`	`150`	`if (typeof(T) == typeof(NowPlayingWindow))`
`144`	`151`	`{`
Original file line number	Diff line number	Diff line change
`@@ -374,6 +374,9 @@ public void ApplySongSearchQuery()`
`374`	`374`	`t.Title.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) \|\|`
`375`	`375`	`t.Artist.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) \|\|`
`376`	`376`	`t.Album.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) \|\|`
	`377`	`+ // 文件名（包含后缀）`
	`378`	`+ t.GetFileName().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) \|\|`
	`379`	`+ // 文件所在文件夹的路径`
`377`	`380`	`t.GetParentFolderPath().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase)).ToList();`
`378`	`381`	`}`
`379`	`382`