phares3757/immich-to-slideshow
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hurl file over http file

Browse Source 
AddControllers

Formatting
This commit is contained in:
Mike Phares
2025-09-05 19:46:16 -07:00
parent 895dab9413
commit 5d98429392
7 changed files with 209 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ImmichToSlideshow/DependencyInjection/ServiceCollectionExtensions.cs
View File

@ -6,6 +6,7 @@ namespace ImmichToSlideshow.DependencyInjection;
public static class ServiceCollectionExtensions {
public static IServiceCollection AddServices(this IServiceCollection services, AppSettings appSettings) {
_ = services.AddControllers();
_ = services.AddScoped<AssetService>();
_ = services.AddSingleton(_ => appSettings);
return services;

39
src/ImmichToSlideshow/Models/AppSettings.cs
View File

@ -11,28 +11,39 @@ public record AppSettings(string Company, Settings Settings, string URLs, string
}
private static void Verify(AppSettings appSettings) {
if (appSettings?.Company is null)
if (appSettings?.Company is null) {
throw new NullReferenceException(nameof(Company));
if (appSettings?.URLs is null)
}
if (appSettings?.URLs is null) {
throw new NullReferenceException(nameof(URLs));
if (appSettings?.WithOrigins is null)
}
if (appSettings?.WithOrigins is null) {
throw new NullReferenceException(nameof(WithOrigins));
if (appSettings?.Settings?.AddDays is null)
}
if (appSettings?.Settings?.AddDays is null) {
throw new NullReferenceException(nameof(Settings.AddDays));
if (appSettings?.Settings?.ArchivedTag is null)
}
if (appSettings?.Settings?.ArchivedTag is null) {
throw new NullReferenceException(nameof(Settings.ArchivedTag));
if (appSettings?.Settings?.ConnectionString is null)
}
if (appSettings?.Settings?.ConnectionString is null) {
throw new NullReferenceException(nameof(Settings.ConnectionString));
if (appSettings?.Settings?.DigiKam4 is null)
}
if (appSettings?.Settings?.DigiKam4 is null) {
throw new NullReferenceException(nameof(Settings.DigiKam4));
if (appSettings?.Settings?.FilterTags is null)
}
if (appSettings?.Settings?.FilterTags is null) {
throw new NullReferenceException(nameof(Settings.FilterTags));
if (appSettings?.Settings?.ImmichUploadDirectory is null)
}
if (appSettings?.Settings?.ImmichUploadDirectory is null) {
throw new NullReferenceException(nameof(Settings.ImmichUploadDirectory));
if (appSettings?.Settings?.RandomResultsDirectory is null)
}
if (appSettings?.Settings?.RandomResultsDirectory is null) {
throw new NullReferenceException(nameof(Settings.RandomResultsDirectory));
if (appSettings?.Settings?.SyncDirectory is null)
}
if (appSettings?.Settings?.SyncDirectory is null) {
throw new NullReferenceException(nameof(Settings.SyncDirectory));
}
}
public static AppSettings Get(IConfigurationRoot configurationRoot) {
@ -46,10 +57,12 @@ public record AppSettings(string Company, Settings Settings, string URLs, string
if (company is null || settings is null || urls is null || withOrigins is null) {
List<string> paths = [];
foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers) {
if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider) {
continue;
if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
}
if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider) {
continue;
}
paths.Add(physicalFileProvider.Root);
}
throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");

1
src/ImmichToSlideshow/Program.cs
View File

@ -10,7 +10,6 @@ public class Program {
WebApplicationBuilder webApplicationBuilder = WebApplication.CreateBuilder(args);
_ = webApplicationBuilder.Configuration.AddUserSecrets<Program>();
AppSettings appSettings = AppSettings.Get(webApplicationBuilder.Configuration);
_ = webApplicationBuilder.Services.AddControllers();
_ = webApplicationBuilder.Services.AddServices(appSettings);
WebApplication webApplication = webApplicationBuilder.Build();
ILogger<Program>? logger = webApplication.Services.GetRequiredService<ILogger<Program>>();

2
src/ImmichToSlideshow/Services/CommandText.cs
View File

@ -79,7 +79,7 @@ internal static class CommandText {
} else {
results.Add(" FROM public.asset a ");
}
results.AddRange(" INNER ");
results.Add(" INNER ");
if (lowestVersionHistory <= 1.129) {
results.Add(" JOIN asset_files f ");
} else {