From 886983fa5a8b4fea909a803f9a257057eb9048f5 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 6 Aug 2021 14:01:13 +0200 Subject: [PATCH] Plugins: Loading all premade plugins manually instead of using the plugin loader --- Kyoo.Postgresql/Kyoo.Postgresql.csproj | 15 --------------- Kyoo.SqLite/Kyoo.SqLite.csproj | 17 +---------------- Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj | 12 ------------ Kyoo.TheTvdb/Kyoo.TheTvdb.csproj | 12 ------------ Kyoo/Kyoo.csproj | 2 ++ Kyoo/Startup.cs | 6 +++++- 6 files changed, 8 insertions(+), 56 deletions(-) diff --git a/Kyoo.Postgresql/Kyoo.Postgresql.csproj b/Kyoo.Postgresql/Kyoo.Postgresql.csproj index 408e10ad..a53ba3b7 100644 --- a/Kyoo.Postgresql/Kyoo.Postgresql.csproj +++ b/Kyoo.Postgresql/Kyoo.Postgresql.csproj @@ -7,15 +7,6 @@ https://github.com/AnonymusRaccoon/Kyoo default - - - - - - - - - @@ -28,14 +19,8 @@ - - - - - - diff --git a/Kyoo.SqLite/Kyoo.SqLite.csproj b/Kyoo.SqLite/Kyoo.SqLite.csproj index 357b5ae0..cdedc4ca 100644 --- a/Kyoo.SqLite/Kyoo.SqLite.csproj +++ b/Kyoo.SqLite/Kyoo.SqLite.csproj @@ -8,16 +8,7 @@ default Kyoo.SqLite - - - - - - - - - - + all @@ -28,14 +19,8 @@ - - - - - - diff --git a/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj b/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj index 99a49716..72b8bdec 100644 --- a/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj +++ b/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj @@ -9,15 +9,6 @@ Kyoo.TheMovieDb - - ../Kyoo/bin/$(Configuration)/$(TargetFramework)/plugins/the-moviedb - false - false - false - false - true - - @@ -27,9 +18,6 @@ - all - false - runtime diff --git a/Kyoo.TheTvdb/Kyoo.TheTvdb.csproj b/Kyoo.TheTvdb/Kyoo.TheTvdb.csproj index ac7dad56..9553bef5 100644 --- a/Kyoo.TheTvdb/Kyoo.TheTvdb.csproj +++ b/Kyoo.TheTvdb/Kyoo.TheTvdb.csproj @@ -9,15 +9,6 @@ Kyoo.TheTvdb - - ../Kyoo/bin/$(Configuration)/$(TargetFramework)/plugins/the-tvdb - false - false - false - false - true - - @@ -26,9 +17,6 @@ - all - false - runtime diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index e7f4f1b4..0185da01 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -43,6 +43,8 @@ + + diff --git a/Kyoo/Startup.cs b/Kyoo/Startup.cs index 59a14f7d..804a08f0 100644 --- a/Kyoo/Startup.cs +++ b/Kyoo/Startup.cs @@ -7,6 +7,8 @@ using Kyoo.Controllers; using Kyoo.Models.Options; using Kyoo.Postgresql; using Kyoo.Tasks; +using Kyoo.TheMovieDb; +using Kyoo.TheTvdb; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.SpaServices.AngularCli; @@ -49,7 +51,9 @@ namespace Kyoo new CoreModule(configuration), new PostgresModule(configuration, host), // new SqLiteModule(configuration, host), - new AuthenticationModule(configuration, loggerFactory, host) + new AuthenticationModule(configuration, loggerFactory, host), + new PluginTvdb(configuration), + new PluginTmdb(configuration) }); }