diff options
| author | crobibero <cody@robibe.ro> | 2020-08-18 20:22:15 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-18 20:22:15 -0600 |
| commit | 50a9c8c8a747ea3a13f1622b8e77e1a9e635aacf (patch) | |
| tree | 817cea89fd42e407231f8a55797c8c26bd46ca5d | |
| parent | b43a8fb9d35846f458212d0ad17f3d52c896ef6e (diff) | |
resolve merge conflicts
| -rw-r--r-- | Jellyfin.Api/Controllers/PackageController.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/PackageController.cs b/Jellyfin.Api/Controllers/PackageController.cs index 3d6a87909..2be0ad9fe 100644 --- a/Jellyfin.Api/Controllers/PackageController.cs +++ b/Jellyfin.Api/Controllers/PackageController.cs @@ -76,6 +76,7 @@ namespace Jellyfin.Api.Controllers /// <param name="name">Package name.</param> /// <param name="assemblyGuid">GUID of the associated assembly.</param> /// <param name="version">Optional version. Defaults to latest version.</param> + /// <param name="repositoryUrl">Optional. Specify the repository to install from.</param> /// <response code="204">Package found.</response> /// <response code="404">Package not found.</response> /// <returns>A <see cref="NoContentResult"/> on success, or a <see cref="NotFoundResult"/> if the package could not be found.</returns> @@ -86,9 +87,16 @@ namespace Jellyfin.Api.Controllers public async Task<ActionResult> InstallPackage( [FromRoute] [Required] string? name, [FromQuery] string? assemblyGuid, - [FromQuery] string? version) + [FromQuery] string? version, + [FromQuery] string? repositoryUrl) { var packages = await _installationManager.GetAvailablePackages().ConfigureAwait(false); + if (!string.IsNullOrEmpty(repositoryUrl)) + { + packages = packages.Where(p => p.repositoryUrl.Equals(repositoryUrl, StringComparison.OrdinalIgnoreCase)) + .ToList(); + } + var package = _installationManager.GetCompatibleVersions( packages, name, |