Birthday

hurl file over http file

AddControllers

Formatting

.editorconfig

@@ -28,7 +28,7 @@ csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_open_brace = none
 csharp_new_line_between_query_expression_clauses = true
-csharp_prefer_braces = false
+csharp_prefer_braces = true
 csharp_prefer_qualified_reference = true:error
 csharp_prefer_simple_default_expression = true:warning
 csharp_prefer_simple_using_statement = true:warning

.vscode/launch.json

@@ -8,7 +8,7 @@
             "name": ".NET Core Launch (console)",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build",
+            "preLaunchTask": "Build",
             "program": "${workspaceFolder}/src/ImmichToSlideshow/bin/Debug/net9.0/ImmichToSlideshow.dll",
             "args": [
                 "s",

.vscode/settings.json

@@ -1,4 +1,11 @@
 {
+  "files.associations": {
+    "*.ffs_gui": "xml",
+    "*.hurl": "http",
+    "*.org": "ini",
+    "*.net": "ini",
+    "default": "ini"
+  },
   "[markdown]": {
     "editor.wordWrap": "off"
   },

.vscode/tasks.json

@@ -43,7 +43,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Format-Whitespaces",
+            "label": "Format Whitespaces",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -53,7 +53,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "build",
+            "label": "Build",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -65,7 +65,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "publish",
+            "label": "Publish",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -77,7 +77,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "watch",
+            "label": "Watch",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -89,7 +89,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-login",
+            "label": "Podman Login",
             "command": "podman",
             "type": "process",
             "args": [
@@ -99,7 +99,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-compose-up-build",
+            "label": "Podman Compose Up Build",
             "command": "podman",
             "type": "process",
             "args": [
@@ -110,7 +110,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-build",
+            "label": "Podman Build",
             "command": "podman",
             "type": "process",
             "args": [
@@ -122,7 +122,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-image-list",
+            "label": "Podman Image List",
             "command": "podman",
             "type": "process",
             "args": [
@@ -132,7 +132,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-run",
+            "label": "Podman Run",
             "command": "podman",
             "type": "process",
             "args": [
@@ -146,18 +146,18 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-tag",
+            "label": "Podman Tag",
             "command": "podman",
             "type": "process",
             "args": [
                 "tag",
-                "asdf",
+                "3f9eac99b7cf0710c5d762322ce4ded3f57fc008ee8310757760bb78ad8e029f",
                 "gitea.phares.duckdns.org:443/phares3757/immich-to-slideshow:latest"
             ],
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "podman-push",
+            "label": "Podman Push",
             "command": "podman",
             "type": "process",
             "args": [

requests/ImmichToSlideshow.http

@@ -1,46 +0,0 @@
-@host = http://0.0.0.0:5001
-
-GET {{host}}/api/v1/assets/columns/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/owner-ids/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}/random-paths/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}/save-random-paths/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}/sync-immich/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}/set-archive-immich/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}/set-digi-kam-4-archive-immich/
-Accept: application/json
-
-###
-
-GET {{host}}/api/v1/assets/{{ownerId}}/archived-tag/
-Accept: application/json
-
-###

requests/ImmichToSlideshow.hurl

@@ -0,0 +1,80 @@
+GET http://127.0.0.1:5001/api/v1/assets/columns/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/owner-ids/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/random-paths/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/save-random-paths/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/sync-immich/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/set-archive-immich/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/set-digi-kam-4-archive-immich/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###
+
+GET http://127.0.0.1:5001/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/archived-tag/
+Accept: application/json
+
+HTTP 200
+[Asserts]
+header "Content-Type" == "application/json"
+
+###

src/ImmichToSlideshow/Controllers/AssetsController.cs

@@ -25,15 +25,15 @@ public class AssetsController(AssetService assetService) : ControllerBase {
 
     [HttpGet("{ownerId:guid}/random-paths")]
     public IActionResult GetRandomPaths(Guid ownerId) =>
-        Ok(_AssetService.GetRandomPaths(ownerId));
+        Ok(_AssetService.GetRandomPaths(ownerId, monthDay: null));
 
     [HttpGet("{ownerId:guid}/archived-tag")]
     public IActionResult GetArchivedTag(Guid ownerId) =>
         Content(_AssetService.GetArchivedTag(ownerId) ?? string.Empty, _ContentType);
 
     [HttpGet("{ownerId:guid}/save-random-paths")]
-    public IActionResult SaveRandomPaths(Guid ownerId) =>
-        Content(_AssetService.SaveRandomPaths(ownerId) ?? string.Empty, _ContentType);
+    public IActionResult SaveRandomPaths(Guid ownerId, string? month_day) =>
+        Content(_AssetService.SaveRandomPaths(ownerId, monthDay: month_day) ?? string.Empty, _ContentType);
 
     [HttpGet("{ownerId:guid}/sync-immich")]
     public IActionResult SyncImmich(Guid ownerId) =>

src/ImmichToSlideshow/DependencyInjection/ServiceCollectionExtensions.cs

@@ -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;

src/ImmichToSlideshow/Models/AppSettings.cs

@@ -11,29 +11,46 @@ 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?.BirthdayFormat is null) {
+            throw new NullReferenceException(nameof(Settings.BirthdayFormat));
+        }
+        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?.People is null) {
+            throw new NullReferenceException(nameof(Settings.People));
+        }
+        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) {
         AppSettings result;
@@ -46,10 +63,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())}");

src/ImmichToSlideshow/Models/Settings.cs

@@ -5,12 +5,14 @@ namespace ImmichToSlideshow.Models;
 
 public record Settings(int AddDays,
                        string ArchivedTag,
+                       string BirthdayFormat,
                        string ConnectionString,
                        DigiKam4? DigiKam4,
                        string[] FilterTags,
                        string ImmichUploadDirectory,
                        float LowestVersionHistory,
                        string NotNinePath,
+                       Dictionary<string, string> People,
                        string RandomResultsDirectory,
                        string SyncDirectory) {
 

src/ImmichToSlideshow/Program.cs

@@ -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>>();

src/ImmichToSlideshow/Services/AssetService.cs

@@ -69,8 +69,9 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings) {
 
     public string? GetAssets(Guid ownerId) {
         string result;
+        ReadOnlyCollection<string> people = Array.Empty<string>().AsReadOnly();
         NpgsqlParameter[] npgsqlParameters = [new NpgsqlParameter(nameof(ownerId), ownerId)];
-        string commandText = CommandText.GetAssetActiveImagePreviewNotDuplicate(_Settings.LowestVersionHistory, _Settings.FilterTags);
+        string commandText = CommandText.GetAssetActiveImagePreviewNotDuplicate(_Settings.LowestVersionHistory, _Settings.FilterTags.AsReadOnly(), people);
         StringBuilder stringBuilder = GetForJsonPath(_Settings.ConnectionString, commandText, npgsqlParameters.AsReadOnly());
         result = stringBuilder.ToString();
         if (result.Length == 1) {
@@ -79,13 +80,31 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings) {
         return result;
     }
 
-    public ReadOnlyCollection<string>? GetRandomPaths(Guid ownerId) {
+    public ReadOnlyCollection<string>? GetRandomPaths(Guid ownerId, string? monthDay) {
         string[]? results;
-        NpgsqlParameter[] npgsqlParameters = [new NpgsqlParameter(nameof(ownerId), ownerId)];
-        string commandText = CommandText.GetAssetActiveImagePreviewNotDuplicate(_Settings.LowestVersionHistory, _Settings.FilterTags);
-        StringBuilder stringBuilder = GetForJsonPath(_Settings.ConnectionString, commandText, npgsqlParameters.AsReadOnly());
-        string json = stringBuilder.ToString();
+        string commandText;
         Random random = new();
+        List<string> people = [];
+        StringBuilder stringBuilder;
+        if (!string.IsNullOrEmpty(monthDay)) {
+            foreach (KeyValuePair<string, string> keyValuePair in _Settings.People) {
+                if (!keyValuePair.Key.Contains(monthDay)) {
+                    continue;
+                }
+                people.Add($"People/{keyValuePair.Value.Trim('/')}");
+            }
+        }
+        try {
+            NpgsqlParameter[] npgsqlParameters = [new NpgsqlParameter(nameof(ownerId), ownerId)];
+            commandText = CommandText.GetAssetActiveImagePreviewNotDuplicate(_Settings.LowestVersionHistory, _Settings.FilterTags.AsReadOnly(), people.AsReadOnly());
+            stringBuilder = GetForJsonPath(_Settings.ConnectionString, commandText, npgsqlParameters.AsReadOnly());
+        } catch (Exception) {
+            people.Clear();
+            NpgsqlParameter[] npgsqlParameters = [new NpgsqlParameter(nameof(ownerId), ownerId)];
+            commandText = CommandText.GetAssetActiveImagePreviewNotDuplicate(_Settings.LowestVersionHistory, _Settings.FilterTags.AsReadOnly(), people.AsReadOnly());
+            stringBuilder = GetForJsonPath(_Settings.ConnectionString, commandText, npgsqlParameters.AsReadOnly());
+        }
+        string json = stringBuilder.ToString();
         string ownerIdValue = ownerId.ToString();
         Asset[]? assets = JsonSerializer.Deserialize(json, AssetCollectionSourceGenerationContext.Default.AssetArray);
         results = assets is null ? null : (from l in assets orderby random.NextSingle() select l.Path.Split(ownerIdValue)[1]).ToArray();
@@ -114,19 +133,25 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings) {
         return result;
     }
 
-    public string? SaveRandomPaths(Guid ownerId) {
-        string? results;
+    public string? SaveRandomPaths(Guid ownerId, string? monthDay) {
+        string? results = null;
+        FileInfo fileInfo;
         DateTime dateTime = DateTime.Now;
-        string tomorrow = dateTime.AddDays(1).ToString("MM-dd");
+        ReadOnlyCollection<string>? paths;
+        bool? check = monthDay is null ? null : monthDay == "00-00";
         if (Directory.Exists(_Settings.RandomResultsDirectory)) {
             _ = Directory.CreateDirectory(_Settings.RandomResultsDirectory);
         }
-        FileInfo fileInfo = new(Path.Combine(_Settings.RandomResultsDirectory, $"{tomorrow}.json"));
+        for (int i = 0; i < 366; i++) {
+            if (check is null || check.Value) {
+                monthDay = i == 0 && check is not null && check.Value ? "02-29" : dateTime.AddDays(i).ToString("MM-dd");
+            }
+            fileInfo = new(Path.Combine(_Settings.RandomResultsDirectory, $"{monthDay}.json"));
             if (fileInfo.Exists && fileInfo.CreationTime > dateTime.AddDays(_Settings.AddDays)) {
                 results = null;
             } else {
                 _Logger.LogDebug("Writing <{FullName}>", fileInfo.FullName);
-            ReadOnlyCollection<string>? paths = GetRandomPaths(ownerId);
+                paths = GetRandomPaths(ownerId, monthDay);
                 if (paths is null) {
                     results = null;
                 } else {
@@ -135,6 +160,10 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings) {
                     File.WriteAllText(fileInfo.FullName, results);
                 }
             }
+            if (check is null || !check.Value) {
+                break;
+            }
+        }
         return results;
     }
 

src/ImmichToSlideshow/Services/CommandText.cs

@@ -1,3 +1,5 @@
+using System.Collections.ObjectModel;
+
 namespace ImmichToSlideshow.Services;
 
 internal static class CommandText {
@@ -40,7 +42,7 @@ internal static class CommandText {
         return string.Join(Environment.NewLine, results);
     } // cSpell:enable
 
-    internal static string GetAssetActiveImagePreviewNotDuplicate(float lowestVersionHistory, string[] filterTags) { // cSpell:disable
+    internal static string GetAssetActiveImagePreviewNotDuplicate(float lowestVersionHistory, ReadOnlyCollection<string> filterTags, ReadOnlyCollection<string> people) { // cSpell:disable
         List<string> results = [
             " SELECT json_agg(j) ",
             " FROM ( ",
@@ -79,7 +81,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 {
@@ -107,7 +109,28 @@ internal static class CommandText {
         results.AddRange([
             "         ON g.\"tagsId\" = t.\"id\" ",
             $"         WHERE t.\"value\" in ('{string.Join("','", filterTags)}') ",
-            "     ) ",
+            "     ) "]);
+        if (people.Count > 0) {
+            results.AddRange([
+                "     AND a.\"id\" in ( ",
+                "         SELECT \"assetsId\" "
+            ]);
+            if (lowestVersionHistory <= 1.129) {
+                results.Add("         FROM tag_asset g ");
+            } else {
+                results.Add("         FROM public.tag_asset g ");
+            }
+            if (lowestVersionHistory <= 1.129) {
+                results.Add("         JOIN tags t ");
+            } else {
+                results.Add("         JOIN public.tag t ");
+            }
+            results.AddRange([
+                "         ON g.\"tagsId\" = t.\"id\" ",
+                $"         WHERE t.\"value\" in ('{string.Join("','", people)}') ",
+                "     ) "]);
+        }
+        results.AddRange([
             "     AND a.\"isExternal\" = true ",
             "     AND a.\"isOffline\" = false ",
             "     AND a.\"ownerId\" = @ownerId ",