Compare commits
3 Commits
v0.0.4-alp
...
v0.0.5-alp
| Author | SHA1 | Date | |
|---|---|---|---|
| 2c91846d81 | |||
| c533eb4f90 | |||
| 2fdbae74e8 |
@@ -1,5 +1,5 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyVersion>0.0.0.4</AssemblyVersion>
|
<AssemblyVersion>0.0.0.5</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
#pragma warning disable RS0030 // Do not use banned APIs
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Jellyfin.Database.Implementations;
|
||||||
|
using MediaBrowser.Model.Globalization;
|
||||||
|
using MediaBrowser.Model.Tasks;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.MediaCleaner.ScheduledTasks;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Task to clean up any detached userdata from the database.
|
||||||
|
/// </summary>
|
||||||
|
public class CleanupUserDataTask : IScheduledTask
|
||||||
|
{
|
||||||
|
private readonly ILocalizationManager _localization;
|
||||||
|
private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
|
||||||
|
private readonly ILogger<CleanupUserDataTask> _logger;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="CleanupUserDataTask"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="localization">The localisation Provider.</param>
|
||||||
|
/// <param name="dbProvider">The DB context factory.</param>
|
||||||
|
/// <param name="logger">A logger.</param>
|
||||||
|
public CleanupUserDataTask(ILocalizationManager localization, IDbContextFactory<JellyfinDbContext> dbProvider, ILogger<CleanupUserDataTask> logger)
|
||||||
|
{
|
||||||
|
_localization = localization;
|
||||||
|
_dbProvider = dbProvider;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public string Name => _localization.GetLocalizedString("CleanupUserDataTask");
|
||||||
|
|
||||||
|
public Guid PlaceholderId => new("00000000-0000-0000-0000-000000000001");
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public string Description => _localization.GetLocalizedString("CleanupUserDataTaskDescription");
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public string Category => _localization.GetLocalizedString("Media");
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public string Key => nameof(CleanupUserDataTask);
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var dbContext = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
await using (dbContext.ConfigureAwait(false))
|
||||||
|
{
|
||||||
|
var detachedUserData = dbContext.UserData.Where(e => e.ItemId == PlaceholderId).ToList();
|
||||||
|
_logger.LogInformation("There are {NoDetached} detached UserData entries.", detachedUserData.Count);
|
||||||
|
foreach(var userData in detachedUserData)
|
||||||
|
{
|
||||||
|
if (userData.Item != null)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Detached user data for: {UserDataName}", userData.Item.Name);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Detached user data for: {UserDataName}", userData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_logger.LogInformation("Detached user data count: {Count}.", detachedUserData.Count);
|
||||||
|
|
||||||
|
// await detachedUserData.ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
|
||||||
|
{
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -112,7 +112,7 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
_logger.LogInformation("-------------------------------------------------");
|
_logger.LogInformation("-------------------------------------------------");
|
||||||
}
|
}
|
||||||
|
|
||||||
var mostRecentUserData = movie.UserData.OrderByDescending(data => data.LastPlayedDate).First();
|
var mostRecentUserData = movie.UserData.OrderByDescending(data => data.LastPlayedDate).Where(data => data.LastPlayedDate != null).First();
|
||||||
|
|
||||||
if (Configuration.DebugMode){
|
if (Configuration.DebugMode){
|
||||||
_logger.LogInformation("Most recent user data: {Movie}", movie);
|
_logger.LogInformation("Most recent user data: {Movie}", movie);
|
||||||
@@ -217,7 +217,7 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
|
|
||||||
foreach (var episode in episodesWithUserData)
|
foreach (var episode in episodesWithUserData)
|
||||||
{
|
{
|
||||||
var mostRecentUserData = episode.UserData.OrderByDescending(data => data.LastPlayedDate).First();
|
var mostRecentUserData = episode.UserData.OrderByDescending(data => data.LastPlayedDate).Where(data => data.LastPlayedDate != null).First();
|
||||||
if(Configuration.DebugMode){
|
if(Configuration.DebugMode){
|
||||||
foreach (var property in typeof(UserData).GetProperties())
|
foreach (var property in typeof(UserData).GetProperties())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user