starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #452 from Bond-009/activitydb"

Browse Source 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
This commit is contained in:
Erwin de Haan
2019-01-25 21:33:58 +01:00
committed by Bond-009
parent e0315b5695
commit d1a0497f55
10 changed files with 369 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Emby.Server.Implementations/Activity/ActivityManager.cs
View File

@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Activity;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Querying;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.Activity
@@ -27,38 +26,20 @@ namespace Emby.Server.Implementations.Activity
_userManager = userManager;
}
public async Task CreateAsync(ActivityLogEntry entry)
public void Create(ActivityLogEntry entry)
{
entry.Date = DateTime.UtcNow;
await _repo.CreateAsync(entry);
_repo.Create(entry);
EntryCreated?.Invoke(this, new GenericEventArgs<ActivityLogEntry>(entry));
}
public IEnumerable<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
{
var result = _repo.GetActivityLogEntries();
var result = _repo.GetActivityLogEntries(minDate, hasUserId, startIndex, limit);
if (minDate.HasValue)
{
result = result.Where(x => x.Date >= minDate.Value);
}
if (hasUserId.HasValue)
{
result = result.Where(x => x.UserId != null && x.UserId != Guid.Empty);
}
if (startIndex.HasValue)
{
result = result.Where(x => x.Id >= startIndex.Value);
}
if (limit.HasValue)
{
result = result.Take(limit.Value);
}
// Add images for each user
foreach (var item in result)
foreach (var item in result.Items.Where(i => !i.UserId.Equals(Guid.Empty)))
{
var user = _userManager.GetUserById(item.UserId);
@@ -69,7 +50,12 @@ namespace Emby.Server.Implementations.Activity
}
}
return result.AsEnumerable();
return result;
}
public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
{
return GetActivityLogEntries(minDate, null, startIndex, limit);
}
}
}