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

update shared components

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-15 21:22:22 -04:00
parent 5f1e0cf2d3
commit 233f9cb238
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1385,6 +1385,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
private QueryResult<BaseItem> GetEmbyRecordings(RecordingQuery query, User user)
{
if (user == null || (query.IsInProgress ?? false))
{
return new QueryResult<BaseItem>();
}
var folders = EmbyTV.EmbyTV.Current.GetRecordingFolders()
.SelectMany(i => i.Locations)
.Distinct(StringComparer.OrdinalIgnoreCase)
@ -1413,13 +1418,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return new QueryResult<BaseItem>();
}
if (user != null && !(query.IsInProgress ?? false))
if (_services.Count == 1)
{
var initialResult = GetEmbyRecordings(query, user);
if (initialResult.TotalRecordCount > 0)
{
return initialResult;
}
return GetEmbyRecordings(query, user);
}
await RefreshRecordings(cancellationToken).ConfigureAwait(false);

3
MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
View File

@ -41,7 +41,8 @@ namespace MediaBrowser.Server.Implementations.Notifications
string[] queries = {
"create table if not exists Notifications (Id GUID NOT NULL, UserId GUID NOT NULL, Date DATETIME NOT NULL, Name TEXT NOT NULL, Description TEXT, Url TEXT, Level TEXT NOT NULL, IsRead BOOLEAN NOT NULL, Category TEXT NOT NULL, RelatedId TEXT, PRIMARY KEY (Id, UserId))",
"create index if not exists idx_Notifications on Notifications(Id, UserId)",
"create index if not exists idx_Notifications1 on Notifications(Id)",
"create index if not exists idx_Notifications2 on Notifications(UserId)",
//pragmas
"pragma temp_store = memory",