Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Library merge fixes #54

Merged
merged 2 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions Jellyfin.Plugin.MergeVersions/Api/MergeVersionsController.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@

using MediaBrowser.Controller.Library;
using Microsoft.Extensions.Logging;

using System.Net.Mime;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.IO;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using MediaBrowser.Model.IO;
using System.Threading;
using Microsoft.Extensions.Logging;

namespace Jellyfin.Plugin.MergeVersions.Api
{
/// <summary>
{
/// <summary>
/// The Merge Versions api controller.
/// </summary>
[ApiController]
Expand All @@ -27,18 +25,17 @@ public class MergeVersionsController : ControllerBase
/// <summary>
/// Initializes a new instance of <see cref="TMDbBoxSetsController"/>.

public MergeVersionsController (ILibraryManager libraryManager, ILogger<MergeVersionsManager> logger,
IFileSystem fileSystem)
public MergeVersionsController(
ILibraryManager libraryManager,
ILogger<MergeVersionsManager> logger,
IFileSystem fileSystem
)
{
_mergeVersionsManager = new MergeVersionsManager(
libraryManager,
logger,
fileSystem);
_mergeVersionsManager = new MergeVersionsManager(libraryManager, logger, fileSystem);

_logger = logger;
}


/// <summary>
/// Scans all movies and merges repeated ones.
/// </summary>
Expand Down Expand Up @@ -69,7 +66,6 @@ public ActionResult SplitMoviesRequest()
return NoContent();
}


/// <summary>
/// Scans all episodes and merge repeated ones.
/// </summary>
Expand All @@ -85,7 +81,6 @@ public async Task<ActionResult> MergeEpisodesRequestAsync()
return NoContent();
}


/// <summary>
/// Scans all episodes and splits merged ones.
/// </summary>
Expand All @@ -101,4 +96,4 @@ public async Task<ActionResult> SplitEpisodesRequestAsync()
return NoContent();
}
}
}
}
Loading