Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-02 21:24:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

3.0.5421

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-04 22:41:14 -05:00
parent 4a04483445
commit ccb4e58519
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,7 +763,7 @@ namespace MediaBrowser.Api.Library
if (!inherit) if (!inherit)
{ {
return null; return new List<Guid>();
} }
hasSoundtracks = item.Parents.OfType<IHasSoundtracks>().FirstOrDefault(); hasSoundtracks = item.Parents.OfType<IHasSoundtracks>().FirstOrDefault();

9
MediaBrowser.Providers/Manager/ProviderManager.cs
View File

@ -710,7 +710,7 @@ namespace MediaBrowser.Providers.Manager
// Give it a dummy path just so that it looks like a file system item // Give it a dummy path just so that it looks like a file system item
var dummy = new TItemType var dummy = new TItemType
{ {
Path = "C:\\", Path = BaseItem.GetInternalMetadataPathForId(Guid.NewGuid()),
// Dummy this up to fool the local trailer check // Dummy this up to fool the local trailer check
Parent = new Folder() Parent = new Folder()
@ -736,6 +736,8 @@ namespace MediaBrowser.Providers.Manager
} }
foreach (var provider in providers) foreach (var provider in providers)
{
try
{ {
var results = await GetSearchResults(provider, searchInfo.SearchInfo, cancellationToken).ConfigureAwait(false); var results = await GetSearchResults(provider, searchInfo.SearchInfo, cancellationToken).ConfigureAwait(false);
@ -746,6 +748,11 @@ namespace MediaBrowser.Providers.Manager
return list.Take(10); return list.Take(10);
} }
} }
catch (Exception ex)
{
// Logged at lower levels
}
}
// Nothing found // Nothing found
return new List<RemoteSearchResult>(); return new List<RemoteSearchResult>();

4
SharedVersion.cs
View File

@ -3,6 +3,6 @@
#if (DEBUG) #if (DEBUG)
[assembly: AssemblyVersion("3.0.*")] [assembly: AssemblyVersion("3.0.*")]
#else #else
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5416.0")] [assembly: AssemblyVersion("3.0.5421.0")]
#endif #endif