jellyfin/jellyfin-plugin-reports
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-plugin-reports.git synced 2024-11-23 05:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compatibility update

Browse Source
This commit is contained in:
Luke Pulverenti 2018-07-07 00:43:00 -04:00
parent eda85c8d20
commit f702e83754
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EmbyReports/Api/Activities/ReportActivitiesBuilder.cs
View File

@ -6,6 +6,7 @@ using MediaBrowser.Controller.Library;
using EmbyReports.Api.Common;
using EmbyReports.Api.Data;
using EmbyReports.Api.Model;
using System;
namespace EmbyReports.Api.Activities
{
@ -166,7 +167,7 @@ namespace EmbyReports.Api.Activities
option.Header.CanGroup = false;
option.Column = (i, r) =>
{
if (!string.IsNullOrEmpty(i.UserId))
if (!i.UserId.Equals(Guid.Empty))
{
MediaBrowser.Controller.Entities.User user = _userManager.GetUserById(i.UserId);
if (user != null)
@ -190,7 +191,7 @@ namespace EmbyReports.Api.Activities
case HeaderMetadata.User:
option.Column = (i, r) =>
{
if (!string.IsNullOrEmpty(i.UserId))
if (!i.UserId.Equals(Guid.Empty))
{
MediaBrowser.Controller.Entities.User user = _userManager.GetUserById(i.UserId);
if (user != null)

3
EmbyReports/Api/Model/ReportRow.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using EmbyReports.Api.Common;
using System;
namespace EmbyReports.Api.Model
{
@ -63,6 +64,6 @@ namespace EmbyReports.Api.Model
/// <summary> Gets or sets the identifier of the user. </summary>
/// <value> The identifier of the user. </value>
public string UserId { get; set; }
public Guid UserId { get; set; }
}
}

7
EmbyReports/Api/ReportsService.cs
View File

@ -33,13 +33,12 @@ namespace EmbyReports.Api
/// <param name="libraryManager"> Manager for library. </param>
/// <param name="localization"> The localization. </param>
/// <param name="activityManager"> Manager for activity. </param>
public ReportsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization, IActivityManager activityManager, IActivityRepository repo, IHttpResultFactory resultFactory)
public ReportsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization, IActivityManager activityManager, IHttpResultFactory resultFactory)
{
_userManager = userManager;
_libraryManager = libraryManager;
_localization = localization;
_activityManager = activityManager;
_repo = repo;
_resultFactory = resultFactory;
}
@ -410,9 +409,9 @@ namespace EmbyReports.Api
QueryResult<ActivityLogEntry> queryResult;
if (request.HasQueryLimit)
queryResult = _repo.GetActivityLogEntries(minDate, request.StartIndex, request.Limit);
queryResult = _activityManager.GetActivityLogEntries(minDate, request.StartIndex, request.Limit);
else
queryResult = _repo.GetActivityLogEntries(minDate, request.StartIndex, null);
queryResult = _activityManager.GetActivityLogEntries(minDate, request.StartIndex, null);
//var queryResult = _activityManager.GetActivityLogEntries(minDate, request.StartIndex, request.Limit);
ReportActivitiesBuilder builder = new ReportActivitiesBuilder(_libraryManager, _userManager);

4
EmbyReports/EmbyReports.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <TargetFrameworks>netstandard2.0;</TargetFrameworks> <AssemblyVersion>1.0.12.0</AssemblyVersion> <FileVersion>1.0.12.0</FileVersion> </PropertyGroup>
<PropertyGroup> <TargetFrameworks>netstandard2.0;</TargetFrameworks> <AssemblyVersion>1.0.13.0</AssemblyVersion> <FileVersion>1.0.13.0</FileVersion> </PropertyGroup>
<ItemGroup>
<None Remove="Web\reports.html" />
@ -12,6 +12,6 @@
<EmbeddedResource Include="Web\reports.js" />
</ItemGroup>
<ItemGroup> <PackageReference Include="mediabrowser.server.core" Version="3.3.55-beta" /> </ItemGroup>
<ItemGroup> <PackageReference Include="mediabrowser.server.core" Version="3.3.62-beta" /> </ItemGroup>
</Project>