diff options
| -rw-r--r-- | .devcontainer/devcontainer.json | 20 | ||||
| -rw-r--r-- | Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs (renamed from Jellyfin.Server.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs) | 0 | ||||
| -rw-r--r-- | Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/PostgreSqlOptions.cs (renamed from Jellyfin.Server.Implementations/DbConfiguration/PostgreSqlOptions.cs) | 0 | ||||
| -rw-r--r-- | Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Jellyfin.Database.Providers.PgSql.csproj | 1 | ||||
| -rw-r--r-- | Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/PgSqlDesignTimeJellyfinDbFactory.cs | 3 | ||||
| -rw-r--r-- | Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs | 3 | ||||
| -rw-r--r-- | Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj | 1 |
7 files changed, 9 insertions, 19 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bcf484463..84c1dda97 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Development Jellyfin Server", - "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm", + "image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm", // restores nuget packages, installs the dotnet workloads and installs the dev https certificate "postStartCommand": "sudo dotnet restore; sudo dotnet workload update; sudo dotnet dev-certs https --trust; sudo bash \"./.devcontainer/install-ffmpeg.sh\"", // reads the extensions list and installs them @@ -13,7 +13,9 @@ }, "ghcr.io/devcontainers-contrib/features/apt-packages:1": { "preserve_apt_list": false, - "packages": ["libfontconfig1"] + "packages": [ + "libfontconfig1" + ] }, "ghcr.io/devcontainers/features/docker-in-docker:2": { "dockerDashComposeVersion": "v2" @@ -24,19 +26,5 @@ "hostRequirements": { "memory": "8gb", "cpus": 4 - }, "remoteEnv": { - "JELLYFIN_DATA_DIR": "/config" - }, - "mounts": [ - "source=/opt/docker/data/jellyfin/testConfig/,target=/config,type=bind,consistency=cached", - "source=/opt/docker/data/jellyfin/config10.9.11/metadata,target=/config/metadata,type=bind,consistency=cached", - "source=/mnt/video,target=/media,type=bind,consistency=cached" - ], - "customizations": { - "vscode": { - "extensions": [ - "alexcvzz.vscode-sqlite" - ] - } } } diff --git a/Jellyfin.Server.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs b/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs index d49d8536a..d49d8536a 100644 --- a/Jellyfin.Server.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs +++ b/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/DatabaseConfigurationOptions.cs diff --git a/Jellyfin.Server.Implementations/DbConfiguration/PostgreSqlOptions.cs b/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/PostgreSqlOptions.cs index 1f7c30b09..1f7c30b09 100644 --- a/Jellyfin.Server.Implementations/DbConfiguration/PostgreSqlOptions.cs +++ b/Jellyfin.Database/Jellyfin.Database.Implementations/DbConfiguration/PostgreSqlOptions.cs diff --git a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Jellyfin.Database.Providers.PgSql.csproj b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Jellyfin.Database.Providers.PgSql.csproj index ae1497403..785a3c63a 100644 --- a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Jellyfin.Database.Providers.PgSql.csproj +++ b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Jellyfin.Database.Providers.PgSql.csproj @@ -45,7 +45,6 @@ <ProjectReference Include="..\..\Jellyfin.Data\Jellyfin.Data.csproj" /> <ProjectReference Include="..\..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" /> <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" /> - <ProjectReference Include="..\..\Jellyfin.Server.Implementations\Jellyfin.Server.Implementations.csproj" /> </ItemGroup> </Project> diff --git a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/PgSqlDesignTimeJellyfinDbFactory.cs b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/PgSqlDesignTimeJellyfinDbFactory.cs index 8f5e2e82b..bf949d570 100644 --- a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/PgSqlDesignTimeJellyfinDbFactory.cs +++ b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/PgSqlDesignTimeJellyfinDbFactory.cs @@ -1,4 +1,3 @@ -using Jellyfin.Database.Providers.SqLite; using Jellyfin.Server.Implementations; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; @@ -20,7 +19,7 @@ namespace Jellyfin.Database.Providers.PgSql return new JellyfinDbContext( optionsBuilder.Options, NullLogger<JellyfinDbContext>.Instance, - new SqliteDatabaseProvider(null!, NullLogger<SqliteDatabaseProvider>.Instance)); + new PgSqlDatabaseProvider(null!, NullLogger<PgSqlDatabaseProvider>.Instance)); } } } diff --git a/Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs b/Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs index 091ecee98..7936c6fd9 100644 --- a/Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs +++ b/Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; +using Jellyfin.Database.Providers.PgSql; using Jellyfin.Database.Providers.SqLite; using Jellyfin.Server.Implementations.DatabaseConfiguration; using MediaBrowser.Common.Configuration; @@ -22,6 +23,7 @@ public static class ServiceCollectionExtensions private static IEnumerable<Type> DatabaseProviderTypes() { yield return typeof(SqliteDatabaseProvider); + yield return typeof(PgSqlDatabaseProvider); } private static IDictionary<string, JellyfinDbProviderFactory> GetSupportedDbProviders() @@ -75,6 +77,7 @@ public static class ServiceCollectionExtensions { DatabaseType = "Jellyfin-SqLite", }; + configurationManager.SaveConfiguration("database", efCoreConfiguration); } } diff --git a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj index b566b3489..01d9dcf64 100644 --- a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj +++ b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj @@ -37,6 +37,7 @@ <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" /> <ProjectReference Include="..\Jellyfin.Database\Jellyfin.Database.Implementations\Jellyfin.Database.Implementations.csproj" /> <ProjectReference Include="..\Jellyfin.Database\Jellyfin.Database.Providers.SqLite\Jellyfin.Database.Providers.SqLite.csproj" /> + <ProjectReference Include="..\Jellyfin.Database\Jellyfin.Database.Providers.PgSql\Jellyfin.Database.Providers.PgSql.csproj" /> </ItemGroup> </Project> |
