Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adding strongly typed options

Browse Source
This commit is contained in:
Zoe Roux 2021-05-20 00:22:35 +02:00
parent fcd419993a
commit dcfb1e538c
30 changed files with 302 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kyoo.Authentication/AuthenticationModule.cs
View File

@ -84,7 +84,7 @@ namespace Kyoo.Authentication
/// <inheritdoc />
public void Configure(IServiceCollection services, ICollection<Type> availableTypes)
{
string publicUrl = _configuration.GetValue<string>("publicUrl").TrimEnd('/');
string publicUrl = _configuration.GetPublicUrl();
if (_environment.IsDevelopment())
IdentityModelEventSource.ShowPII = true;
@ -146,7 +146,7 @@ namespace Kyoo.Authentication
app.UseAuthentication();
app.Use((ctx, next) =>
{
ctx.SetIdentityServerOrigin(_configuration.GetValue<string>("publicUrl").TrimEnd('/'));
ctx.SetIdentityServerOrigin(_configuration.GetPublicUrl());
return next();
});
app.UseIdentityServer();

20
Kyoo.Common/Controllers/IConfigurationManager.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Threading.Tasks;
using Kyoo.Models;
using Kyoo.Models.Exceptions;
@ -11,6 +12,25 @@ namespace Kyoo.Controllers
/// </summary>
public interface IConfigurationManager
{
/// <summary>
/// Get the value of a setting using it's path.
/// </summary>
/// <param name="path">The path of the resource (can be separated by ':' or '__')</param>
/// <exception cref="ItemNotFoundException">No setting found at the given path.</exception>
/// <returns>The value of the settings (if it's a strongly typed one, the given type is instantiated</returns>
object GetValue(string path);
/// <summary>
/// Get the value of a setting using it's path.
/// If your don't need a strongly typed value, see <see cref="GetValue"/>.
/// </summary>
/// <param name="path">The path of the resource (can be separated by ':' or '__')</param>
/// <typeparam name="T">A type to strongly type your option.</typeparam>
/// <exception cref="InvalidCastException">If your type is not the same as the registered type</exception>
/// <exception cref="ItemNotFoundException">No setting found at the given path.</exception>
/// <returns>The value of the settings (if it's a strongly typed one, the given type is instantiated</returns>
T GetValue<T>(string path);
/// <summary>
/// Edit the value of a setting using it's path. Save it to the json file.
/// </summary>

11
Kyoo.Common/Module.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Linq;
using Kyoo.Controllers;
using Kyoo.Models;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace Kyoo
@ -81,5 +82,15 @@ namespace Kyoo
services.AddSingleton(confRef);
return services;
}
/// <summary>
/// Get the public URL of kyoo using the given configuration instance.
/// </summary>
/// <param name="configuration">The configuration instance</param>
/// <returns>The public URl of kyoo (without a slash at the end)</returns>
public static string GetPublicUrl(this IConfiguration configuration)
{
return configuration["basics:publicUrl"]?.TrimEnd('/') ?? "http://localhost:5000";
}
}
}

5
Kyoo.CommonAPI/CrudApi.cs
View File

@ -7,7 +7,6 @@ using Kyoo.Models;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
namespace Kyoo.CommonApi
{
@ -18,10 +17,10 @@ namespace Kyoo.CommonApi
private readonly IRepository<T> _repository;
protected readonly string BaseURL;
public CrudApi(IRepository<T> repository, IConfiguration configuration)
public CrudApi(IRepository<T> repository, string baseURL)
{
_repository = repository;
BaseURL = configuration.GetValue<string>("publicUrl").TrimEnd('/');
BaseURL = baseURL;
}

4
Kyoo.Postgresql/PostgresModule.cs
View File

@ -66,10 +66,6 @@ namespace Kyoo.Postgresql
if (_environment.IsDevelopment())
x.EnableDetailedErrors().EnableSensitiveDataLogging();
});
// services.AddScoped<DatabaseContext>(_ => new PostgresContext(
// _configuration.GetDatabaseConnection("postgres"),
// _environment.IsDevelopment()));
// services.AddScoped<DbContext>(x => x.GetRequiredService<PostgresContext>());
}
/// <inheritdoc />

28
Kyoo/Controllers/ConfigurationManager.cs
View File

@ -35,6 +35,34 @@ namespace Kyoo.Controllers
_references = references.ToDictionary(x => x.Path, x => x.Type, StringComparer.OrdinalIgnoreCase);
}
/// <inheritdoc />
public object GetValue(string path)
{
path = path.Replace("__", ":");
// TODO handle lists and dictionaries.
if (!_references.TryGetValue(path, out Type type))
throw new ItemNotFoundException($"No configuration exists for the name: {path}");
object ret = _configuration.GetValue(type, path);
if (ret != null)
return ret;
object option = Activator.CreateInstance(type);
_configuration.Bind(path, option);
return option;
}
/// <inheritdoc />
public T GetValue<T>(string path)
{
path = path.Replace("__", ":");
// TODO handle lists and dictionaries.
if (!_references.TryGetValue(path, out Type type))
throw new ItemNotFoundException($"No configuration exists for the name: {path}");
if (typeof(T).IsAssignableFrom(type))
throw new InvalidCastException($"The type {typeof(T).Name} is not valid for " +
$"a resource of type {type.Name}.");
return (T)GetValue(path);
}
/// <inheritdoc />
public async Task EditValue(string path, object value)
{

13
Kyoo/Controllers/PluginManager.cs
View File

@ -4,10 +4,11 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
using Kyoo.Models.Options;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Kyoo.Controllers
{
@ -24,7 +25,7 @@ namespace Kyoo.Controllers
/// <summary>
/// The configuration to get the plugin's directory.
/// </summary>
private readonly IConfiguration _config;
private readonly IOptionsMonitor<BasicOptions> _options;
/// <summary>
/// The logger used by this class.
/// </summary>
@ -39,14 +40,14 @@ namespace Kyoo.Controllers
/// Create a new <see cref="PluginManager"/> instance.
/// </summary>
/// <param name="provider">A service container to allow initialization of plugins</param>
/// <param name="config">The configuration instance, to get the plugin's directory path.</param>
/// <param name="options">The configuration instance, to get the plugin's directory path.</param>
/// <param name="logger">The logger used by this class.</param>
public PluginManager(IServiceProvider provider,
IConfiguration config,
IOptionsMonitor<BasicOptions> options,
ILogger<PluginManager> logger)
{
_provider = provider;
_config = config;
_options = options;
_logger = logger;
}
@ -97,7 +98,7 @@ namespace Kyoo.Controllers
/// <inheritdoc />
public void LoadPlugins(ICollection<IPlugin> plugins)
{
string pluginFolder = _config.GetValue<string>("plugins");
string pluginFolder = _options.CurrentValue.PluginPath;
if (!Directory.Exists(pluginFolder))
Directory.CreateDirectory(pluginFolder);

18
Kyoo/Controllers/TaskManager.cs
View File

@ -7,10 +7,11 @@ using System.Threading.Tasks;
using JetBrains.Annotations;
using Kyoo.Models.Attributes;
using Kyoo.Models.Exceptions;
using Microsoft.Extensions.Configuration;
using Kyoo.Models.Options;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Kyoo.Controllers
{
@ -27,7 +28,7 @@ namespace Kyoo.Controllers
/// <summary>
/// The configuration instance used to get schedule information
/// </summary>
private readonly IConfiguration _configuration;
private readonly IOptionsMonitor<TaskOptions> _options;
/// <summary>
/// The logger instance.
/// </summary>
@ -56,15 +57,15 @@ namespace Kyoo.Controllers
/// </summary>
/// <param name="tasks">The list of tasks to manage</param>
/// <param name="provider">The service provider to request services for tasks</param>
/// <param name="configuration">The configuration to load schedule information.</param>
/// <param name="options">The configuration to load schedule information.</param>
/// <param name="logger">The logger.</param>
public TaskManager(IEnumerable<ITask> tasks,
IServiceProvider provider,
IConfiguration configuration,
IOptionsMonitor<TaskOptions> options,
ILogger<TaskManager> logger)
{
_provider = provider;
_configuration = configuration.GetSection("scheduledTasks");
_options = options;
_logger = logger;
_tasks = tasks.Select(x => (x, GetNextTaskDate(x.Slug))).ToList();
@ -224,10 +225,9 @@ namespace Kyoo.Controllers
/// <returns>The next date.</returns>
private DateTime GetNextTaskDate(string taskSlug)
{
TimeSpan delay = _configuration.GetValue<TimeSpan>(taskSlug);
if (delay == default)
return DateTime.MaxValue;
return DateTime.Now + delay;
if (_options.CurrentValue.Scheduled.TryGetValue(taskSlug, out TimeSpan delay))
return DateTime.Now + delay;
return DateTime.MaxValue;
}
/// <inheritdoc />

25
Kyoo/Controllers/ThumbnailsManager.cs
View File

@ -1,26 +1,25 @@
using Kyoo.Models;
using Microsoft.Extensions.Configuration;
using System;
using System.IO;
using System.Net;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Kyoo.Models.Options;
using Microsoft.Extensions.Options;
namespace Kyoo.Controllers
{
public class ThumbnailsManager : IThumbnailsManager
{
private readonly IFileManager _files;
private readonly string _peoplePath;
private readonly string _providerPath;
private readonly IOptionsMonitor<BasicOptions> _options;
public ThumbnailsManager(IConfiguration configuration, IFileManager files)
public ThumbnailsManager(IFileManager files, IOptionsMonitor<BasicOptions> options)
{
_files = files;
_peoplePath = Path.GetFullPath(configuration.GetValue<string>("peoplePath"));
_providerPath = Path.GetFullPath(configuration.GetValue<string>("providerPath"));
Directory.CreateDirectory(_peoplePath);
Directory.CreateDirectory(_providerPath);
_options = options;
Directory.CreateDirectory(_options.CurrentValue.PeoplePath);
Directory.CreateDirectory(_options.CurrentValue.ProviderPath);
}
private static async Task DownloadImage(string url, string localPath, string what)
@ -141,16 +140,18 @@ namespace Kyoo.Controllers
{
if (people == null)
throw new ArgumentNullException(nameof(people));
string thumbPath = Path.GetFullPath(Path.Combine(_peoplePath, $"{people.Slug}.jpg"));
return Task.FromResult(thumbPath.StartsWith(_peoplePath) ? thumbPath : null);
string peoplePath = _options.CurrentValue.PeoplePath;
string thumbPath = Path.GetFullPath(Path.Combine(peoplePath, $"{people.Slug}.jpg"));
return Task.FromResult(thumbPath.StartsWith(peoplePath) ? thumbPath : null);
}
public Task<string> GetProviderLogo(Provider provider)
{
if (provider == null)
throw new ArgumentNullException(nameof(provider));
string thumbPath = Path.GetFullPath(Path.Combine(_providerPath, $"{provider.Slug}.{provider.LogoExtension}"));
return Task.FromResult(thumbPath.StartsWith(_providerPath) ? thumbPath : null);
string providerPath = _options.CurrentValue.ProviderPath;
string thumbPath = Path.GetFullPath(Path.Combine(providerPath, $"{provider.Slug}.{provider.LogoExtension}"));
return Task.FromResult(thumbPath.StartsWith(providerPath) ? thumbPath : null);
}
}
}

15
Kyoo/Controllers/Transcoder.cs
View File

@ -3,7 +3,8 @@ using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Kyoo.Models;
using Microsoft.Extensions.Configuration;
using Kyoo.Models.Options;
using Microsoft.Extensions.Options;
using Stream = Kyoo.Models.Watch.Stream;
// We use threads so tasks are not always awaited.
@ -66,20 +67,18 @@ namespace Kyoo.Controllers
tracks = Array.Empty<Track>();
if (ptr != IntPtr.Zero)
free(ptr); // free_streams is not necesarry since the Marshal free the unmanaged pointers.
free(ptr); // free_streams is not necessary since the Marshal free the unmanaged pointers.
return tracks;
}
}
private readonly IFileManager _files;
private readonly string _transmuxPath;
private readonly string _transcodePath;
private readonly IOptions<BasicOptions> _options;
public Transcoder(IConfiguration config, IFileManager files)
public Transcoder(IFileManager files, IOptions<BasicOptions> options)
{
_files = files;
_transmuxPath = Path.GetFullPath(config.GetValue<string>("transmuxTempPath"));
_transcodePath = Path.GetFullPath(config.GetValue<string>("transcodeTempPath"));
_options = options;
if (TranscoderAPI.init() != Marshal.SizeOf<Stream>())
throw new BadTranscoderException();
@ -100,7 +99,7 @@ namespace Kyoo.Controllers
if (!File.Exists(episode.Path))
throw new ArgumentException("Path does not exists. Can't transcode.");
string folder = Path.Combine(_transmuxPath, episode.Slug);
string folder = Path.Combine(_options.Value.TransmuxPath, episode.Slug);
string manifest = Path.Combine(folder, episode.Slug + ".m3u8");
float playableDuration = 0;
bool transmuxFailed = false;

10
Kyoo/CoreModule.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using Kyoo.Controllers;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Kyoo.Tasks;
using Microsoft.AspNetCore.Builder;
@ -90,8 +91,15 @@ namespace Kyoo
/// <inheritdoc />
public void Configure(IServiceCollection services, ICollection<Type> availableTypes)
{
string publicUrl = _configuration.GetValue<string>("publicUrl");
string publicUrl = _configuration.GetPublicUrl();
services.Configure<BasicOptions>(_configuration.GetSection(BasicOptions.Path));
services.AddConfiguration<BasicOptions>(BasicOptions.Path);
services.Configure<TaskOptions>(_configuration.GetSection(TaskOptions.Path));
services.AddConfiguration<TaskOptions>(TaskOptions.Path);
services.Configure<MediaOptions>(_configuration.GetSection(MediaOptions.Path));
services.AddConfiguration<MediaOptions>(MediaOptions.Path);
services.AddControllers()
.AddNewtonsoftJson(x =>
{

48
Kyoo/Models/Options/BasicOptions.cs Normal file
View File

@ -0,0 +1,48 @@
namespace Kyoo.Models.Options
{
/// <summary>
/// The typed list of basic/global options for Kyoo
/// </summary>
public class BasicOptions
{
/// <summary>
/// The path of this list of options
/// </summary>
public const string Path = "Basics";
/// <summary>
/// The internal url where the server will listen
/// </summary>
public string Url { get; set; } = "http://*:5000";
/// <summary>
/// The public url that will be used in items response and in authentication server host.
/// </summary>
public string PublicUrl { get; set; } = "http://localhost:5000/";
/// <summary>
/// The path of the plugin directory.
/// </summary>
public string PluginPath { get; set; } = "plugins/";
/// <summary>
/// The path of the people pictures.
/// </summary>
public string PeoplePath { get; set; } = "people/";
/// <summary>
/// The path of providers icons.
/// </summary>
public string ProviderPath { get; set; } = "providers/";
/// <summary>
/// The temporary folder to cache transmuxed file.
/// </summary>
public string TransmuxPath { get; set; } = "cached/transmux";
/// <summary>
/// The temporary folder to cache transcoded file.
/// </summary>
public string TranscodePath { get; set; } = "cached/transcode";
}
}

23
Kyoo/Models/Options/MediaOptions.cs Normal file
View File

@ -0,0 +1,23 @@
namespace Kyoo.Models.Options
{
/// <summary>
/// Options for media registering.
/// </summary>
public class MediaOptions
{
/// <summary>
/// The path of this options
/// </summary>
public const string Path = "Media";
/// <summary>
/// A regex for episodes
/// </summary>
public string Regex { get; set; }
/// <summary>
/// A regex for subtitles
/// </summary>
public string SubtitleRegex { get; set; }
}
}

28
Kyoo/Models/Options/TaskOptions.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
namespace Kyoo.Models.Options
{
/// <summary>
/// Options related to tasks
/// </summary>
public class TaskOptions
{
/// <summary>
/// The path of this options
/// </summary>
public const string Path = "Tasks";
/// <summary>
/// The number of tasks that can be run concurrently.
/// </summary>
public int Parallels { get; set; }
/// <summary>
/// The delay of tasks that should be automatically started at fixed times.
/// </summary>
[UsedImplicitly]
public Dictionary<string, TimeSpan> Scheduled { get; set; } = new();
}
}

7
Kyoo/Program.cs
View File

@ -83,14 +83,16 @@ namespace Kyoo
/// <returns>A new web host instance</returns>
private static IWebHostBuilder CreateWebHostBuilder(string[] args)
{
IConfiguration configuration = SetupConfig(new ConfigurationBuilder(), args).Build();
return new WebHostBuilder()
.UseContentRoot(AppDomain.CurrentDomain.BaseDirectory)
.UseConfiguration(SetupConfig(new ConfigurationBuilder(), args).Build())
.UseConfiguration(configuration)
.ConfigureAppConfiguration(x => SetupConfig(x, args))
.ConfigureLogging((context, builder) =>
{
builder.AddConfiguration(context.Configuration.GetSection("logging"))
.AddSimpleConsole(x =>
.AddSimpleConsole(x =>
{
x.TimestampFormat = "[hh:mm:ss] ";
})
@ -107,6 +109,7 @@ namespace Kyoo
.UseKestrel(options => { options.AddServerHeader = false; })
.UseIIS()
.UseIISIntegration()
.UseUrls(configuration.GetValue<string>("basics:urls"))
.UseStartup<Startup>();
}
}

5
Kyoo/Startup.cs
View File

@ -3,6 +3,7 @@ using System.IO;
using Kyoo.Authentication;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Options;
using Kyoo.Postgresql;
using Kyoo.Tasks;
using Microsoft.AspNetCore.Builder;
@ -12,6 +13,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Kyoo
{
@ -38,7 +40,8 @@ namespace Kyoo
/// <param name="loggerFactory">A logger factory used to create a logger for the plugin manager.</param>
public Startup(IServiceProvider hostProvider, IConfiguration configuration, ILoggerFactory loggerFactory, IWebHostEnvironment host)
{
_plugins = new PluginManager(hostProvider, configuration, loggerFactory.CreateLogger<PluginManager>());
IOptionsMonitor<BasicOptions> options = hostProvider.GetService<IOptionsMonitor<BasicOptions>>();
_plugins = new PluginManager(hostProvider, options, loggerFactory.CreateLogger<PluginManager>());
// TODO remove postgres from here and load it like a normal plugin.
_plugins.LoadPlugins(new IPlugin[] {

7
Kyoo/Views/CollectionApi.cs
View File

@ -6,8 +6,9 @@ using Kyoo.Models;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -19,8 +20,8 @@ namespace Kyoo.Api
{
private readonly ILibraryManager _libraryManager;
public CollectionApi(ILibraryManager libraryManager, IConfiguration configuration)
: base(libraryManager.CollectionRepository, configuration)
public CollectionApi(ILibraryManager libraryManager, IOptions<BasicOptions> options)
: base(libraryManager.CollectionRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
}

40
Kyoo/Views/ConfigurationApi.cs
View File

@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
namespace Kyoo.Api
{
@ -19,28 +15,18 @@ namespace Kyoo.Api
[ApiController]
public class ConfigurationApi : Controller
{
/// <summary>
/// The configuration manager used to retrieve and edit configuration values (while being type safe).
/// </summary>
private readonly IConfigurationManager _manager;
/// <summary>
/// The configuration to retrieve and edit.
/// </summary>
private readonly IConfiguration _configuration;
/// <summary>
/// The strongly typed list of options
/// </summary>
private readonly Dictionary<string, Type> _references;
/// <summary>
/// Create a new <see cref="ConfigurationApi"/> using the given configuration.
/// </summary>
/// <param name="configuration">The configuration to use.</param>
/// <param name="references">The strongly typed option list.</param>
public ConfigurationApi(IConfigurationManager manager, IConfiguration configuration, IEnumerable<ConfigurationReference> references)
/// <param name="manager">The configuration manager used to retrieve and edit configuration values</param>
public ConfigurationApi(IConfigurationManager manager)
{
_manager = manager;
_configuration = configuration;
_references = references.ToDictionary(x => x.Path, x => x.Type, StringComparer.OrdinalIgnoreCase);
}
/// <summary>
@ -54,16 +40,14 @@ namespace Kyoo.Api
[Permission(nameof(ConfigurationApi), Kind.Admin)]
public ActionResult<object> GetConfiguration(string slug)
{
slug = slug.Replace("__", ":");
// TODO handle lists and dictionaries.
if (!_references.TryGetValue(slug, out Type type))
try
{
return _manager.GetValue(slug);
}
catch (ItemNotFoundException)
{
return NotFound();
object ret = _configuration.GetValue(type, slug);
if (ret != null)
return ret;
object option = Activator.CreateInstance(type);
_configuration.Bind(slug, option);
return option;
}
}
/// <summary>

7
Kyoo/Views/EpisodeApi.cs
View File

@ -7,8 +7,9 @@ using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -23,10 +24,10 @@ namespace Kyoo.Api
private readonly IFileManager _files;
public EpisodeApi(ILibraryManager libraryManager,
IConfiguration configuration,
IOptions<BasicOptions> options,
IFileManager files,
IThumbnailsManager thumbnails)
: base(libraryManager.EpisodeRepository, configuration)
: base(libraryManager.EpisodeRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
_files = files;

7
Kyoo/Views/GenreApi.cs
View File

@ -5,9 +5,10 @@ using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -19,8 +20,8 @@ namespace Kyoo.Api
{
private readonly ILibraryManager _libraryManager;
public GenreApi(ILibraryManager libraryManager, IConfiguration config)
: base(libraryManager.GenreRepository, config)
public GenreApi(ILibraryManager libraryManager, IOptions<BasicOptions> options)
: base(libraryManager.GenreRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
}

7
Kyoo/Views/LibraryApi.cs
View File

@ -6,8 +6,9 @@ using Kyoo.Models;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -20,8 +21,8 @@ namespace Kyoo.Api
private readonly ILibraryManager _libraryManager;
private readonly ITaskManager _taskManager;
public LibraryApi(ILibraryManager libraryManager, ITaskManager taskManager, IConfiguration configuration)
: base(libraryManager.LibraryRepository, configuration)
public LibraryApi(ILibraryManager libraryManager, ITaskManager taskManager, IOptions<BasicOptions> options)
: base(libraryManager.LibraryRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
_taskManager = taskManager;

7
Kyoo/Views/LibraryItemApi.cs
View File

@ -6,9 +6,10 @@ using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -22,10 +23,10 @@ namespace Kyoo.Api
private readonly string _baseURL;
public LibraryItemApi(ILibraryItemRepository libraryItems, IConfiguration configuration)
public LibraryItemApi(ILibraryItemRepository libraryItems, IOptions<BasicOptions> options)
{
_libraryItems = libraryItems;
_baseURL = configuration.GetValue<string>("publicUrl").TrimEnd('/');
_baseURL = options.Value.PublicUrl;
}
[HttpGet]

7
Kyoo/Views/PeopleApi.cs
View File

@ -5,9 +5,10 @@ using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -21,10 +22,10 @@ namespace Kyoo.Api
private readonly IThumbnailsManager _thumbs;
public PeopleApi(ILibraryManager libraryManager,
IConfiguration configuration,
IOptions<BasicOptions> options,
IFileManager files,
IThumbnailsManager thumbs)
: base(libraryManager.PeopleRepository, configuration)
: base(libraryManager.PeopleRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
_files = files;

7
Kyoo/Views/ProviderApi.cs
View File

@ -2,9 +2,10 @@ using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -19,10 +20,10 @@ namespace Kyoo.Api
private readonly IFileManager _files;
public ProviderApi(ILibraryManager libraryManager,
IConfiguration config,
IOptions<BasicOptions> options,
IFileManager files,
IThumbnailsManager thumbnails)
: base(libraryManager.ProviderRepository, config)
: base(libraryManager.ProviderRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
_files = files;

7
Kyoo/Views/SeasonApi.cs
View File

@ -6,8 +6,9 @@ using Kyoo.Controllers;
using Kyoo.Models;
using Microsoft.AspNetCore.Mvc;
using System.Linq;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -22,10 +23,10 @@ namespace Kyoo.Api
private readonly IFileManager _files;
public SeasonApi(ILibraryManager libraryManager,
IConfiguration configuration,
IOptions<BasicOptions> options,
IThumbnailsManager thumbs,
IFileManager files)
: base(libraryManager.SeasonRepository, configuration)
: base(libraryManager.SeasonRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
_thumbs = thumbs;

7
Kyoo/Views/ShowApi.cs
View File

@ -8,8 +8,9 @@ using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -26,8 +27,8 @@ namespace Kyoo.Api
public ShowApi(ILibraryManager libraryManager,
IFileManager files,
IThumbnailsManager thumbs,
IConfiguration configuration)
: base(libraryManager.ShowRepository, configuration)
IOptions<BasicOptions> options)
: base(libraryManager.ShowRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
_files = files;

7
Kyoo/Views/StudioApi.cs
View File

@ -5,9 +5,10 @@ using System.Threading.Tasks;
using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -19,8 +20,8 @@ namespace Kyoo.Api
{
private readonly ILibraryManager _libraryManager;
public StudioApi(ILibraryManager libraryManager, IConfiguration config)
: base(libraryManager.StudioRepository, config)
public StudioApi(ILibraryManager libraryManager, IOptions<BasicOptions> options)
: base(libraryManager.StudioRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
}

7
Kyoo/Views/TrackApi.cs
View File

@ -4,9 +4,10 @@ using Kyoo.CommonApi;
using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -18,8 +19,8 @@ namespace Kyoo.Api
{
private readonly ILibraryManager _libraryManager;
public TrackApi(ILibraryManager libraryManager, IConfiguration configuration)
: base(libraryManager.TrackRepository, configuration)
public TrackApi(ILibraryManager libraryManager, IOptions<BasicOptions> options)
: base(libraryManager.TrackRepository, options.Value.PublicUrl)
{
_libraryManager = libraryManager;
}

15
Kyoo/Views/VideoApi.cs
View File

@ -2,11 +2,12 @@
using Kyoo.Controllers;
using Kyoo.Models;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using System.Threading.Tasks;
using Kyoo.Models.Exceptions;
using Kyoo.Models.Options;
using Kyoo.Models.Permissions;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Options;
namespace Kyoo.Api
{
@ -16,20 +17,18 @@ namespace Kyoo.Api
{
private readonly ILibraryManager _libraryManager;
private readonly ITranscoder _transcoder;
private readonly IOptions<BasicOptions> _options;
private readonly IFileManager _files;
private readonly string _transmuxPath;
private readonly string _transcodePath;
public VideoApi(ILibraryManager libraryManager,
ITranscoder transcoder,
IConfiguration config,
IOptions<BasicOptions> options,
IFileManager files)
{
_libraryManager = libraryManager;
_transcoder = transcoder;
_options = options;
_files = files;
_transmuxPath = config.GetValue<string>("transmuxTempPath");
_transcodePath = config.GetValue<string>("transcodeTempPath");
}
public override void OnActionExecuted(ActionExecutedContext ctx)
@ -101,7 +100,7 @@ namespace Kyoo.Api
[Permission("video", Kind.Read)]
public IActionResult GetTransmuxedChunk(string episodeLink, string chunk)
{
string path = Path.GetFullPath(Path.Combine(_transmuxPath, episodeLink));
string path = Path.GetFullPath(Path.Combine(_options.Value.TransmuxPath, episodeLink));
path = Path.Combine(path, "segments", chunk);
return PhysicalFile(path, "video/MP2T");
}
@ -110,7 +109,7 @@ namespace Kyoo.Api
[Permission("video", Kind.Read)]
public IActionResult GetTranscodedChunk(string episodeLink, string chunk)
{
string path = Path.GetFullPath(Path.Combine(_transcodePath, episodeLink));
string path = Path.GetFullPath(Path.Combine(_options.Value.TranscodePath, episodeLink));
path = Path.Combine(path, "segments", chunk);
return PhysicalFile(path, "video/MP2T");
}

42
Kyoo/settings.json
View File

@ -1,7 +1,14 @@
{
"server.urls": "http://*:5000",
"publicUrl": "http://localhost:5000/",
"basics": {
"url": "http://*:5000",
"publicUrl": "http://localhost:5000/",
"pluginsPath": "plugins/",
"peoplePath": "people/",
"providerPath": "providers/",
"transmuxPath": "cached/transmux",
"transcodePath": "cached/transcode"
},
"database": {
"postgres": {
"server": "127.0.0.1",
@ -24,6 +31,18 @@
"Kyoo": "Trace"
}
},
"tasks": {
"parallels": "1",
"scheduled": {
"scan": "24:00:00"
}
},
"media": {
"regex": "(?:\\/(?<Collection>.*?))?\\/(?<Show>.*?)(?: \\(\\d+\\))?\\/\\k<Show>(?: \\(\\d+\\))?(?:(?: S(?<Season>\\d+)E(?<Episode>\\d+))| (?<Absolute>\\d+))?.*$",
"subtitleRegex": "^(?<Episode>.*)\\.(?<Language>\\w{1,3})\\.(?<Default>default\\.)?(?<Forced>forced\\.)?.*$"
},
"authentication": {
"certificate": {
@ -37,20 +56,5 @@
},
"profilePicturePath": "users/",
"clients": []
},
"parallelTasks": "1",
"scheduledTasks": {
"scan": "24:00:00"
},
"transmuxTempPath": "cached/kyoo/transmux",
"transcodeTempPath": "cached/kyoo/transcode",
"peoplePath": "people",
"providerPath": "providers",
"plugins": "plugins/",
"regex": "(?:\\/(?<Collection>.*?))?\\/(?<Show>.*?)(?: \\(\\d+\\))?\\/\\k<Show>(?: \\(\\d+\\))?(?:(?: S(?<Season>\\d+)E(?<Episode>\\d+))| (?<Absolute>\\d+))?.*$",
"subtitleRegex": "^(?<Episode>.*)\\.(?<Language>\\w{1,3})\\.(?<Default>default\\.)?(?<Forced>forced\\.)?.*$"
}
}