From 96b7835e8fc4d1acb09f399667becac5972ee311 Mon Sep 17 00:00:00 2001 From: Zhe Fang Date: Wed, 7 Jan 2026 20:47:08 -0500 Subject: [PATCH] chores: re-structure Models folder --- .../BetterLyrics.WinUI3/App.xaml.cs | 2 +- .../Controls/DemoWindowGrid.xaml.cs | 1 + .../Controls/LyricsCanvas.xaml.cs | 1 + .../Controls/LyricsSearchControl.xaml | 7 ++++--- .../Controls/LyricsSearchControl.xaml.cs | 2 +- .../Controls/LyricsWindowSettingsControl.xaml.cs | 1 + .../Controls/MediaSettingsControl.xaml | 3 ++- .../Controls/MediaSettingsControl.xaml.cs | 1 + .../Controls/PlaybackSettingsControl.xaml | 7 ++++--- .../Controls/RemoteServerConfigControl.xaml.cs | 1 + .../Events/LyricsChangedEventArgs.cs | 2 +- .../Events/MediaSourceProvidersInfoEventArgs.cs | 1 + .../Extensions/LyricsDataExtensions.cs | 2 +- .../Extensions/SongInfoExtensions.cs | 1 + .../Helper/FolderTreeBuilder.cs | 1 + .../BetterLyrics.WinUI3/Hooks/WindowHook.cs | 1 + .../BetterLyrics.WinUI3/Logic/LyricsAnimator.cs | 2 +- .../Logic/LyricsLayoutManager.cs | 1 + .../Logic/LyricsSynchronizer.cs | 1 + .../Models/Db/FilesIndexDbContext.cs | 14 -------------- .../Models/DbContext/FilesIndexDbContext.cs | 12 ++++++++++++ .../{Db => DbContext}/LyricsCacheDbContext.cs | 4 ++-- .../{Db => DbContext}/PlayHistoryDbContext.cs | 7 ++++--- .../{Db => DbContext}/SongSearchMapDbContext.cs | 4 ++-- .../Models/{ => Entities}/FilesIndexItem.cs | 2 +- .../Models/{ => Entities}/LyricsCacheItem.cs | 0 .../{ => Entities}/MappedSongSearchQuery.cs | 0 .../Models/{ => Entities}/PlayHistoryItem.cs | 2 +- .../BetterLyrics.WinUI3/Models/ExtendedTrack.cs | 1 + .../Models/{ => Http}/CutletDockerRequest.cs | 2 +- .../Models/{ => Http}/CutletDockerResponse.cs | 2 +- .../Models/{ => Http}/LibreTranslateResponse.cs | 2 +- .../Models/{ => Lyrics}/LyricsChar.cs | 6 +++++- .../Models/{ => Lyrics}/LyricsData.cs | 2 +- .../Models/{ => Lyrics}/LyricsLine.cs | 2 +- .../Models/{ => Lyrics}/LyricsSyllable.cs | 2 +- .../Models/{ => Lyrics}/RenderLyricsChar.cs | 2 +- .../Models/{ => Lyrics}/RenderLyricsLine.cs | 2 +- .../Models/PlayerStatDisplayItem.cs | 15 --------------- .../{ => Settings}/AlbumArtSearchProviderInfo.cs | 2 +- .../{ => Settings}/LyricsSearchProviderInfo.cs | 2 +- .../Models/{ => Settings}/LyricsWindowStatus.cs | 3 +-- .../Models/{ => Settings}/MediaFolder.cs | 2 +- .../{ => Settings}/MediaSourceProviderInfo.cs | 2 +- .../Models/{ => Settings}/SongsTabInfo.cs | 2 +- .../Parsers/LyricsParser/LyricsParser.Lrc.cs | 2 +- .../Parsers/LyricsParser/LyricsParser.QrcKrc.cs | 1 + .../Parsers/LyricsParser/LyricsParser.Ttml.cs | 2 +- .../Parsers/LyricsParser/LyricsParser.cs | 1 + .../Renderer/LyricsRenderer.cs | 1 + .../Renderer/PlayingLineRenderer.cs | 1 + .../Renderer/UnplayingLineRenderer.cs | 2 +- .../Serialization/SourceGenerationContext.cs | 1 + .../AlbumArtSearchService.cs | 1 + .../FileSystemService/FileSystemService.cs | 4 +++- .../FileSystemService/IFileSystemService.cs | 2 ++ .../FileSystemService/IUnifiedFileSystem.cs | 2 +- .../FileSystemService/Providers/FTPFileSystem.cs | 2 ++ .../Providers/LocalFileSystem.cs | 2 ++ .../FileSystemService/Providers/SMBFileSystem.cs | 2 ++ .../Providers/WebDavFileSystem.cs | 2 ++ .../GSMTCService/GSMTCService.AlbumArtUpdater.cs | 1 + .../GSMTCService/GSMTCService.LyricsUpdater.cs | 1 + .../Services/GSMTCService/IGSMTCService.cs | 2 ++ .../LyricsCacheService/LyricsCacheService.cs | 2 +- .../LyricsSearchService/LyricsSearchService.cs | 2 ++ .../PlayHistoryService/IPlayHistoryService.cs | 2 +- .../PlayHistoryService/PlayHistoryService.cs | 4 ++-- .../Services/SMTCService/SMTCService.cs | 1 + .../SongSearchMapService/SongSearchMapService.cs | 2 +- .../TransliterationService.cs | 1 + .../ViewModels/LyricsSearchControlViewModel.cs | 1 + .../ViewModels/NowPlayingBarViewModel.cs | 2 +- .../ViewModels/StatsDashboardControlViewModel.cs | 2 +- .../Views/MusicGalleryPage.xaml | 3 ++- .../Views/NowPlayingWindow.xaml.cs | 1 + 76 files changed, 110 insertions(+), 79 deletions(-) delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/FilesIndexDbContext.cs rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{Db => DbContext}/LyricsCacheDbContext.cs (68%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{Db => DbContext}/PlayHistoryDbContext.cs (53%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{Db => DbContext}/SongSearchMapDbContext.cs (69%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Entities}/FilesIndexItem.cs (97%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Entities}/LyricsCacheItem.cs (100%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Entities}/MappedSongSearchQuery.cs (100%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Entities}/PlayHistoryItem.cs (96%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Http}/CutletDockerRequest.cs (80%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Http}/CutletDockerResponse.cs (81%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Http}/LibreTranslateResponse.cs (82%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Lyrics}/LyricsChar.cs (53%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Lyrics}/LyricsData.cs (96%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Lyrics}/LyricsLine.cs (93%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Lyrics}/LyricsSyllable.cs (91%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Lyrics}/RenderLyricsChar.cs (96%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Lyrics}/RenderLyricsLine.cs (99%) delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Settings}/AlbumArtSearchProviderInfo.cs (93%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Settings}/LyricsSearchProviderInfo.cs (95%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Settings}/LyricsWindowStatus.cs (99%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Settings}/MediaFolder.cs (99%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Settings}/MediaSourceProviderInfo.cs (99%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/{ => Settings}/SongsTabInfo.cs (92%) diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs index 3b23d44..5c8a80a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs @@ -1,6 +1,6 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models.Db; +using BetterLyrics.WinUI3.Models.DbContext; using BetterLyrics.WinUI3.Services.AlbumArtSearchService; using BetterLyrics.WinUI3.Services.DiscordService; using BetterLyrics.WinUI3.Services.FileSystemService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs index ae051e7..dd41999 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs @@ -1,5 +1,6 @@ using BetterLyrics.WinUI3.Hooks; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.DependencyInjection; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs index 6782661..f513b1b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs @@ -26,6 +26,7 @@ using Windows.Foundation; using Windows.Storage.Streams; using Windows.UI; using System.Numerics; +using BetterLyrics.WinUI3.Models.Lyrics; namespace BetterLyrics.WinUI3.Controls { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml index 7155d7a..f4f44b1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml @@ -8,6 +8,7 @@ xmlns:dev="using:DevWinUI" xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:local="using:BetterLyrics.WinUI3.Controls" + xmlns:lyricsmodels="using:BetterLyrics.WinUI3.Models.Lyrics" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:BetterLyrics.WinUI3.Models" xmlns:ui="using:CommunityToolkit.WinUI" @@ -242,7 +243,7 @@ - + - + - + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs index 8a2035b..3041fda 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs @@ -1,4 +1,4 @@ -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml.Controls; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs index db5af7a..38a7daa 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs @@ -1,6 +1,7 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.ViewModels; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml index 4bd28ef..1c59d03 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml @@ -10,6 +10,7 @@ xmlns:local="using:BetterLyrics.WinUI3.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:BetterLyrics.WinUI3.Models" + xmlns:settingsmodels="using:BetterLyrics.WinUI3.Models.Settings" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> @@ -50,7 +51,7 @@ ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}" SelectionMode="None"> - + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs index 356ec76..310a518 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs @@ -1,4 +1,5 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml index bce05d9..ed1f7a1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml @@ -13,6 +13,7 @@ xmlns:local="using:BetterLyrics.WinUI3.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:BetterLyrics.WinUI3.Models" + xmlns:settingsmodels="using:BetterLyrics.WinUI3.Models.Settings" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> @@ -60,7 +61,7 @@ ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}"> - + @@ -172,7 +173,7 @@ - + @@ -219,7 +220,7 @@ - + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs index 0223a80..d4c0018 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs @@ -1,6 +1,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.LocalizationService; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.DependencyInjection; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs index ae47797..1bc310e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs @@ -1,4 +1,4 @@ -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using System; namespace BetterLyrics.WinUI3.Events diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs index 2090521..de14bad 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs @@ -1,4 +1,5 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs index 0713873..0cd080a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs @@ -1,5 +1,5 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using System; using System.Collections.Generic; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs index 4f44374..f5cb0bf 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs @@ -1,4 +1,5 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; using System; using System.Globalization; using System.Security.Cryptography; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs index 45615bf..26c8587 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Collections.ObjectModel; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; public static class FolderTreeBuilder { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs index e79012a..413cc90 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs @@ -2,6 +2,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Views; using CommunityToolkit.WinUI; using Microsoft.UI.Dispatching; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs index 444f68d..bfbca72 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs @@ -1,6 +1,6 @@ using ATL; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using DevWinUI; using Microsoft.UI.Xaml; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs index 706d617..d82ee8d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs @@ -1,5 +1,6 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using Microsoft.Graphics.Canvas.UI.Xaml; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs index 773a94c..3fb0cec 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs @@ -1,4 +1,5 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs deleted file mode 100644 index 9c77bf3..0000000 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models.Db -{ - public partial class FilesIndexDbContext : DbContext - { - public FilesIndexDbContext(DbContextOptions options) : base(options) { } - - public DbSet FilesIndex { get; set; } - } -} diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/FilesIndexDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/FilesIndexDbContext.cs new file mode 100644 index 0000000..6c28216 --- /dev/null +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/FilesIndexDbContext.cs @@ -0,0 +1,12 @@ +using BetterLyrics.WinUI3.Models.Entities; +using Microsoft.EntityFrameworkCore; + +namespace BetterLyrics.WinUI3.Models.DbContext +{ + public partial class FilesIndexDbContext : Microsoft.EntityFrameworkCore.DbContext + { + public FilesIndexDbContext(DbContextOptions options) : base(options) { } + + public DbSet FilesIndex { get; set; } + } +} diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/LyricsCacheDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs similarity index 68% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/LyricsCacheDbContext.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs index 38a7ccc..a3861be 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/LyricsCacheDbContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Text; -namespace BetterLyrics.WinUI3.Models.Db +namespace BetterLyrics.WinUI3.Models.DbContext { - public partial class LyricsCacheDbContext : DbContext + public partial class LyricsCacheDbContext : Microsoft.EntityFrameworkCore.DbContext { public LyricsCacheDbContext(DbContextOptions options) : base(options) { } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/PlayHistoryDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs similarity index 53% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/PlayHistoryDbContext.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs index 1d8abe2..244c259 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/PlayHistoryDbContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs @@ -1,11 +1,12 @@ -using Microsoft.EntityFrameworkCore; +using BetterLyrics.WinUI3.Models.Entities; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Text; -namespace BetterLyrics.WinUI3.Models.Db +namespace BetterLyrics.WinUI3.Models.DbContext { - public partial class PlayHistoryDbContext : DbContext + public partial class PlayHistoryDbContext : Microsoft.EntityFrameworkCore.DbContext { public PlayHistoryDbContext(DbContextOptions options) : base(options) { } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/SongSearchMapDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs similarity index 69% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/SongSearchMapDbContext.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs index 4471f3f..bc86c59 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/SongSearchMapDbContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Text; -namespace BetterLyrics.WinUI3.Models.Db +namespace BetterLyrics.WinUI3.Models.DbContext { - public partial class SongSearchMapDbContext : DbContext + public partial class SongSearchMapDbContext : Microsoft.EntityFrameworkCore.DbContext { public DbSet SongSearchMap { get; set; } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FilesIndexItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/FilesIndexItem.cs similarity index 97% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FilesIndexItem.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/FilesIndexItem.cs index 9bcd045..5d9787c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FilesIndexItem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/FilesIndexItem.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Entities { [Index(nameof(MediaFolderId))] // 普通索引 [Index(nameof(ParentUri))] // 普通索引 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsCacheItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs similarity index 100% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsCacheItem.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/MappedSongSearchQuery.cs similarity index 100% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/MappedSongSearchQuery.cs diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayHistoryItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/PlayHistoryItem.cs similarity index 96% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayHistoryItem.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/PlayHistoryItem.cs index 028449f..1484a58 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayHistoryItem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/PlayHistoryItem.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Entities { [Index(nameof(Title))] [Index(nameof(Artist))] diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs index f6bdca1..fbb759e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs @@ -1,5 +1,6 @@ using ATL; using BetterLyrics.WinUI3.Helper; +using BetterLyrics.WinUI3.Models.Entities; using System; using System.IO; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerRequest.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerRequest.cs similarity index 80% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerRequest.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerRequest.cs index cceaf93..299b839 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerRequest.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerRequest.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Http { public class CutletDockerRequest { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerResponse.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerResponse.cs similarity index 81% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerResponse.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerResponse.cs index 17c230a..69620b2 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerResponse.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Http { public class CutletDockerResponse { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LibreTranslateResponse.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/LibreTranslateResponse.cs similarity index 82% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LibreTranslateResponse.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/LibreTranslateResponse.cs index ef7d716..c4403ee 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LibreTranslateResponse.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/LibreTranslateResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Http { public class LibreTranslateResponse { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs similarity index 53% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs index 3de965f..f2a6e36 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs @@ -2,10 +2,14 @@ using System.Collections.Generic; using System.Text; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Lyrics { public class LyricsChar { + public int StartMs { get; set; } + public int EndMs { get; set; } + public int DurationMs => EndMs - StartMs; + public string Text { get; set; } = ""; public int Index { get; set; } } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsData.cs similarity index 96% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsData.cs index 95a316a..c9d3fd6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsData.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Lyrics { public class LyricsData { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsLine.cs similarity index 93% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsLine.cs index bb5e9b3..ec097d9 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsLine.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Lyrics { public class LyricsLine { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSyllable.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsSyllable.cs similarity index 91% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSyllable.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsSyllable.cs index 8ffe291..7bac5e6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSyllable.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsSyllable.cs @@ -1,6 +1,6 @@ // 2025/6/23 by Zhe Fang -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Lyrics { public class LyricsSyllable { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsChar.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs similarity index 96% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsChar.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs index 72318b9..41d37c4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsChar.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Text; using Windows.Foundation; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Lyrics { public class RenderLyricsChar : LyricsChar { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs similarity index 99% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs index cf79a65..ab45cfa 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs @@ -13,7 +13,7 @@ using System.Windows.Documents; using Windows.Foundation; using Windows.UI; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Lyrics { public class RenderLyricsLine : LyricsLine { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs deleted file mode 100644 index f12a68c..0000000 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs +++ /dev/null @@ -1,15 +0,0 @@ -using BetterLyrics.WinUI3.Helper; -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models -{ - public class PlayerStatDisplayItem - { - public string PlayerId { get; set; } - public int PlayCount { get; set; } - - public string PlayerName => PlayerIdHelper.GetDisplayName(PlayerId); - } -} diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/AlbumArtSearchProviderInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtSearchProviderInfo.cs similarity index 93% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/AlbumArtSearchProviderInfo.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtSearchProviderInfo.cs index 45d0560..865dbfb 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/AlbumArtSearchProviderInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtSearchProviderInfo.cs @@ -3,7 +3,7 @@ using BetterLyrics.WinUI3.Enums; using CommunityToolkit.Mvvm.ComponentModel; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Settings { public partial class AlbumArtSearchProviderInfo : ObservableRecipient { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsSearchProviderInfo.cs similarity index 95% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsSearchProviderInfo.cs index 237a796..f642239 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsSearchProviderInfo.cs @@ -3,7 +3,7 @@ using BetterLyrics.WinUI3.Enums; using CommunityToolkit.Mvvm.ComponentModel; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Settings { public partial class LyricsSearchProviderInfo : ObservableRecipient { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsWindowStatus.cs similarity index 99% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsWindowStatus.cs index 5b0e6cb..6e26f65 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsWindowStatus.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.UI.Dispatching; @@ -10,7 +9,7 @@ using System.Linq; using System.Text.Json.Serialization; using Windows.Foundation; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Settings { public partial class LyricsWindowStatus : ObservableRecipient, ICloneable { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs similarity index 99% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs index 46c36de..33c563f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs @@ -8,7 +8,7 @@ using System; using System.Text.Json.Serialization; using System.Threading; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Settings { public partial class MediaFolder : ObservableRecipient { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaSourceProviderInfo.cs similarity index 99% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaSourceProviderInfo.cs index 3ca80a2..71acfdd 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaSourceProviderInfo.cs @@ -8,7 +8,7 @@ using System; using System.Linq; using System.Text.Json.Serialization; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Settings { public partial class MediaSourceProviderInfo : ObservableRecipient { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongsTabInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs similarity index 92% rename from BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongsTabInfo.cs rename to BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs index b8f1a09..fc4737a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongsTabInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs @@ -2,7 +2,7 @@ using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.ComponentModel; -namespace BetterLyrics.WinUI3.Models +namespace BetterLyrics.WinUI3.Models.Settings { public partial class SongsTabInfo : BaseViewModel { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs index 20bf0c1..7fe881c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs @@ -1,4 +1,4 @@ -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using System; using System.Collections.Generic; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs index d96ff50..c73b0f7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs @@ -1,4 +1,5 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using System.Collections.Generic; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs index cfd94e5..33044e6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs @@ -1,5 +1,5 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs index c729dec..5a2095f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs @@ -4,6 +4,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.TranslationService; using BetterLyrics.WinUI3.Services.TransliterationService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs index 4ab329a..dd37de4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs @@ -1,5 +1,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Effects; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs index 7ea4d87..48f4e3a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs @@ -1,5 +1,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Brushes; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs index 7b982c8..b9cf074 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs @@ -1,4 +1,4 @@ -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Effects; using Microsoft.Graphics.Canvas.Text; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs index 5b4ecff..ba76cbe 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs @@ -1,6 +1,7 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Http; using BetterLyrics.WinUI3.Models.Settings; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs index 0cee4a5..c296b34 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs @@ -1,6 +1,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Services.FileSystemService; using BetterLyrics.WinUI3.Services.SettingsService; using Microsoft.Extensions.Logging; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs index a6dde0a..3e41cc3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs @@ -1,7 +1,9 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Db; +using BetterLyrics.WinUI3.Models.DbContext; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.FileSystemService.Providers; using BetterLyrics.WinUI3.Services.LocalizationService; using BetterLyrics.WinUI3.Services.SettingsService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs index f2a7aed..d390e1f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs @@ -1,4 +1,6 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.FileSystemService.Providers; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs index d554088..126fb54 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs @@ -1,4 +1,4 @@ -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; using System; using System.Collections.Generic; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs index 848749f..4963e53 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs @@ -1,5 +1,7 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using FluentFTP; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs index 6c27dc6..8df48bc 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs @@ -1,5 +1,7 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using System; using System.Collections.Generic; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs index ec2cd66..41f9a3a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs @@ -1,5 +1,7 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using SMBLibrary; using SMBLibrary.Client; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs index 0d62bde..605e0b0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs @@ -1,5 +1,7 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using System; using System.Collections.Generic; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs index 1de5159..6df9ce2 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs @@ -2,6 +2,7 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.Extensions.Logging; using Microsoft.UI; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs index 7a36079..a7dcacc 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs @@ -1,6 +1,7 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Parsers.LyricsParser; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.WinUI; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/IGSMTCService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/IGSMTCService.cs index b63afa6..da13dee 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/IGSMTCService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/IGSMTCService.cs @@ -1,6 +1,8 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; +using BetterLyrics.WinUI3.Models.Settings; using Microsoft.UI.Xaml.Media.Imaging; using System; using System.ComponentModel; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs index 0226976..fae8ba7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs @@ -1,7 +1,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Db; +using BetterLyrics.WinUI3.Models.DbContext; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs index b813ce1..59552a8 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs @@ -4,6 +4,8 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Providers; using BetterLyrics.WinUI3.Services.FileSystemService; using BetterLyrics.WinUI3.Services.LyricsCacheService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs index 7d6f965..567b582 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs @@ -1,4 +1,4 @@ -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Stats; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs index db4618f..a02cf7b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs @@ -1,6 +1,6 @@ using BetterLyrics.WinUI3.Constants; -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Db; +using BetterLyrics.WinUI3.Models.DbContext; +using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Stats; using BetterLyrics.WinUI3.ViewModels; using Microsoft.EntityFrameworkCore; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs index 0203dbb..f21c67f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs @@ -3,6 +3,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.FileSystemService; using BetterLyrics.WinUI3.Services.GSMTCService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/SongSearchMapService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/SongSearchMapService.cs index 02c0a17..5b7b713 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/SongSearchMapService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/SongSearchMapService.cs @@ -1,5 +1,5 @@ using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Db; +using BetterLyrics.WinUI3.Models.DbContext; using Microsoft.EntityFrameworkCore; using System; using System.Threading.Tasks; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs index 2eba102..3c162e0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs @@ -1,4 +1,5 @@ using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Http; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Services.SettingsService; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs index ebb7621..4b79b0d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs @@ -1,6 +1,7 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Parsers.LyricsParser; using BetterLyrics.WinUI3.Services.GSMTCService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs index 1b00bdd..2a84186 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs @@ -1,6 +1,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.Services.SMTCService; using BetterLyrics.WinUI3.Views; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs index a4c390f..2216c3d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs @@ -1,6 +1,6 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Stats; using BetterLyrics.WinUI3.Services.AlbumArtSearchService; using BetterLyrics.WinUI3.Services.GSMTCService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml index 3b16cd6..5555253 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml @@ -16,6 +16,7 @@ xmlns:media="using:CommunityToolkit.WinUI.Media" xmlns:models="using:BetterLyrics.WinUI3.Models" xmlns:muxm="using:Microsoft.UI.Xaml.Media" + xmlns:settingsmodels="using:BetterLyrics.WinUI3.Models.Settings" xmlns:uc="using:BetterLyrics.WinUI3.Controls" xmlns:ui="using:CommunityToolkit.WinUI" Loaded="Page_Loaded" @@ -65,7 +66,7 @@ ItemsSource="{x:Bind ViewModel.AppSettings.StarredPlaylists, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedSongsTabInfoIndex, Mode=TwoWay}"> - + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs index f2de218..7b848b9 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs @@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.Services.SettingsService; using CommunityToolkit.Mvvm.DependencyInjection;