From fb95a2b11c5d4ccca91a542d12508fa715ef0f02 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 4 Mar 2021 12:22:38 +0100 Subject: [PATCH 1/6] Updating dotnet version in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a6f1ed6..5045bc9f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Both of theses repository are needed to fully build Kyoo, when you clone this re ## Development & Build -To develop for Kyoo, you will need the .NET 3.1 SDK, node & npm for the webapp and cmake & gcc for the transcoder. +To develop for Kyoo, you will need the .NET 5.0 SDK, node & npm for the webapp and cmake & gcc for the transcoder. To run the development server, simply open the .sln file with your favorite C# IDE (like Jetbrain's Rider or Visual Studio) and press run or you can use the CLI and use the ```dotnet run -p Kyoo``` command. From dac18e42b1e83fc5ed6283ce79928c3f692f71ee Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 4 Mar 2021 14:04:54 +0100 Subject: [PATCH 2/6] Adding postgresql informations on the readme. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5045bc9f..657c417e 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Both of theses repository are needed to fully build Kyoo, when you clone this re ## Development & Build To develop for Kyoo, you will need the .NET 5.0 SDK, node & npm for the webapp and cmake & gcc for the transcoder. +You will also need a running postgresql instance with a user named `kyoo` (you can create a user with this command: ```sudo -u postgres createuser -d kyoo```) To run the development server, simply open the .sln file with your favorite C# IDE (like Jetbrain's Rider or Visual Studio) and press run or you can use the CLI and use the ```dotnet run -p Kyoo``` command. @@ -35,7 +36,7 @@ To pack the application, run the ```dotnet publish -c Release -o Ky ## Plugins -You can create plugins for Kyoo. To do that, create a C# Library project targetting the .Net Core 3.1 and install the [Kyoo.Common](https://www.nuget.org/packages/Kyoo.Common) package and implement the IPlugin interface. +You can create plugins for Kyoo. To do that, create a C# Library project targetting the .Net Core 5 and install the [Kyoo.Common](https://www.nuget.org/packages/Kyoo.Common) package and implement the IPlugin interface. You can create Tasks which can be started manually or automatically at startup or every X hours. You can also create metadata providers that will be used to get informations about shows, seasons, episodes & people. You can find an exemple of metadata provider [here](https://github.com/AnonymusRaccoon/Kyoo.TheMovieDB). From 1b1eafb9018109ae059b56fa52ea94cf3e3d1c64 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 4 Mar 2021 18:28:33 +0100 Subject: [PATCH 3/6] Removing ffmpeg's dependencies --- transcoder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transcoder b/transcoder index 2d15a6ce..3885dca7 160000 --- a/transcoder +++ b/transcoder @@ -1 +1 @@ -Subproject commit 2d15a6cea98639e286083c96443f56a354ed2002 +Subproject commit 3885dca743bbde5d83cb3816646455856fc5c316 From 44323f42e7dba17df254ba6c6d1b0e9739f970de Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 4 Mar 2021 22:56:14 +0100 Subject: [PATCH 4/6] Adding an automatic symlink for the Angular's app --- Kyoo/Kyoo.csproj | 9 +++++---- Kyoo/Startup.cs | 2 -- Kyoo/Views/WebClient | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index 5ab21e23..607e76e8 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -12,6 +12,7 @@ false + SDG Zoe Roux https://github.com/AnonymusRaccoon/Kyoo @@ -88,6 +89,10 @@ + + + + @@ -103,8 +108,4 @@ PreserveNewest - - - - diff --git a/Kyoo/Startup.cs b/Kyoo/Startup.cs index 4eaa185c..9a029e5b 100644 --- a/Kyoo/Startup.cs +++ b/Kyoo/Startup.cs @@ -199,9 +199,7 @@ namespace Kyoo spa.Options.SourcePath = Path.Join(AppDomain.CurrentDomain.BaseDirectory, "Views/WebClient"); if (env.IsDevelopment()) - { spa.UseAngularCliServer("start"); - } }); } } diff --git a/Kyoo/Views/WebClient b/Kyoo/Views/WebClient index 09edd091..57d382f7 160000 --- a/Kyoo/Views/WebClient +++ b/Kyoo/Views/WebClient @@ -1 +1 @@ -Subproject commit 09edd091b9bc75b697da4dc16eeaf9aadb9d4b05 +Subproject commit 57d382f7246287a611892359e444355e745d0795 From b86a977262a04199cafd21b7e6a5689c3cf400cb Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 4 Mar 2021 23:25:56 +0100 Subject: [PATCH 5/6] Setting default environement to debug if configuration is --- Kyoo/Program.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Kyoo/Program.cs b/Kyoo/Program.cs index bc6ef89b..474a79b3 100644 --- a/Kyoo/Program.cs +++ b/Kyoo/Program.cs @@ -17,7 +17,7 @@ namespace Kyoo File.Copy(Path.Join(AppDomain.CurrentDomain.BaseDirectory, "appsettings.json"), "appsettings.json"); - bool? debug = Environment.GetEnvironmentVariable("ENVIRONEMENT")?.ToLowerInvariant() switch + bool? debug = Environment.GetEnvironmentVariable("ENVIRONMENT")?.ToLowerInvariant() switch { "d" => true, "dev" => true, @@ -29,8 +29,11 @@ namespace Kyoo _ => null }; - if (debug == null) - Console.WriteLine($"Invalid ENVIRONEMENT variable. Supported values are \"debug\" and \"prod\". Ignoring..."); + if (debug == null && Environment.GetEnvironmentVariable("ENVIRONMENT") != null) + Console.WriteLine($"Invalid ENVIRONMENT variable. Supported values are \"debug\" and \"prod\". Ignoring..."); + #if DEBUG + debug ??= true; + #endif Console.WriteLine($"Running as {Environment.UserName}."); IWebHostBuilder host = CreateWebHostBuilder(args); From 13d1b4904f085c3d58b9370f26246add01643426 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 15 Mar 2021 22:17:11 +0100 Subject: [PATCH 6/6] Adding screenshots --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 657c417e..f58d0a22 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,22 @@ Kyoo has been created from scratch, it is not a fork. Everything is and always w Feel free to open issues or pull requests, all contribution are welcomed. +## Screens +![Show](../screens/show.png?raw=true) +- - - +![Show Dropdown](../screens/show_dropdown.png?raw=true) +- - - +![Browse](../screens/browse.png?raw=true) +- - - +![Filters](../screens/filters.png?raw=true) +- - - +![People](../screens/people.png?raw=true) +- - - +![Player](../screens/player.png?raw=true) +- - - +![Search](../screens/search.png?raw=true) + + ## Installation If you are using a linux distribution with acess to the AUR, simply install the kyoo-bin package. **COMMING SOON**. The package is not published on the AUR yet but you can built it easily with makepkg. To do so, clone the repo & run `makepkg -i` inside the `install/aur` directory.