Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implemented more suggestions

Browse Source
This commit is contained in:
Patrick Barron 2020-04-05 23:12:25 -04:00
parent 47ba4a84cd
commit c9da49ebaa
5 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Api/BaseApiService.cs
View File

@ -262,19 +262,23 @@ namespace MediaBrowser.Api
private T GetItemFromSlugName<T>(ILibraryManager libraryManager, string name, DtoOptions dtoOptions) private T GetItemFromSlugName<T>(ILibraryManager libraryManager, string name, DtoOptions dtoOptions)
where T : BaseItem, new() where T : BaseItem, new()
{ {
var result = (libraryManager.GetItemList(new InternalItemsQuery var result = libraryManager.GetItemList(new InternalItemsQuery
{ {
Name = name.Replace(BaseItem.SlugChar, '&'), Name = name.Replace(BaseItem.SlugChar, '&'),
IncludeItemTypes = new[] { typeof(T).Name }, IncludeItemTypes = new[] { typeof(T).Name },
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).OfType<T>().FirstOrDefault() ?? libraryManager.GetItemList(new InternalItemsQuery }).OfType<T>().FirstOrDefault();
result ??= libraryManager.GetItemList(new InternalItemsQuery
{ {
Name = name.Replace(BaseItem.SlugChar, '/'), Name = name.Replace(BaseItem.SlugChar, '/'),
IncludeItemTypes = new[] { typeof(T).Name }, IncludeItemTypes = new[] { typeof(T).Name },
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).OfType<T>().FirstOrDefault()) ?? libraryManager.GetItemList(new InternalItemsQuery }).OfType<T>().FirstOrDefault();
result ??= libraryManager.GetItemList(new InternalItemsQuery
{ {
Name = name.Replace(BaseItem.SlugChar, '?'), Name = name.Replace(BaseItem.SlugChar, '?'),
IncludeItemTypes = new[] { typeof(T).Name }, IncludeItemTypes = new[] { typeof(T).Name },

84
MediaBrowser.Api/Library/LibraryService.cs
View File

@ -388,24 +388,14 @@ namespace MediaBrowser.Api.Library
{ {
if (string.Equals(name, "TheMovieDb", StringComparison.OrdinalIgnoreCase)) if (string.Equals(name, "TheMovieDb", StringComparison.OrdinalIgnoreCase))
{ {
if (string.Equals(type, "Season", StringComparison.OrdinalIgnoreCase) return !(string.Equals(type, "Season", StringComparison.OrdinalIgnoreCase)
|| string.Equals(type, "Episode", StringComparison.OrdinalIgnoreCase) || string.Equals(type, "Episode", StringComparison.OrdinalIgnoreCase)
|| string.Equals(type, "MusicVideo", StringComparison.OrdinalIgnoreCase)) || string.Equals(type, "MusicVideo", StringComparison.OrdinalIgnoreCase));
{
return false;
}
return true;
} }
if (string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase) return string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase)
|| string.Equals(name, "TheAudioDB", StringComparison.OrdinalIgnoreCase) || string.Equals(name, "TheAudioDB", StringComparison.OrdinalIgnoreCase)
|| string.Equals(name, "MusicBrainz", StringComparison.OrdinalIgnoreCase)) || string.Equals(name, "MusicBrainz", StringComparison.OrdinalIgnoreCase);
{
return true;
}
return false;
} }
var metadataOptions = ServerConfigurationManager.Configuration.MetadataOptions var metadataOptions = ServerConfigurationManager.Configuration.MetadataOptions
@ -422,27 +412,17 @@ namespace MediaBrowser.Api.Library
{ {
if (string.Equals(name, "TheMovieDb", StringComparison.OrdinalIgnoreCase)) if (string.Equals(name, "TheMovieDb", StringComparison.OrdinalIgnoreCase))
{ {
if (string.Equals(type, "Series", StringComparison.OrdinalIgnoreCase) return !string.Equals(type, "Series", StringComparison.OrdinalIgnoreCase)
|| string.Equals(type, "Season", StringComparison.OrdinalIgnoreCase) && !string.Equals(type, "Season", StringComparison.OrdinalIgnoreCase)
|| string.Equals(type, "Episode", StringComparison.OrdinalIgnoreCase) && !string.Equals(type, "Episode", StringComparison.OrdinalIgnoreCase)
|| string.Equals(type, "MusicVideo", StringComparison.OrdinalIgnoreCase)) && !string.Equals(type, "MusicVideo", StringComparison.OrdinalIgnoreCase);
{
return false;
}
return true;
} }
if (string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase) return string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase)
|| string.Equals(name, "Screen Grabber", StringComparison.OrdinalIgnoreCase) || string.Equals(name, "Screen Grabber", StringComparison.OrdinalIgnoreCase)
|| string.Equals(name, "TheAudioDB", StringComparison.OrdinalIgnoreCase) || string.Equals(name, "TheAudioDB", StringComparison.OrdinalIgnoreCase)
|| string.Equals(name, "Emby Designs", StringComparison.OrdinalIgnoreCase) || string.Equals(name, "Emby Designs", StringComparison.OrdinalIgnoreCase)
|| string.Equals(name, "Image Extractor", StringComparison.OrdinalIgnoreCase)) || string.Equals(name, "Image Extractor", StringComparison.OrdinalIgnoreCase);
{
return true;
}
return false;
} }
var metadataOptions = ServerConfigurationManager.Configuration.MetadataOptions var metadataOptions = ServerConfigurationManager.Configuration.MetadataOptions
@ -1034,12 +1014,23 @@ namespace MediaBrowser.Api.Library
throw new ResourceNotFoundException("Item not found."); throw new ResourceNotFoundException("Item not found.");
} }
IEnumerable<BaseItem> themeItems = item.GetThemeSongs(); IEnumerable<BaseItem> themeItems;
while (!themeItems.Any() && request.InheritFromParent && item.GetParent() != null) while (true)
{ {
item = item.GetParent();
themeItems = item.GetThemeSongs(); themeItems = item.GetThemeSongs();
if (themeItems.Any() || !request.InheritFromParent)
{
break;
}
var parent = item.GetParent();
if (parent == null)
{
break;
}
item = parent;
} }
var dtoOptions = GetDtoOptions(_authContext, request); var dtoOptions = GetDtoOptions(_authContext, request);
@ -1080,12 +1071,23 @@ namespace MediaBrowser.Api.Library
throw new ResourceNotFoundException("Item not found."); throw new ResourceNotFoundException("Item not found.");
} }
IEnumerable<BaseItem> themeItems = item.GetThemeVideos(); IEnumerable<BaseItem> themeItems;
while (!themeItems.Any() && request.InheritFromParent && item.GetParent() != null) while (true)
{ {
item = item.GetParent();
themeItems = item.GetThemeVideos(); themeItems = item.GetThemeVideos();
if (themeItems.Any() || !request.InheritFromParent)
{
break;
}
var parent = item.GetParent();
if (parent == null)
{
break;
}
item = parent;
} }
var dtoOptions = GetDtoOptions(_authContext, request); var dtoOptions = GetDtoOptions(_authContext, request);

2
MediaBrowser.Api/SearchService.cs
View File

@ -310,7 +310,7 @@ namespace MediaBrowser.Api
private void SetBackdropImageInfo(SearchHint hint, BaseItem item) private void SetBackdropImageInfo(SearchHint hint, BaseItem item)
{ {
var itemWithImage = (item.HasImage(ImageType.Backdrop) ? item : null) var itemWithImage = (item.HasImage(ImageType.Backdrop) ? item : null)
?? GetParentWithImage<BaseItem>(item, ImageType.Backdrop); ?? GetParentWithImage<BaseItem>(item, ImageType.Backdrop);
if (itemWithImage != null) if (itemWithImage != null)
{ {

5
MediaBrowser.Api/System/SystemService.cs
View File

@ -168,8 +168,9 @@ namespace MediaBrowser.Api.System
.First(i => string.Equals(i.Name, request.Name, StringComparison.OrdinalIgnoreCase)); .First(i => string.Equals(i.Name, request.Name, StringComparison.OrdinalIgnoreCase));
// For older files, assume fully static // For older files, assume fully static
return ResultFactory.GetStaticFileResult(Request, file.FullName, var fileShare = file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1) ? FileShare.Read : FileShare.ReadWrite;
file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1) ? FileShare.Read : FileShare.ReadWrite);
return ResultFactory.GetStaticFileResult(Request, file.FullName, fileShare);
} }
/// <summary> /// <summary>

2
MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
View File

@ -425,7 +425,7 @@ namespace MediaBrowser.Api.UserLibrary
var val = ImageTypes; var val = ImageTypes;
return string.IsNullOrEmpty(val) return string.IsNullOrEmpty(val)
? new ImageType[] { } ? Array.Empty<ImageType>()
: val.Split(',').Select(v => Enum.Parse<ImageType>(v, true)).ToArray(); : val.Split(',').Select(v => Enum.Parse<ImageType>(v, true)).ToArray();
} }