From b7acae88b5a2a276ea64dc209ec1506ad4edf957 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sat, 14 Aug 2021 15:35:00 +0200
Subject: [PATCH] csproj: Reworking static file packing

---
 .../Kyoo.Authentication.csproj                | 20 +++++--------------
 Kyoo.WebApp                                   |  2 +-
 Kyoo/Kyoo.csproj                              |  1 +
 Kyoo/PluginsStartup.cs                        |  3 +++
 Kyoo/Program.cs                               |  2 ++
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Kyoo.Authentication/Kyoo.Authentication.csproj b/Kyoo.Authentication/Kyoo.Authentication.csproj
index 47113130..3be97dff 100644
--- a/Kyoo.Authentication/Kyoo.Authentication.csproj
+++ b/Kyoo.Authentication/Kyoo.Authentication.csproj
@@ -21,20 +21,10 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<LoginFiles Include="$(LoginRoot)**" Visible="false" />
+		<None Remove="$(LoginRoot)**;" />
+		<Content Include="$(LoginRoot)**">
+			<Link>login/%(RecursiveDir)%(Filename)%(Extension)</Link>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
 	</ItemGroup>
-	
-	<Target Name="Publish login files" AfterTargets="ComputeFilesToPublish">
-		<ItemGroup>
-			<ResolvedFileToPublish Include="@(LoginFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
-				<RelativePath>login/%(LoginFiles.RecursiveDir)%(LoginFiles.Filename)%(LoginFiles.Extension)</RelativePath>
-				<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-				<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-			</ResolvedFileToPublish>
-		</ItemGroup>
-	</Target>
-
-	<Target Name="Prepare static files" AfterTargets="Build" Condition="$(Configuration) == 'Debug'">
-		<Copy SourceFiles="@(LoginFiles)" DestinationFolder="$(OutputPath)/login/%(RecursiveDir)" />
-	</Target>
 </Project>
diff --git a/Kyoo.WebApp b/Kyoo.WebApp
index dc37ce39..49cf0c3d 160000
--- a/Kyoo.WebApp
+++ b/Kyoo.WebApp
@@ -1 +1 @@
-Subproject commit dc37ce398d6c9cacc7703e21552a116c42b548ed
+Subproject commit 49cf0c3d17f889f40fa9adbb383edfc0d2c99779
diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj
index 37200c34..425968d3 100644
--- a/Kyoo/Kyoo.csproj
+++ b/Kyoo/Kyoo.csproj
@@ -49,6 +49,7 @@
 			  Command="mkdir -p build %26%26 cd build %26%26 cmake .. %26%26 make -j" />
 		<Exec WorkingDirectory="$(TranscoderRoot)" Condition="'$(IsWindows)' == 'true'" 
 			  Command="(if not exist build mkdir build) %26%26 cd build %26%26 cmake .. -G &quot;NMake Makefiles&quot; %26%26 nmake" />
+		<!--TODO maybe don't copy the transcoder binary to the project root but directly copy it to the output folder (maybe a none include outside of the project)-->
 		<Copy SourceFiles="$(TranscoderRoot)/build/$(TranscoderBinary)" DestinationFolder="." />
 	</Target>
 	
diff --git a/Kyoo/PluginsStartup.cs b/Kyoo/PluginsStartup.cs
index 22ba3e18..c13c9364 100644
--- a/Kyoo/PluginsStartup.cs
+++ b/Kyoo/PluginsStartup.cs
@@ -10,6 +10,7 @@ using Kyoo.SqLite;
 using Kyoo.Tasks;
 using Kyoo.TheMovieDb;
 using Kyoo.TheTvdb;
+using Kyoo.WebApp;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -46,8 +47,10 @@ namespace Kyoo
 		{
 			_plugins = plugins;
 			_configuration = configuration;
+			// TODO enable the web app only if it was build with it.
 			_plugins.LoadPlugins(
 				typeof(CoreModule), 
+				typeof(WebAppModule),
 				typeof(AuthenticationModule),
 				typeof(PostgresModule),
 				typeof(SqLiteModule),
diff --git a/Kyoo/Program.cs b/Kyoo/Program.cs
index cd16ca95..4eaa4eeb 100644
--- a/Kyoo/Program.cs
+++ b/Kyoo/Program.cs
@@ -33,6 +33,8 @@ namespace Kyoo
 			
 			IHostBuilder builder = CreateWebHostBuilder(args);
 			
+			// TODO remove ENVIRONEMENT handling and force it to the build env
+			
 			bool? debug = Environment.GetEnvironmentVariable("ENVIRONMENT")?.ToLowerInvariant() switch
 			{
 				"d" => true,