alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-08 08:48:48 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Apply more review suggestions

Browse Source
This commit is contained in:
Patrick Barron
2020-05-15 12:51:18 -04:00
parent 953777f1ba
commit a5dee36808
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Jellyfin.Server.Implementations/Activity/ActivityManager.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
@@ -56,7 +55,7 @@ namespace Jellyfin.Server.Implementations.Activity
{
using var dbContext = _provider.CreateContext();
var query = func(dbContext.ActivityLogs).OrderByDescending(entry => entry.DateCreated).AsQueryable();
var query = func(dbContext.ActivityLogs.OrderByDescending(entry => entry.DateCreated));
if (startIndex.HasValue)
{
@@ -69,12 +68,12 @@ namespace Jellyfin.Server.Implementations.Activity
}
// This converts the objects from the new database model to the old for compatibility with the existing API.
var list = query.AsEnumerable().Select(ConvertToOldModel).ToList();
var list = query.Select(ConvertToOldModel).ToList();
return new QueryResult<ActivityLogEntry>
{
Items = list,
TotalRecordCount = dbContext.ActivityLogs.Count()
TotalRecordCount = func(dbContext.ActivityLogs).Count()
};
}

7
Jellyfin.Server.Implementations/JellyfinDb.cs
View File

@@ -107,10 +107,11 @@ namespace Jellyfin.Server.Implementations
public override int SaveChanges()
{
foreach (var entity in ChangeTracker.Entries().Where(e => e.State == EntityState.Modified))
foreach (var saveEntity in ChangeTracker.Entries()
.Where(e => e.State == EntityState.Modified)
.OfType<ISavingChanges>())
{
var saveEntity = entity.Entity as ISavingChanges;
saveEntity?.OnSavingChanges();
saveEntity.OnSavingChanges();
}
return base.SaveChanges();

4
Jellyfin.Server.Implementations/Migrations/DesignTimeJellyfinDbFactory.cs
View File

@@ -12,9 +12,7 @@ namespace Jellyfin.Server.Implementations.Migrations
public JellyfinDb CreateDbContext(string[] args)
{
var optionsBuilder = new DbContextOptionsBuilder<JellyfinDb>();
optionsBuilder.UseSqlite(
"Data Source=jellyfin.db",
opt => opt.MigrationsAssembly("Jellyfin.Migrations"));
optionsBuilder.UseSqlite("Data Source=jellyfin.db");
return new JellyfinDb(optionsBuilder.Options);
}