server use json or env, update compose, add example env

Author: JW-CH

.dockerignore

@@ -30,3 +30,12 @@
 **/values.dev.yaml
 LICENSE
 README.md
+
+
+docker/
+design/
+ImmichFrame/
+ImmichFrame.Android/
+ImmichFrame.Desktop/
+Makefile
+PrivacyPolicy.md

ImmichFrame.WebApi/Models/Settings.cs

@@ -25,7 +25,7 @@ public Settings()
                 Albums = env["Albums"]?.ToString()?.Split(',').Select(x => new Guid(x)).ToList() ?? new();
                 ExcludedAlbums = env["ExcludedAlbums"]?.ToString()?.Split(',').Select(x => new Guid(x)).ToList() ?? new();
                 People = env["People"]?.ToString()?.Split(',').Select(x => new Guid(x)).ToList() ?? new();
-                RefreshAlbumPeopleInterval = Convert.ToInt32(env["RefreshAlbumPeopleInterval"]);
+                RefreshAlbumPeopleInterval = Convert.ToInt32(env["RefreshAlbumPeopleInterval"] ?? 12);
                 ImmichFrameAlbumName = env["ImmichFrameAlbumName"]?.ToString() ?? string.Empty;
             }
             catch (Exception ex)

ImmichFrame.WebApi/Program.cs

@@ -1,17 +1,40 @@
+using ImmichFrame.Core.Exceptions;
 using ImmichFrame.Core.Helpers;
 using ImmichFrame.Core.Logic;
 using ImmichFrame.WebApi.Models;
+using System.Text.Json;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 
-builder.Services.AddSingleton(srv =>
+
+var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config", "Settings.json");
+
+Console.WriteLine(settingsPath);
+
+Settings? settings = null;
+
+if (File.Exists(settingsPath))
 {
-    var settings = new Settings();
+    var json = File.ReadAllText(settingsPath);
+    JsonDocument doc;
+    try
+    {
+        doc = JsonDocument.Parse(json);
+    }
+    catch (Exception ex)
+    {
+        throw new SettingsNotValidException($"Problem with parsing the settings: {ex.Message}", ex);
+    }
+
+    settings = JsonSerializer.Deserialize<Settings>(doc);
+}
 
+builder.Services.AddSingleton(srv =>
+{
     if (settings == null)
-        throw new FileNotFoundException();
+        settings = new Settings();
 
     return new ImmichFrameLogic(settings);
 });

README.Docker.md

@@ -0,0 +1 @@
+.env

docker/.gitignore

@@ -5,6 +5,7 @@ services:
       target: dev
     ports:
       - 8080:8080
-    volumes:
-      - ~/immichFrame_Config:/app/Config
+    env_file:
+      - .env
+    # volumes:
       # - PATH/TO/CONFIG:/app/Config

docker/docker-compose.dev.yml

@@ -4,9 +4,11 @@ services:
     container_name: immichframe
     image: ghcr.io/immichframe/immichframe:main
     restart: on-failure
-    volumes:
-      - PATH/TO/CONFIG:/app/Config
+    # volumes:
+    #   - PATH/TO/CONFIG:/app/Config
     ports:
       - "8080:8080"
+    env_file:
+      - .env
     environment:
       TZ: "Europe/Berlin"

docker/docker-compose.yml

@@ -0,0 +1,33 @@
+ImmichServerUrl=URL
+ApiKey=KEY
+ImageStretch=Uniform
+Margin=0,0,0,0
+Interval=10
+TransitionDuration=2
+DownloadImages=false
+ShowMemories=false
+RenewImagesDuration=30
+Albums=ALBUM1,ALBUM2
+ExcludedAlbums=ALBUM3,ALBUM4
+People=PERSON1,PERSON2
+RefreshAlbumPeopleInterval=12
+ImmichFrameAlbumName=
+ShowClock=true
+ClockFontSize=36
+ClockFormat=HH:mm:ss
+ShowPhotoDate=true
+PhotoDateFontSize=24
+PhotoDateFormat=yyyy-MM-dd
+ShowImageDesc=true
+ImageDescFontSize=24
+ShowImageLocation=true
+ImageLocationFormat=City,State,Country
+ImageLocationFontSize=16
+FontColor=#FF5733
+WeatherApiKey=
+ShowWeatherDescription=true
+WeatherFontSize=24
+UnitSystem=imperial
+WeatherLatLong=
+Language=en
+UnattendedMode=false

docker/example.env

@@ -100,6 +100,7 @@
 		<ProgressBar
 			autoplay
 			hidden={false}
+			location={ProgressBarLocation.Bottom}
 			duration={45}
 			bind:this={progressBar}
 			bind:status={progressBarStatus}

immichFrame.Web/src/lib/components/home-page/home-page.svelte

@@ -0,0 +1,24 @@
+// import { writable } from 'svelte/store';
+
+function createConfigStore() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const config: any = fetchConfig();
+
+  return {
+    config
+  };
+}
+
+const fetchConfig = async () => {
+  console.log('fetching');
+  const res = await fetch('../../../ImmichFrame.WebApi/settings.json');
+  let config;
+  if (res.ok) {
+    config = await res.json();
+    console.log(config);
+  } else {
+    console.error('Failed to load config file');
+  }
+};
+
+export const configStore = createConfigStore();