requests/ImmichToSlideshow.http

@@ -24,9 +24,4 @@ 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

src/ImmichToSlideshow/Controllers/AssetsController.cs

@@ -35,8 +35,4 @@ public class AssetsController(AssetService assetService) : ControllerBase
     public IActionResult SyncImmich(Guid ownerId) =>
         Ok(_AssetService.SyncImmich(ownerId));
 
-    [HttpGet("{ownerId:guid}/set-archive-immich")]
-    public IActionResult SetArchiveImmich(Guid ownerId) =>
-        Ok(_AssetService.SetArchiveImmich(ownerId));
-
 }

src/ImmichToSlideshow/Models/AppSettings.cs

@@ -6,8 +6,6 @@ namespace ImmichToSlideshow.Models;
 public record AppSettings(int AddDays,
                           string Company,
                           string ConnectionString,
-                          string CurrentCommit,
-                          string CurrentResultsDirectory,
                           string ImmichUploadDirectory,
                           string RandomResultsDirectory,
                           string SyncDirectory,

src/ImmichToSlideshow/Models/Binder/AppSettings.cs

@@ -9,8 +9,6 @@ public class AppSettings
     public int? AddDays { get; set; }
     public string? Company { get; set; }
     public string? ConnectionString { get; set; }
-    public string? CurrentCommit { get; set; }
-    public string? CurrentResultsDirectory { get; set; }
     public string? ImmichUploadDirectory { get; set; }
     public string? RandomResultsDirectory { get; set; }
     public string? SyncDirectory { get; set; }
@@ -47,8 +45,6 @@ public class AppSettings
         if (appSettings?.AddDays is null) throw new NullReferenceException(nameof(appSettings.AddDays));
         if (appSettings?.Company is null) throw new NullReferenceException(nameof(appSettings.Company));
         if (appSettings?.ConnectionString is null) throw new NullReferenceException(nameof(appSettings.ConnectionString));
-        if (appSettings?.CurrentCommit is null) throw new NullReferenceException(nameof(appSettings.CurrentCommit));
-        if (appSettings?.CurrentResultsDirectory is null) throw new NullReferenceException(nameof(appSettings.CurrentResultsDirectory));
         if (appSettings?.ImmichUploadDirectory is null) throw new NullReferenceException(nameof(appSettings.ImmichUploadDirectory));
         if (appSettings?.RandomResultsDirectory is null) throw new NullReferenceException(nameof(appSettings.RandomResultsDirectory));
         if (appSettings?.SyncDirectory is null) throw new NullReferenceException(nameof(appSettings.SyncDirectory));
@@ -58,8 +54,6 @@ public class AppSettings
         result = new(appSettings.AddDays.Value,
                      appSettings.Company,
                      appSettings.ConnectionString,
-                     appSettings.CurrentCommit,
-                     appSettings.CurrentResultsDirectory,
                      appSettings.ImmichUploadDirectory,
                      appSettings.RandomResultsDirectory,
                      appSettings.SyncDirectory,

src/ImmichToSlideshow/Models/Identifier.cs

@@ -1,33 +0,0 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace ImmichToSlideshow.Models;
-
-public sealed record Identifier(string[] DirectoryNames,
-                                string Extension,
-                                bool? HasDateTimeOriginal,
-                                int Id,
-                                long Length,
-                                string PaddedId,
-                                long Ticks)
-{
-
-    public override string ToString()
-    {
-        string result = JsonSerializer.Serialize(this, IdentifierSourceGenerationContext.Default.Identifier);
-        return result;
-    }
-
-}
-
-[JsonSourceGenerationOptions(WriteIndented = true)]
-[JsonSerializable(typeof(Identifier))]
-public partial class IdentifierSourceGenerationContext : JsonSerializerContext
-{
-}
-
-[JsonSourceGenerationOptions(WriteIndented = true)]
-[JsonSerializable(typeof(Identifier[]))]
-public partial class IdentifierCollectionSourceGenerationContext : JsonSerializerContext
-{
-}

src/ImmichToSlideshow/Services/AssetService.cs

@@ -89,7 +89,6 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings)
         results.Add("     AND a.\"type\" = 'IMAGE' ");
         results.Add("     AND f.\"type\" = 'preview' ");
         results.Add("     AND a.\"duplicateId\" is null ");
-        results.Add("     AND a.\"isArchived\" = false ");
         results.Add("     AND a.\"isExternal\" = true ");
         results.Add("     AND a.\"isOffline\" = false ");
         results.Add("     AND a.\"isVisible\" = true ");
@@ -98,36 +97,6 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings)
         return string.Join(Environment.NewLine, results);
     } // cSpell:enable
 
-    private static string SetAssetArchivedCommandText(string deviceAssetIds)
-    { // cSpell:disable
-        List<string> results = new();
-        results.Add(" UPDATE assets ");
-        results.Add("    SET \"isArchived\" = true ");
-        results.Add("  WHERE \"isArchived\" = false ");
-        results.Add("    AND \"type\" = 'IMAGE' ");
-        results.Add("    AND \"ownerId\" = @ownerId ");
-        results.Add("    AND \"deviceAssetId\" in ( ");
-        results.Add(deviceAssetIds);
-        results.Add("                             ) ");
-        return string.Join(Environment.NewLine, results);
-    } // cSpell:enable
-
-    private static int? ExecuteNonQuery(string connectionString, string commandText, NpgsqlParameter[] npgsqlParameters)
-    {
-        int? result;
-        if (string.IsNullOrEmpty(connectionString))
-            result = null;
-        else
-        {
-            using NpgsqlConnection npgsqlConnection = new(connectionString);
-            npgsqlConnection.Open();
-            using NpgsqlCommand npgsqlCommand = new(commandText, npgsqlConnection);
-            npgsqlCommand.Parameters.AddRange(npgsqlParameters);
-            result = npgsqlCommand.ExecuteNonQuery();
-        }
-        return result;
-    }
-
     private static StringBuilder GetForJsonPath(string connectionString, string commandText, NpgsqlParameter[] npgsqlParameters)
     {
         StringBuilder result = new();
@@ -252,37 +221,4 @@ public class AssetService(ILogger<Program> logger, AppSettings appSettings)
         return results.AsReadOnly();
     }
 
-    public ReadOnlyCollection<int> SetArchiveImmich(Guid ownerId)
-    {
-        List<int> results;
-        string checkDirectory = Path.Combine(_AppSettings.CurrentResultsDirectory, "B)Metadata", _AppSettings.CurrentCommit, "[]");
-        if (!Directory.Exists(checkDirectory))
-            results = null;
-        else
-        {
-            string checkFile = Path.Combine(checkDirectory, "!9.json");
-            if (!File.Exists(checkFile))
-                results = null;
-            else
-            {
-                string json = File.ReadAllText(checkFile);
-                Identifier[]? identifiers = JsonSerializer.Deserialize<Identifier[]>(json);
-                if (identifiers is null || identifiers.Length == 0)
-                    results = null;
-                else
-                {
-                    string deviceAssetIds = $"'{string.Join($"',{Environment.NewLine}'", identifiers.Select(l => $"{l.PaddedId}{l.Extension}").ToArray())}'";
-                    string commandText = SetAssetArchivedCommandText(deviceAssetIds);
-                    NpgsqlParameter[] npgsqlParameters = [new NpgsqlParameter(nameof(ownerId), ownerId)];
-                    int? result = ExecuteNonQuery(_AppSettings.ConnectionString, commandText, npgsqlParameters);
-                    if (result is null)
-                        results = null;
-                    else
-                        results = [result.Value];
-                }
-            }
-        }
-        return results?.AsReadOnly();
-    }
-
 }