github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use a more descriptive function name

Browse source
This commit is contained in:
crobibero 2020-12-13 08:15:26 -07:00
parent 8f4a4a3cc5
commit ee23d06154
12 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Emby.Server.Implementations/Library/UserViewManager.cs
View file

@ -129,12 +129,12 @@ namespace Emby.Server.Implementations.Library
if (!query.IncludeHidden) if (!query.IncludeHidden)
{ {
list = list.Where(i => !user.GetPreference<Guid>(PreferenceKind.MyMediaExcludes).Contains(i.Id)).ToList(); list = list.Where(i => !user.GetPreferenceValues<Guid>(PreferenceKind.MyMediaExcludes).Contains(i.Id)).ToList();
} }
var sorted = _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).ToList(); var sorted = _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).ToList();
var orders = user.GetPreference<Guid>(PreferenceKind.OrderedViews); var orders = user.GetPreferenceValues<Guid>(PreferenceKind.OrderedViews);
return list return list
.OrderBy(i => .OrderBy(i =>
@ -280,7 +280,7 @@ namespace Emby.Server.Implementations.Library
{ {
parents = _libraryManager.GetUserRootFolder().GetChildren(user, true) parents = _libraryManager.GetUserRootFolder().GetChildren(user, true)
.Where(i => i is Folder) .Where(i => i is Folder)
.Where(i => !user.GetPreference<Guid>(PreferenceKind.LatestItemExcludes) .Where(i => !user.GetPreferenceValues<Guid>(PreferenceKind.LatestItemExcludes)
.Contains(i.Id)) .Contains(i.Id))
.ToList(); .ToList();
} }

2
Emby.Server.Implementations/TV/TVSeriesManager.cs
View file

@ -75,7 +75,7 @@ namespace Emby.Server.Implementations.TV
{ {
parents = _libraryManager.GetUserRootFolder().GetChildren(user, true) parents = _libraryManager.GetUserRootFolder().GetChildren(user, true)
.Where(i => i is Folder) .Where(i => i is Folder)
.Where(i => !user.GetPreference<Guid>(PreferenceKind.LatestItemExcludes).Contains(i.Id)) .Where(i => !user.GetPreferenceValues<Guid>(PreferenceKind.LatestItemExcludes).Contains(i.Id))
.ToArray(); .ToArray();
} }

8
Jellyfin.Api/Controllers/ItemsController.cs
View file

@ -254,9 +254,9 @@ namespace Jellyfin.Api.Controllers
includeItemTypes = new[] { "Playlist" }; includeItemTypes = new[] { "Playlist" };
} }
var enabledChannels = user!.GetPreference<Guid>(PreferenceKind.EnabledChannels); var enabledChannels = user!.GetPreferenceValues<Guid>(PreferenceKind.EnabledChannels);
bool isInEnabledFolder = Array.IndexOf(user.GetPreference<Guid>(PreferenceKind.EnabledFolders), item.Id) != -1 bool isInEnabledFolder = Array.IndexOf(user.GetPreferenceValues<Guid>(PreferenceKind.EnabledFolders), item.Id) != -1
// Assume all folders inside an EnabledChannel are enabled // Assume all folders inside an EnabledChannel are enabled
|| Array.IndexOf(enabledChannels, item.Id) != -1 || Array.IndexOf(enabledChannels, item.Id) != -1
// Assume all items inside an EnabledChannel are enabled // Assume all items inside an EnabledChannel are enabled
@ -265,7 +265,7 @@ namespace Jellyfin.Api.Controllers
var collectionFolders = _libraryManager.GetCollectionFolders(item); var collectionFolders = _libraryManager.GetCollectionFolders(item);
foreach (var collectionFolder in collectionFolders) foreach (var collectionFolder in collectionFolders)
{ {
if (user.GetPreference<Guid>(PreferenceKind.EnabledFolders).Contains(collectionFolder.Id)) if (user.GetPreferenceValues<Guid>(PreferenceKind.EnabledFolders).Contains(collectionFolder.Id))
{ {
isInEnabledFolder = true; isInEnabledFolder = true;
} }
@ -786,7 +786,7 @@ namespace Jellyfin.Api.Controllers
var ancestorIds = Array.Empty<Guid>(); var ancestorIds = Array.Empty<Guid>();
var excludeFolderIds = user.GetPreference<Guid>(PreferenceKind.LatestItemExcludes); var excludeFolderIds = user.GetPreferenceValues<Guid>(PreferenceKind.LatestItemExcludes);
if (parentIdGuid.Equals(Guid.Empty) && excludeFolderIds.Length > 0) if (parentIdGuid.Equals(Guid.Empty) && excludeFolderIds.Length > 0)
{ {
ancestorIds = _libraryManager.GetUserRootFolder().GetChildren(user, true) ancestorIds = _libraryManager.GetUserRootFolder().GetChildren(user, true)

4
Jellyfin.Data/Entities/User.cs
View file

@ -419,7 +419,7 @@ namespace Jellyfin.Data.Entities
/// <param name="preference">The preference kind.</param> /// <param name="preference">The preference kind.</param>
/// <typeparam name="T">Type of preference.</typeparam> /// <typeparam name="T">Type of preference.</typeparam>
/// <returns>A {T} array containing the user's preference.</returns> /// <returns>A {T} array containing the user's preference.</returns>
public T[] GetPreference<T>(PreferenceKind preference) public T[] GetPreferenceValues<T>(PreferenceKind preference)
{ {
var val = Preferences.First(p => p.Kind == preference).Value; var val = Preferences.First(p => p.Kind == preference).Value;
if (string.IsNullOrEmpty(val)) if (string.IsNullOrEmpty(val))
@ -499,7 +499,7 @@ namespace Jellyfin.Data.Entities
/// <returns><c>True</c> if the folder is in the user's grouped folders.</returns> /// <returns><c>True</c> if the folder is in the user's grouped folders.</returns>
public bool IsFolderGrouped(Guid id) public bool IsFolderGrouped(Guid id)
{ {
return Array.IndexOf(GetPreference<Guid>(PreferenceKind.GroupedFolders), id) != -1; return Array.IndexOf(GetPreferenceValues<Guid>(PreferenceKind.GroupedFolders), id) != -1;
} }
private static bool IsParentalScheduleAllowed(AccessSchedule schedule, DateTime date) private static bool IsParentalScheduleAllowed(AccessSchedule schedule, DateTime date)

10
Jellyfin.Server.Implementations/Users/UserManager.cs
View file

@ -376,14 +376,14 @@ namespace Jellyfin.Server.Implementations.Users
EnablePublicSharing = user.HasPermission(PermissionKind.EnablePublicSharing), EnablePublicSharing = user.HasPermission(PermissionKind.EnablePublicSharing),
AccessSchedules = user.AccessSchedules.ToArray(), AccessSchedules = user.AccessSchedules.ToArray(),
BlockedTags = user.GetPreference(PreferenceKind.BlockedTags), BlockedTags = user.GetPreference(PreferenceKind.BlockedTags),
EnabledChannels = user.GetPreference<Guid>(PreferenceKind.EnabledChannels), EnabledChannels = user.GetPreferenceValues<Guid>(PreferenceKind.EnabledChannels),
EnabledDevices = user.GetPreference(PreferenceKind.EnabledDevices), EnabledDevices = user.GetPreference(PreferenceKind.EnabledDevices),
EnabledFolders = user.GetPreference<Guid>(PreferenceKind.EnabledFolders), EnabledFolders = user.GetPreferenceValues<Guid>(PreferenceKind.EnabledFolders),
EnableContentDeletionFromFolders = user.GetPreference(PreferenceKind.EnableContentDeletionFromFolders), EnableContentDeletionFromFolders = user.GetPreference(PreferenceKind.EnableContentDeletionFromFolders),
SyncPlayAccess = user.SyncPlayAccess, SyncPlayAccess = user.SyncPlayAccess,
BlockedChannels = user.GetPreference<Guid>(PreferenceKind.BlockedChannels), BlockedChannels = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedChannels),
BlockedMediaFolders = user.GetPreference<Guid>(PreferenceKind.BlockedMediaFolders), BlockedMediaFolders = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedMediaFolders),
BlockUnratedItems = user.GetPreference<UnratedItem>(PreferenceKind.BlockUnratedItems) BlockUnratedItems = user.GetPreferenceValues<UnratedItem>(PreferenceKind.BlockUnratedItems)
} }
}; };
} }

4
MediaBrowser.Controller/Channels/Channel.cs
View file

@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Channels
{ {
public override bool IsVisible(User user) public override bool IsVisible(User user)
{ {
var blockedChannelsPreference = user.GetPreference<Guid>(PreferenceKind.BlockedChannels); var blockedChannelsPreference = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedChannels);
if (blockedChannelsPreference.Length != 0) if (blockedChannelsPreference.Length != 0)
{ {
if (blockedChannelsPreference.Contains(Id)) if (blockedChannelsPreference.Contains(Id))
@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.Channels
else else
{ {
if (!user.HasPermission(PermissionKind.EnableAllChannels) if (!user.HasPermission(PermissionKind.EnableAllChannels)
&& !user.GetPreference<Guid>(PreferenceKind.EnabledChannels).Contains(Id)) && !user.GetPreferenceValues<Guid>(PreferenceKind.EnabledChannels).Contains(Id))
{ {
return false; return false;
} }

2
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View file

@ -120,7 +120,7 @@ namespace MediaBrowser.Controller.Entities.Audio
protected override bool GetBlockUnratedValue(User user) protected override bool GetBlockUnratedValue(User user)
{ {
return user.GetPreference<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Music); return user.GetPreferenceValues<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Music);
} }
public override UnratedItem GetBlockUnratedType() public override UnratedItem GetBlockUnratedType()

2
MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
View file

@ -145,7 +145,7 @@ namespace MediaBrowser.Controller.Entities.Audio
protected override bool GetBlockUnratedValue(User user) protected override bool GetBlockUnratedValue(User user)
{ {
return user.GetPreference<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Music); return user.GetPreferenceValues<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Music);
} }
public override UnratedItem GetBlockUnratedType() public override UnratedItem GetBlockUnratedType()

4
MediaBrowser.Controller/Entities/BaseItem.cs
View file

@ -480,7 +480,7 @@ namespace MediaBrowser.Controller.Entities
return true; return true;
} }
var allowed = user.GetPreference<Guid>(PreferenceKind.EnableContentDeletionFromFolders); var allowed = user.GetPreferenceValues<Guid>(PreferenceKind.EnableContentDeletionFromFolders);
if (SourceType == SourceType.Channel) if (SourceType == SourceType.Channel)
{ {
@ -1909,7 +1909,7 @@ namespace MediaBrowser.Controller.Entities
return false; return false;
} }
return user.GetPreference<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(GetBlockUnratedType()); return user.GetPreferenceValues<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(GetBlockUnratedType());
} }
/// <summary> /// <summary>

4
MediaBrowser.Controller/Entities/Folder.cs
View file

@ -186,7 +186,7 @@ namespace MediaBrowser.Controller.Entities
{ {
if (this is ICollectionFolder && !(this is BasePluginFolder)) if (this is ICollectionFolder && !(this is BasePluginFolder))
{ {
var blockedMediaFolders = user.GetPreference<Guid>(PreferenceKind.BlockedMediaFolders); var blockedMediaFolders = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedMediaFolders);
if (blockedMediaFolders.Length > 0) if (blockedMediaFolders.Length > 0)
{ {
if (blockedMediaFolders.Contains(Id)) if (blockedMediaFolders.Contains(Id))
@ -197,7 +197,7 @@ namespace MediaBrowser.Controller.Entities
else else
{ {
if (!user.HasPermission(PermissionKind.EnableAllFolders) if (!user.HasPermission(PermissionKind.EnableAllFolders)
&& !user.GetPreference<Guid>(PreferenceKind.EnabledFolders).Contains(Id)) && !user.GetPreferenceValues<Guid>(PreferenceKind.EnabledFolders).Contains(Id))
{ {
return false; return false;
} }

2
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View file

@ -49,7 +49,7 @@ namespace MediaBrowser.Controller.Entities.Movies
protected override bool GetBlockUnratedValue(User user) protected override bool GetBlockUnratedValue(User user)
{ {
return user.GetPreference<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Movie); return user.GetPreferenceValues<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Movie);
} }
public override double GetDefaultPrimaryImageAspectRatio() public override double GetDefaultPrimaryImageAspectRatio()

2
MediaBrowser.Controller/Entities/TV/Series.cs
View file

@ -452,7 +452,7 @@ namespace MediaBrowser.Controller.Entities.TV
protected override bool GetBlockUnratedValue(User user) protected override bool GetBlockUnratedValue(User user)
{ {
return user.GetPreference<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Series); return user.GetPreferenceValues<UnratedItem>(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Series);
} }
public override UnratedItem GetBlockUnratedType() public override UnratedItem GetBlockUnratedType()