michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #8325 from nielsvanvelzen/uuid-userconfiguration

Browse Source
This commit is contained in:
Cody Robibero 2022-09-05 08:52:24 -06:00 committed by GitHub
commit 871ae39c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jellyfin.Server.Implementations/Users/UserManager.cs
View File

@ -326,10 +326,10 @@ namespace Jellyfin.Server.Implementations.Users
EnableNextEpisodeAutoPlay = user.EnableNextEpisodeAutoPlay, EnableNextEpisodeAutoPlay = user.EnableNextEpisodeAutoPlay,
RememberSubtitleSelections = user.RememberSubtitleSelections, RememberSubtitleSelections = user.RememberSubtitleSelections,
SubtitleLanguagePreference = user.SubtitleLanguagePreference ?? string.Empty, SubtitleLanguagePreference = user.SubtitleLanguagePreference ?? string.Empty,
OrderedViews = user.GetPreference(PreferenceKind.OrderedViews), OrderedViews = user.GetPreferenceValues<Guid>(PreferenceKind.OrderedViews),
GroupedFolders = user.GetPreference(PreferenceKind.GroupedFolders), GroupedFolders = user.GetPreferenceValues<Guid>(PreferenceKind.GroupedFolders),
MyMediaExcludes = user.GetPreference(PreferenceKind.MyMediaExcludes), MyMediaExcludes = user.GetPreferenceValues<Guid>(PreferenceKind.MyMediaExcludes),
LatestItemsExcludes = user.GetPreference(PreferenceKind.LatestItemExcludes) LatestItemsExcludes = user.GetPreferenceValues<Guid>(PreferenceKind.LatestItemExcludes)
}, },
Policy = new UserPolicy Policy = new UserPolicy
{ {

16
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -22,10 +22,10 @@ namespace MediaBrowser.Model.Configuration
HidePlayedInLatest = true; HidePlayedInLatest = true;
PlayDefaultAudioTrack = true; PlayDefaultAudioTrack = true;
LatestItemsExcludes = Array.Empty<string>(); LatestItemsExcludes = Array.Empty<Guid>();
OrderedViews = Array.Empty<string>(); OrderedViews = Array.Empty<Guid>();
MyMediaExcludes = Array.Empty<string>(); MyMediaExcludes = Array.Empty<Guid>();
GroupedFolders = Array.Empty<string>(); GroupedFolders = Array.Empty<Guid>();
} }
/// <summary> /// <summary>
@ -48,7 +48,7 @@ namespace MediaBrowser.Model.Configuration
public bool DisplayMissingEpisodes { get; set; } public bool DisplayMissingEpisodes { get; set; }
public string[] GroupedFolders { get; set; } public Guid[] GroupedFolders { get; set; }
public SubtitlePlaybackMode SubtitleMode { get; set; } public SubtitlePlaybackMode SubtitleMode { get; set; }
@ -56,11 +56,11 @@ namespace MediaBrowser.Model.Configuration
public bool EnableLocalPassword { get; set; } public bool EnableLocalPassword { get; set; }
public string[] OrderedViews { get; set; } public Guid[] OrderedViews { get; set; }
public string[] LatestItemsExcludes { get; set; } public Guid[] LatestItemsExcludes { get; set; }
public string[] MyMediaExcludes { get; set; } public Guid[] MyMediaExcludes { get; set; }
public bool HidePlayedInLatest { get; set; } public bool HidePlayedInLatest { get; set; }