Compare commits
14 Commits
v0.0.10-al
...
d73153ad37
| Author | SHA1 | Date | |
|---|---|---|---|
| d73153ad37 | |||
| 1a4d1145b3 | |||
| 1bd4935232 | |||
| 984db9e089 | |||
| e77f7dcd5f | |||
| 669f59db15 | |||
| a69f9df4e1 | |||
| e99ce96563 | |||
| 56403b5722 | |||
| ebe24e2630 | |||
| 04ef815a9b | |||
| 66716a9bc9 | |||
| 9bddc59fe2 | |||
| 82441d5247 |
@@ -1,5 +1,5 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyVersion>0.0.0.9</AssemblyVersion>
|
<AssemblyVersion>0.0.0.11</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,22 +1,32 @@
|
|||||||
using Jellyfin.Plugin.MediaCleaner.Data;
|
using Jellyfin.Plugin.MediaCleaner.Data;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner;
|
||||||
using Jellyfin.Plugin.MediaCleaner.Models;
|
using Jellyfin.Plugin.MediaCleaner.Models;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner.Configuration;
|
||||||
|
|
||||||
namespace Jellyfin.Plugin.MediaCleaner.Controllers;
|
namespace Jellyfin.Plugin.MediaCleaner.Controllers;
|
||||||
|
|
||||||
[Route("mediacleaner/state")]
|
[Route("mediacleaner/state")]
|
||||||
public class StateController : Controller
|
public class StateController(MediaCleanerState state) : Controller
|
||||||
{
|
{
|
||||||
private readonly PluginState _state;
|
private readonly MediaCleanerState _state = state;
|
||||||
public StateController(PluginState state) => _state = state;
|
private static PluginConfiguration Configuration =>
|
||||||
|
Plugin.Instance!.Configuration;
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet("getSeriesInfo")]
|
||||||
public IActionResult Get() => Ok(_state.GetSeriesInfo());
|
public IActionResult GetSeriesInfo() => Ok(_state.GetSeriesInfo());
|
||||||
|
|
||||||
[HttpPost("add")]
|
[HttpGet("getMovieInfo")]
|
||||||
public IActionResult AddSeriesInfo([FromBody] SeriesInfo seriesInfo)
|
public IActionResult GetMovieInfo() => Ok(_state.GetMovieInfo());
|
||||||
{
|
|
||||||
_state.AddSeriesInfo(seriesInfo);
|
[HttpGet("updateState")]
|
||||||
return Ok();
|
public IActionResult GetUpdateState() => Ok(_state.UpdateState());
|
||||||
}
|
|
||||||
|
[HttpGet("getMoviesTitle")]
|
||||||
|
public IActionResult GetMoviesTitle() =>
|
||||||
|
Ok($"Stale Movies (Unwatched for and created over {Configuration.StaleMediaCutoff} Days ago.)");
|
||||||
|
|
||||||
|
[HttpGet("getSeriesTitle")]
|
||||||
|
public IActionResult GetSeriesTitle() =>
|
||||||
|
Ok($"Stale Series (Unwatched for and created over {Configuration.StaleMediaCutoff} Days ago.)");
|
||||||
}
|
}
|
||||||
|
|||||||
42
Jellyfin.Plugin.MediaCleaner/Data/MediaCleanerState.cs
Normal file
42
Jellyfin.Plugin.MediaCleaner/Data/MediaCleanerState.cs
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Jellyfin.Database.Implementations.ModelConfiguration;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner.Models;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner.ScheduledTasks;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.MediaCleaner.Data;
|
||||||
|
|
||||||
|
public class MediaCleanerState(ILogger<StaleMediaScanner> logger, ILibraryManager libraryManager)
|
||||||
|
{
|
||||||
|
private readonly Lock _lock = new();
|
||||||
|
private IEnumerable<MediaInfo> _mediaInfo = [];
|
||||||
|
private readonly StaleMediaScanner _staleMediaScanner = new(logger, libraryManager);
|
||||||
|
|
||||||
|
public async Task UpdateState()
|
||||||
|
{
|
||||||
|
_mediaInfo = await _staleMediaScanner.ScanStaleMedia().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<SeriesInfo> GetSeriesInfo()
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
return _mediaInfo.OfType<SeriesInfo>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<MovieInfo> GetMovieInfo()
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
return _mediaInfo.OfType<MovieInfo>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using Jellyfin.Plugin.MediaCleaner.Models;
|
|
||||||
|
|
||||||
namespace Jellyfin.Plugin.MediaCleaner.Data;
|
|
||||||
|
|
||||||
public class PluginState
|
|
||||||
{
|
|
||||||
private readonly object _lock = new();
|
|
||||||
private List<SeriesInfo> _seriesInfo = new List<SeriesInfo>
|
|
||||||
{
|
|
||||||
new SeriesInfo { SeriesName = "TestName", Id = System.Guid.NewGuid() }
|
|
||||||
};
|
|
||||||
|
|
||||||
public void AddSeriesInfo(SeriesInfo seriesInfo)
|
|
||||||
{
|
|
||||||
lock (_lock)
|
|
||||||
{
|
|
||||||
_seriesInfo.Add(seriesInfo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<SeriesInfo> GetSeriesInfo()
|
|
||||||
{
|
|
||||||
lock (_lock)
|
|
||||||
{
|
|
||||||
return _seriesInfo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,10 @@ public class MovieHelper(ILogger logger)
|
|||||||
|
|
||||||
public bool IsMovieStale(BaseItem movie)
|
public bool IsMovieStale(BaseItem movie)
|
||||||
{
|
{
|
||||||
_loggingHelper.LogDebugInformation("Start of scanning for movie: {Movie}", movie);
|
ArgumentNullException.ThrowIfNull(movie, "IsMovieStale process recieved a null movie. Logic failure. Exception thrown.");
|
||||||
|
|
||||||
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
|
_loggingHelper.LogDebugInformation("Scanning movie: {Movie}", movie);
|
||||||
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
|
|
||||||
bool movieIsStale = false;
|
bool movieIsStale = false;
|
||||||
@@ -47,13 +50,20 @@ public class MovieHelper(ILogger logger)
|
|||||||
movieIsStale = true;
|
movieIsStale = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (createdOutsideCutoff)
|
|
||||||
|
if (createdOutsideCutoff && !hasUserData)
|
||||||
{
|
{
|
||||||
_loggingHelper.LogDebugInformation("Movie has no user data and was created outside of cutoff: {DateCreated}.", movie.DateCreated);
|
_loggingHelper.LogDebugInformation("Movie has no user data and was created outside of cutoff: {DateCreated}.", movie.DateCreated);
|
||||||
_loggingHelper.LogDebugInformation("Adding {Movie} to stale movies.", movie);
|
_loggingHelper.LogDebugInformation("Adding {Movie} to stale movies.", movie);
|
||||||
movieIsStale = true;
|
movieIsStale = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!createdOutsideCutoff && !hasUserData)
|
||||||
|
{
|
||||||
|
_loggingHelper.LogDebugInformation("Movie has no user data and was not created outside of cutoff: {DateCreated}.", movie.DateCreated);
|
||||||
|
_loggingHelper.LogDebugInformation("Movie is not stale.");
|
||||||
|
}
|
||||||
|
|
||||||
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogDebugInformation("End of scanning for movie: {Movie}", movie);
|
_loggingHelper.LogDebugInformation("End of scanning for movie: {Movie}", movie);
|
||||||
|
|
||||||
|
|||||||
@@ -69,10 +69,7 @@ public class SeriesHelper(ILogger logger)
|
|||||||
|
|
||||||
public bool IsSeasonDataStale(IReadOnlyList<BaseItem> episodes)
|
public bool IsSeasonDataStale(IReadOnlyList<BaseItem> episodes)
|
||||||
{
|
{
|
||||||
if(episodes == null)
|
ArgumentNullException.ThrowIfNull(episodes, "IsSeasonDataStale process recieved null episodes. Logic failure. Exception thrown.");
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(episodes);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool seasonIsStale = false;
|
bool seasonIsStale = false;
|
||||||
|
|
||||||
|
|||||||
9
Jellyfin.Plugin.MediaCleaner/Models/MediaInfo.cs
Normal file
9
Jellyfin.Plugin.MediaCleaner/Models/MediaInfo.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.MediaCleaner.Models;
|
||||||
|
|
||||||
|
public abstract class MediaInfo
|
||||||
|
{
|
||||||
|
public required Guid Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
}
|
||||||
14
Jellyfin.Plugin.MediaCleaner/Models/MovieInfo.cs
Normal file
14
Jellyfin.Plugin.MediaCleaner/Models/MovieInfo.cs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner;
|
||||||
|
|
||||||
|
namespace Jellyfin.Plugin.MediaCleaner.Models;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Contains Movie information.
|
||||||
|
/// </summary>
|
||||||
|
public class MovieInfo : MediaInfo
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,26 +1,14 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner;
|
||||||
|
|
||||||
namespace Jellyfin.Plugin.MediaCleaner.Models;
|
namespace Jellyfin.Plugin.MediaCleaner.Models;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Contains series information.
|
/// Contains series information.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SeriesInfo
|
public class SeriesInfo : MediaInfo
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets series identifier.
|
|
||||||
/// </summary>
|
|
||||||
public Guid Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets series name.
|
|
||||||
/// </summary>
|
|
||||||
public string SeriesName { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets seasons.
|
|
||||||
/// </summary>
|
|
||||||
public IEnumerable<string> Seasons { get; set; } = [];
|
public IEnumerable<string> Seasons { get; set; } = [];
|
||||||
}
|
}
|
||||||
|
|||||||
27
Jellyfin.Plugin.MediaCleaner/Pages/home.css
Normal file
27
Jellyfin.Plugin.MediaCleaner/Pages/home.css
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
table {
|
||||||
|
border: 1px solid;
|
||||||
|
border-collapse: collapse;
|
||||||
|
}
|
||||||
|
|
||||||
|
td, th {
|
||||||
|
border: 1px solid;
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.links {
|
||||||
|
background-color: #0f0f0f;
|
||||||
|
border: 1px solid;
|
||||||
|
padding: 0.8rem 1.8rem;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
color: #ffffff;
|
||||||
|
text-decoration: none;
|
||||||
|
cursor: pointer;
|
||||||
|
line-height: inherit;
|
||||||
|
vertical-align: baseline;
|
||||||
|
transition: background-color 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.links:hover {
|
||||||
|
background-color: #2a2a2a;
|
||||||
|
}
|
||||||
@@ -1,17 +1,32 @@
|
|||||||
<div data-role="page" class="page type-interior pluginConfigurationPage withTabs"
|
<div data-role="page" class="page type-interior pluginConfigurationPage"
|
||||||
data-controller="__plugin/media_cleaner_table.js">
|
data-controller="__plugin/home.js">
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="content-primary">
|
<div class="content-primary">
|
||||||
<div>
|
<link rel="stylesheet" href="/web/configurationpage?name=home.css" />
|
||||||
<a href="#configurationpage?name=Home">Home</a>
|
<div id="loading">Loading...</div>
|
||||||
<a href="#configurationpage?name=Settings">Settings</a>
|
<div id="homepage" style="visibility: hidden;">
|
||||||
</div>
|
<button class="links" data-target="configurationpage?name=Settings">Settings</button>
|
||||||
<h2>Media Cleaner</h2>
|
<h2>Media Cleaner</h2>
|
||||||
|
|
||||||
|
<h3 id="moviesTitle"></h3>
|
||||||
|
<table id="moviesTable">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Name</th>
|
||||||
|
<th class="actions-cell">Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody></tbody>
|
||||||
|
</table>
|
||||||
|
<br>
|
||||||
|
|
||||||
|
<h3 id="seriesTitle"></h3>
|
||||||
<table id="seriesTable">
|
<table id="seriesTable">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>ID</th>
|
<th>Name</th>
|
||||||
<th>Series Name</th>
|
<th>Seasons</th>
|
||||||
|
<th class="actions-cell">Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody></tbody>
|
<tbody></tbody>
|
||||||
@@ -19,3 +34,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
137
Jellyfin.Plugin.MediaCleaner/Pages/home.js
Normal file
137
Jellyfin.Plugin.MediaCleaner/Pages/home.js
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
document.addEventListener('pageshow', async () => {
|
||||||
|
await updateMediaCleanerState();
|
||||||
|
|
||||||
|
var moviesTitle = document.getElementById("moviesTitle");
|
||||||
|
var seriesTitle = document.getElementById("seriesTitle");
|
||||||
|
|
||||||
|
moviesTitle.innerHTML = await getMediaCleanerMoviesTitle();
|
||||||
|
seriesTitle.innerHTML = await getMediaCleanerSeriesTitle();
|
||||||
|
|
||||||
|
await populateTables();
|
||||||
|
addClickHandlersToLinks();
|
||||||
|
finishLoading();
|
||||||
|
});
|
||||||
|
|
||||||
|
const getMediaCleanerSeriesInfo = async () => {
|
||||||
|
const response = await fetch("/mediacleaner/state/getSeriesInfo");
|
||||||
|
|
||||||
|
if(!response.ok){
|
||||||
|
throw new Error(`Response status: ${response.status}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const getMediaCleanerMovieInfo = async () => {
|
||||||
|
const response = await fetch("/mediacleaner/state/getMovieInfo");
|
||||||
|
|
||||||
|
if(!response.ok){
|
||||||
|
throw new Error(`Response status: ${response.status}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateMediaCleanerState = async () => {
|
||||||
|
const response = await fetch("/mediacleaner/state/updateState");
|
||||||
|
|
||||||
|
if(!response.ok){
|
||||||
|
throw new Error(`Response status: ${response.status}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const getMediaCleanerSeriesTitle = async () => {
|
||||||
|
const response = await fetch("/mediacleaner/state/getSeriesTitle");
|
||||||
|
|
||||||
|
if(!response.ok){
|
||||||
|
throw new Error(`Response status: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const getMediaCleanerMoviesTitle = async () => {
|
||||||
|
const response = await fetch("/mediacleaner/state/getMoviesTitle");
|
||||||
|
|
||||||
|
if(!response.ok){
|
||||||
|
throw new Error(`Response status: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const populateTables = async () => {
|
||||||
|
var moviesInfo = await getMediaCleanerMovieInfo();
|
||||||
|
var seriesInfo = await getMediaCleanerSeriesInfo();
|
||||||
|
|
||||||
|
var seriesTableBody = seriesTable.getElementsByTagName('tbody')[0];
|
||||||
|
seriesTableBody.replaceChildren();
|
||||||
|
|
||||||
|
var moviesTableBody = moviesTable.getElementsByTagName('tbody')[0];
|
||||||
|
moviesTableBody.replaceChildren();
|
||||||
|
|
||||||
|
if (moviesInfo.length > 0){
|
||||||
|
for(let i = 0; i < moviesInfo.length; i++){
|
||||||
|
var row = moviesTableBody.insertRow(-1);
|
||||||
|
var cell1 = row.insertCell(0);
|
||||||
|
var cell2 = row.insertCell(1);
|
||||||
|
cell1.innerHTML = moviesInfo[i].Name;
|
||||||
|
// Will need to be enabled once radarr and sonarr integration is enabled.
|
||||||
|
// Maybe change this to an element to remove hard coding.
|
||||||
|
cell2.innerHTML = "<button type=\"button\" disabled>Delete</button>";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
var columnCount = moviesTable.tHead.rows[0].cells.length;
|
||||||
|
var row = moviesTableBody.insertRow(-1);
|
||||||
|
var cell1 = row.insertCell(0);
|
||||||
|
cell1.colSpan = columnCount;
|
||||||
|
cell1.innerHTML = "No stale movies found.";
|
||||||
|
}
|
||||||
|
|
||||||
|
if(seriesInfo.length > 0){
|
||||||
|
for(let i = 0; i < seriesInfo.length; i++){
|
||||||
|
var row = seriesTableBody.insertRow(-1);
|
||||||
|
var cell1 = row.insertCell(0);
|
||||||
|
var cell2 = row.insertCell(1);
|
||||||
|
var cell3 = row.insertCell(2);
|
||||||
|
cell1.innerHTML = seriesInfo[i].Name;
|
||||||
|
cell2.innerHTML = seriesInfo[i].Seasons.map(season => season.replace("Season ", "")).join(", ");
|
||||||
|
// Will need to be enabled once radarr and sonarr integration is enabled.
|
||||||
|
// Maybe change this to an element to remove hard coding.
|
||||||
|
cell3.innerHTML = "<button type=\"button\" disabled>Delete</button>";
|
||||||
|
cell3.className = "actions-cell";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
var columnCount = seriesTable.tHead.rows[0].cells.length;
|
||||||
|
var row = seriesTableBody.insertRow(-1);
|
||||||
|
var cell1 = row.insertCell(0);
|
||||||
|
cell1.colSpan = columnCount;
|
||||||
|
cell1.innerHTML = "No stale series found.";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const addClickHandlersToLinks = () => {
|
||||||
|
const linkbtns = document.querySelectorAll("button.links")
|
||||||
|
linkbtns.forEach(btn => {
|
||||||
|
btn.addEventListener("click", () => {
|
||||||
|
const target = btn.dataset.target;
|
||||||
|
if (!target) return;
|
||||||
|
window.location.hash = target;
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const finishLoading = () => {
|
||||||
|
const loadingElement = document.getElementById("loading");
|
||||||
|
|
||||||
|
const homepage = document.getElementById("homepage");
|
||||||
|
loadingElement.style.visibility = "hidden";
|
||||||
|
homepage.style.visibility = "visible";
|
||||||
|
|
||||||
|
console.log("Loading element: ", loadingElement);
|
||||||
|
console.log("Homepage element: ", homepage);
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
var table = document.getElementById("seriesTable");
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const getMediaCleanerState = async () => {
|
|
||||||
const response = await fetch('/mediacleaner/state');
|
|
||||||
|
|
||||||
if(!response.ok){
|
|
||||||
throw new Error(`Response status: ${response.status}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
var state = await getMediaCleanerState();
|
|
||||||
|
|
||||||
console.log("State: ", state);
|
|
||||||
|
|
||||||
for(let i = 0; i < state.length; i++){
|
|
||||||
var row = table.insertRow(-1);
|
|
||||||
var cell1 = row.insertCell(0);
|
|
||||||
var cell2 = row.insertCell(1);
|
|
||||||
var cell3 = row.insertCell(2);
|
|
||||||
cell1.innerHTML = state[i].Id;
|
|
||||||
cell2.innerHTML = state[i].SeriesName;
|
|
||||||
cell3.innerHTML = state[i].Seasons.length;
|
|
||||||
}
|
|
||||||
@@ -57,8 +57,13 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
|
|||||||
},
|
},
|
||||||
new PluginPageInfo
|
new PluginPageInfo
|
||||||
{
|
{
|
||||||
Name = "media_cleaner_table.js",
|
Name = "home.js",
|
||||||
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Pages.media_cleaner_table.js", GetType().Namespace),
|
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Pages.home.js", GetType().Namespace),
|
||||||
|
},
|
||||||
|
new PluginPageInfo
|
||||||
|
{
|
||||||
|
Name = "home.css",
|
||||||
|
EmbeddedResourcePath = string.Format(CultureInfo.InvariantCulture, "{0}.Pages.home.css", GetType().Namespace),
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,6 @@ public class PluginServiceRegistrator : IPluginServiceRegistrator
|
|||||||
{
|
{
|
||||||
public void RegisterServices(IServiceCollection serviceCollection, IServerApplicationHost applicationHost)
|
public void RegisterServices(IServiceCollection serviceCollection, IServerApplicationHost applicationHost)
|
||||||
{
|
{
|
||||||
serviceCollection.AddSingleton<PluginState>();
|
serviceCollection.AddSingleton<MediaCleanerState>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,18 +14,20 @@ using Jellyfin.Database.Implementations.Entities;
|
|||||||
using Jellyfin.Database.Implementations.Entities.Libraries;
|
using Jellyfin.Database.Implementations.Entities.Libraries;
|
||||||
using Jellyfin.Plugin.MediaCleaner.Configuration;
|
using Jellyfin.Plugin.MediaCleaner.Configuration;
|
||||||
using Jellyfin.Plugin.MediaCleaner.Helpers;
|
using Jellyfin.Plugin.MediaCleaner.Helpers;
|
||||||
|
using Jellyfin.Plugin.MediaCleaner;
|
||||||
using Jellyfin.Plugin.MediaCleaner.Models;
|
using Jellyfin.Plugin.MediaCleaner.Models;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Model.Tasks;
|
using MediaBrowser.Model.Tasks;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Jellyfin.Plugin.MediaCleaner.ScheduledTasks;
|
namespace Jellyfin.Plugin.MediaCleaner;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A task to scan media for stale files.
|
/// A task to scan media for stale files.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class StaleMediaTask : IScheduledTask
|
public sealed class StaleMediaScanner
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
@@ -38,7 +40,7 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="logger">Logger for StaleMediaTask.</param>
|
/// <param name="logger">Logger for StaleMediaTask.</param>
|
||||||
/// <param name="libraryManager">Accesses jellyfin's library manager for media.</param>
|
/// <param name="libraryManager">Accesses jellyfin's library manager for media.</param>
|
||||||
public StaleMediaTask(ILogger<StaleMediaTask> logger, ILibraryManager libraryManager)
|
public StaleMediaScanner(ILogger<StaleMediaScanner> logger, ILibraryManager libraryManager)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
@@ -47,18 +49,7 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
_seriesHelper = new SeriesHelper(_logger);
|
_seriesHelper = new SeriesHelper(_logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static PluginConfiguration Configuration =>
|
public async Task<IEnumerable<MediaInfo>> ScanStaleMedia()
|
||||||
Plugin.Instance!.Configuration;
|
|
||||||
|
|
||||||
string IScheduledTask.Name => "Scan Stale Media";
|
|
||||||
|
|
||||||
string IScheduledTask.Key => "Stale Media";
|
|
||||||
|
|
||||||
string IScheduledTask.Description => "Scan Stale Media";
|
|
||||||
|
|
||||||
string IScheduledTask.Category => "Media";
|
|
||||||
|
|
||||||
Task IScheduledTask.ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
|
|
||||||
{
|
{
|
||||||
_loggingHelper.LogDebugInformation("--DEBUG MODE ACTIVE--");
|
_loggingHelper.LogDebugInformation("--DEBUG MODE ACTIVE--");
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogInformation("-------------------------------------------------");
|
||||||
@@ -73,59 +64,92 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
|
|
||||||
List<BaseItem> allItems = [.. _libraryManager.GetItemsResult(query).Items];
|
List<BaseItem> allItems = [.. _libraryManager.GetItemsResult(query).Items];
|
||||||
|
|
||||||
_loggingHelper.LogInformation("Total items: {ItemCount}", allItems.Count);
|
_loggingHelper.LogInformation("Total items to scan: {ItemCount}", allItems.Count);
|
||||||
_loggingHelper.LogInformation("Stale items found: {AllItems}", allItems);
|
_loggingHelper.LogDebugInformation("Items found: {AllItems}", allItems);
|
||||||
|
|
||||||
List<BaseItem> series = [.. allItems.Where(item => item.GetBaseItemKind() == BaseItemKind.Series)];
|
List<BaseItem> series = [.. allItems.Where(item => item.GetBaseItemKind() == BaseItemKind.Series)];
|
||||||
List<BaseItem> movies = [.. allItems.Where(item => item.GetBaseItemKind() == BaseItemKind.Movie)];
|
List<BaseItem> movies = [.. allItems.Where(item => item.GetBaseItemKind() == BaseItemKind.Movie)];
|
||||||
|
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogInformation("Starting scan of series items.");
|
_loggingHelper.LogDebugInformation("Starting scan of series items.");
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
|
||||||
|
|
||||||
List<BaseItem> staleSeasons = [.. series.SelectMany(GetStaleSeasons)];
|
List<BaseItem> staleSeasons = [.. series.SelectMany(GetStaleSeasons)];
|
||||||
|
|
||||||
_loggingHelper.LogInformation("Starting scan of movies items.");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("End of scan for series items.");
|
||||||
|
|
||||||
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
|
_loggingHelper.LogDebugInformation("Starting scan of movie items.");
|
||||||
|
|
||||||
List<BaseItem> staleMovies = [.. GetStaleMovies(movies)];
|
List<BaseItem> staleMovies = [.. GetStaleMovies(movies)];
|
||||||
|
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogInformation("Stale Movies found: {StaleMovies}", staleMovies.Count);
|
_loggingHelper.LogDebugInformation("End of scan for movie items.");
|
||||||
|
|
||||||
if (staleMovies.Count > 0 && Configuration.DebugMode)
|
|
||||||
{
|
|
||||||
foreach (var movieInfo in staleMovies)
|
|
||||||
{
|
|
||||||
_loggingHelper.LogDebugInformation("Movie Info: ID: {Id} | Movie Name: {MovieName}", [movieInfo.Id, movieInfo.Name]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogInformation("Stale seasons found: {StaleSeasons}", staleSeasons.Count);
|
_loggingHelper.LogInformation("Stale seasons found: {StaleSeasons}", staleSeasons.Count);
|
||||||
|
|
||||||
if (staleSeasons.Count > 0 && Configuration.DebugMode)
|
IEnumerable<MediaInfo> staleSeriesInfo = [];
|
||||||
{
|
|
||||||
IEnumerable<SeriesInfo> staleSeriesInfo = FindSeriesInfo(staleSeasons);
|
|
||||||
|
|
||||||
foreach (var seriesInfo in staleSeriesInfo)
|
if (staleSeasons.Count > 0)
|
||||||
{
|
{
|
||||||
_loggingHelper.LogDebugInformation("Series Info: ID: {Id} | Series Name: {SeriesName} | Stale Seasons: {Seasons}", [seriesInfo.Id, seriesInfo.SeriesName, string.Join(", ", seriesInfo.Seasons)]);
|
staleSeriesInfo = FindSeriesInfo(staleSeasons);
|
||||||
|
|
||||||
|
foreach (SeriesInfo seriesInfo in staleSeriesInfo.Cast<SeriesInfo>())
|
||||||
|
{
|
||||||
|
_loggingHelper.LogInformation("Series Info: ID: {Id} | Series Name: {SeriesName} | Stale Seasons: {Seasons}", [seriesInfo.Id, seriesInfo.Name, string.Join(", ", seriesInfo.Seasons)]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_loggingHelper.LogInformation("No stale seasons found!");
|
||||||
|
}
|
||||||
|
|
||||||
|
_loggingHelper.LogInformation("-------------------------------------------------");
|
||||||
|
_loggingHelper.LogInformation("Stale Movies found: {StaleMovies}", staleMovies.Count);
|
||||||
|
|
||||||
|
IEnumerable<MediaInfo> staleMoviesInfo = [];
|
||||||
|
|
||||||
|
if (staleMovies.Count > 0)
|
||||||
|
{
|
||||||
|
staleMoviesInfo = staleMovies.Select(movie => new MovieInfo
|
||||||
|
{
|
||||||
|
Id = movie.Id,
|
||||||
|
Name = movie.Name
|
||||||
|
});
|
||||||
|
|
||||||
|
foreach (MovieInfo movieInfo in staleMoviesInfo.Cast<MovieInfo>())
|
||||||
|
{
|
||||||
|
_loggingHelper.LogInformation("Movie Info: ID: {Id} | Movie Name: {MovieName}", [movieInfo.Id, movieInfo.Name]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_loggingHelper.LogInformation("No stale movies found!");
|
||||||
|
}
|
||||||
|
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogInformation("Ending stale media scan...");
|
_loggingHelper.LogInformation("Ending stale media scan...");
|
||||||
_loggingHelper.LogInformation("-------------------------------------------------");
|
_loggingHelper.LogInformation("-------------------------------------------------");
|
||||||
|
|
||||||
return Task.CompletedTask;
|
IEnumerable<MediaInfo> mediaInfo = staleSeriesInfo.Concat(staleMoviesInfo);
|
||||||
|
|
||||||
|
return mediaInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<BaseItem> GetStaleMovies(List<BaseItem> movies)
|
private List<BaseItem> GetStaleMovies(List<BaseItem> movies)
|
||||||
{
|
{
|
||||||
List<BaseItem> staleMovies = [];
|
List<BaseItem> staleMovies = [];
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
staleMovies.AddRange(movies.Where(_movieHelper.IsMovieStale));
|
staleMovies.AddRange(movies.Where(_movieHelper.IsMovieStale));
|
||||||
|
}
|
||||||
|
catch (ArgumentNullException ex)
|
||||||
|
{
|
||||||
|
_loggingHelper.LogInformation("Arguement Null Exception in GetStaleMovies!");
|
||||||
|
_loggingHelper.LogInformation(ex.Message);
|
||||||
|
}
|
||||||
|
|
||||||
return staleMovies;
|
return staleMovies;
|
||||||
}
|
}
|
||||||
@@ -133,10 +157,10 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
|
|
||||||
private List<BaseItem> GetStaleSeasons(BaseItem item)
|
private List<BaseItem> GetStaleSeasons(BaseItem item)
|
||||||
{
|
{
|
||||||
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogDebugInformation("Debug data for series: {SeriesName}", item.Name);
|
_loggingHelper.LogDebugInformation("Debug data for series: {SeriesName}", item.Name);
|
||||||
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
|
|
||||||
// Gets each season in a show
|
|
||||||
var seasons = _libraryManager.GetItemList(new InternalItemsQuery
|
var seasons = _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
{
|
{
|
||||||
ParentId = item.Id,
|
ParentId = item.Id,
|
||||||
@@ -153,7 +177,17 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
|
|
||||||
_loggingHelper.LogDebugInformation("Season debug information for {SeasonNumber}:", season);
|
_loggingHelper.LogDebugInformation("Season debug information for {SeasonNumber}:", season);
|
||||||
|
|
||||||
bool isSeasonDataStale = _seriesHelper.IsSeasonDataStale(episodes);
|
bool isSeasonDataStale = false;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
isSeasonDataStale = _seriesHelper.IsSeasonDataStale(episodes);
|
||||||
|
}
|
||||||
|
catch (ArgumentNullException ex)
|
||||||
|
{
|
||||||
|
_loggingHelper.LogInformation("Arguement Null Exception in GetStaleSeasons!");
|
||||||
|
_loggingHelper.LogInformation(ex.Message);
|
||||||
|
}
|
||||||
|
|
||||||
_loggingHelper.LogDebugInformation("End of season debug information for {SeasonNumber}.", season);
|
_loggingHelper.LogDebugInformation("End of season debug information for {SeasonNumber}.", season);
|
||||||
|
|
||||||
@@ -163,12 +197,11 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
|
|
||||||
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
||||||
_loggingHelper.LogDebugInformation("End of scanning for series: {Series}", item);
|
_loggingHelper.LogDebugInformation("End of scanning for series: {Series}", item);
|
||||||
_loggingHelper.LogDebugInformation("-------------------------------------------------");
|
|
||||||
|
|
||||||
return staleSeasons;
|
return staleSeasons;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<SeriesInfo> FindSeriesInfo(IReadOnlyCollection<BaseItem> seasons)
|
private IEnumerable<MediaInfo> FindSeriesInfo(IReadOnlyCollection<BaseItem> seasons)
|
||||||
{
|
{
|
||||||
Guid[] seriesIds = [.. seasons.Select(season => season.ParentId).Distinct()];
|
Guid[] seriesIds = [.. seasons.Select(season => season.ParentId).Distinct()];
|
||||||
|
|
||||||
@@ -182,21 +215,11 @@ public sealed class StaleMediaTask : IScheduledTask
|
|||||||
return new SeriesInfo
|
return new SeriesInfo
|
||||||
{
|
{
|
||||||
Id = series.Id,
|
Id = series.Id,
|
||||||
SeriesName = series.Name,
|
Name = series.Name,
|
||||||
Seasons = [.. seasons.Where(season => season.ParentId == series.Id).Select(season => season.Name)]
|
Seasons = [.. seasons.Where(season => season.ParentId == series.Id).Select(season => season.Name)]
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
return seriesInfoList;
|
return seriesInfoList;
|
||||||
}
|
}
|
||||||
|
|
||||||
IEnumerable<TaskTriggerInfo> IScheduledTask.GetDefaultTriggers()
|
|
||||||
{
|
|
||||||
// Run this task every 24 hours
|
|
||||||
yield return new TaskTriggerInfo
|
|
||||||
{
|
|
||||||
Type = TaskTriggerInfoType.IntervalTrigger,
|
|
||||||
IntervalTicks = TimeSpan.FromHours(24).Ticks
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user