elmgates/BetterLyrics
1
0
Fork 0
mirror of https://github.com/jayfunc/BetterLyrics.git synced 2026-01-12 10:54:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chores: re-structure Models folder

Browse Source
This commit is contained in:
Zhe Fang
2026-01-07 20:47:08 -05:00
parent a0b6511a53
commit 96b7835e8f
76 changed files with 110 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs
View File

@@ -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
{

7
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
View File

@@ -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 @@
</interactivity:DataTriggerBehavior>
</interactivity:Interaction.Behaviors>
<Pivot.HeaderTemplate>
<DataTemplate x:DataType="models:LyricsData">
<DataTemplate x:DataType="lyricsmodels:LyricsData">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{x:Bind LanguageCode, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
<InfoBadge
@@ -254,13 +255,13 @@
</DataTemplate>
</Pivot.HeaderTemplate>
<Pivot.ItemTemplate>
<DataTemplate x:DataType="models:LyricsData">
<DataTemplate x:DataType="lyricsmodels:LyricsData">
<ListView
ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
ItemsSource="{x:Bind LyricsLines, Mode=OneWay}"
SelectionMode="None">
<ListView.ItemTemplate>
<DataTemplate x:DataType="models:LyricsLine">
<DataTemplate x:DataType="lyricsmodels:LyricsLine">
<Grid Margin="0,6" ColumnSpacing="6">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs
View File

@@ -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;

3
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
View File

@@ -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">
<ListView.ItemTemplate>
<DataTemplate x:DataType="models:MediaFolder">
<DataTemplate x:DataType="settingsmodels:MediaFolder">
<dev:SettingsExpander IsExpanded="True">
<dev:SettingsExpander.HeaderIcon>

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
View File

@@ -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;

7
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml
View File

@@ -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}">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="models:MediaSourceProviderInfo">
<DataTemplate x:DataType="settingsmodels:MediaSourceProviderInfo">
<Grid Padding="2,4" ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -172,7 +173,7 @@
<ScalarTransition />
</ListView.OpacityTransition>
<ListView.ItemTemplate>
<DataTemplate x:DataType="models:AlbumArtSearchProviderInfo">
<DataTemplate x:DataType="settingsmodels:AlbumArtSearchProviderInfo">
<dev:SettingsCard Header="{Binding Provider, Converter={StaticResource AlbumArtSearchProviderToDisplayNameConverter}, Mode=OneWay}">
<dev:SettingsCard.HeaderIcon>
<FontIcon FontFamily="Segoe UI Symbol" Glyph="&#x283F;" />
@@ -219,7 +220,7 @@
</Style>
</ListView.ItemContainerStyle>
<ListView.ItemTemplate>
<DataTemplate x:DataType="models:LyricsSearchProviderInfo">
<DataTemplate x:DataType="settingsmodels:LyricsSearchProviderInfo">
<Grid>
<dev:SettingsExpander Header="{Binding Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}, Mode=OneWay}" IsExpanded="{Binding IsMatchingThresholdOverwritten, Mode=OneWay}">
<dev:SettingsExpander.HeaderIcon>

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
View File

@@ -1,4 +1,4 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Lyrics;
using System;
namespace BetterLyrics.WinUI3.Events

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
View File

@@ -1,4 +1,5 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Settings;
using System;
using System.Collections.Generic;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs
View File

@@ -1,4 +1,5 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Entities;
using System;
using System.Globalization;
using System.Security.Cryptography;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs
View File

@@ -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
{

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs
View File

@@ -1,4 +1,5 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Lyrics;
using System;
using System.Collections.Generic;

14
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs
View File

@@ -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<FilesIndexDbContext> options) : base(options) { }
public DbSet<FilesIndexItem> FilesIndex { get; set; }
}
}

12
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/FilesIndexDbContext.cs Normal file
View File

@@ -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<FilesIndexDbContext> options) : base(options) { }
public DbSet<FilesIndexItem> FilesIndex { get; set; }
}
}

4
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/LyricsCacheDbContext.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs
View File

@@ -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<LyricsCacheDbContext> options) : base(options) { }

7
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/PlayHistoryDbContext.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs
View File

@@ -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<PlayHistoryDbContext> options) : base(options) { }

4
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/SongSearchMapDbContext.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs
View File

@@ -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<MappedSongSearchQuery> SongSearchMap { get; set; }

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FilesIndexItem.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/FilesIndexItem.cs
View File

@@ -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))] // 普通索引

0
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsCacheItem.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs
View File

0
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/MappedSongSearchQuery.cs
View File

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayHistoryItem.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/PlayHistoryItem.cs
View File

@@ -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))]

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
View File

@@ -1,5 +1,6 @@
using ATL;
using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Models.Entities;
using System;
using System.IO;
using System.Linq;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerRequest.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerRequest.cs
View File

@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace BetterLyrics.WinUI3.Models
namespace BetterLyrics.WinUI3.Models.Http
{
public class CutletDockerRequest
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerResponse.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerResponse.cs
View File

@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace BetterLyrics.WinUI3.Models
namespace BetterLyrics.WinUI3.Models.Http
{
public class CutletDockerResponse
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LibreTranslateResponse.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/LibreTranslateResponse.cs
View File

@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace BetterLyrics.WinUI3.Models
namespace BetterLyrics.WinUI3.Models.Http
{
public class LibreTranslateResponse
{

6
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs
View File

@@ -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; }
}

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsData.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsLine.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
namespace BetterLyrics.WinUI3.Models
namespace BetterLyrics.WinUI3.Models.Lyrics
{
public class LyricsLine
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSyllable.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsSyllable.cs
View File

@@ -1,6 +1,6 @@
// 2025/6/23 by Zhe Fang
namespace BetterLyrics.WinUI3.Models
namespace BetterLyrics.WinUI3.Models.Lyrics
{
public class LyricsSyllable
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsChar.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs
View File

@@ -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
{

15
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs
View File

@@ -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);
}
}

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/AlbumArtSearchProviderInfo.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtSearchProviderInfo.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsSearchProviderInfo.cs
View File

@@ -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
{

3
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsWindowStatus.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaSourceProviderInfo.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongsTabInfo.cs → BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs
View File

@@ -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
{

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs
View File

@@ -1,4 +1,4 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Lyrics;
using System;
using System.Collections.Generic;
using System.Linq;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs
View File

@@ -1,4 +1,5 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Lyrics;
using System.Collections.Generic;
using System.Linq;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
View File

@@ -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;

4
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
View File

@@ -1,4 +1,4 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Entities;
using System;
using System.Collections.Generic;
using System.IO;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/IGSMTCService.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs
View File

@@ -1,4 +1,4 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Entities;
using BetterLyrics.WinUI3.Models.Stats;
using System;
using System.Collections.Generic;

4
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/SongSearchMapService.cs
View File

@@ -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;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs
View File

@@ -1,4 +1,5 @@
using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Models.Http;
using BetterLyrics.WinUI3.Serialization;
using BetterLyrics.WinUI3.Services.SettingsService;
using System;

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs
View File

@@ -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;

2
BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs
View File

@@ -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;

3
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
View File

@@ -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}">
<ListView.ItemTemplate>
<DataTemplate x:DataType="models:SongsTabInfo">
<DataTemplate x:DataType="settingsmodels:SongsTabInfo">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />

1
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
View File

@@ -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;