Merge pull request #740 from damongolding/task/release

v0.38.0

Author: damongolding

flake.nix

@@ -8,96 +8,8 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        version = "0.37.0"; # hard coded for now
-
-        # Step 1: install frontend deps
-        node_modules = pkgs.stdenv.mkDerivation {
-          pname = "immich-kiosk-node_modules";
-          inherit version;
-          nativeBuildInputs = [ pkgs.bun ];
-          phases = [ "buildPhase" "installPhase" ];
-
-          impureEnvVars = pkgs.lib.fetchers.proxyImpureEnvVars ++
-            [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ];
-
-          buildPhase = ''
-            cp ${./frontend/package.json} package.json
-            cp ${./frontend/bun.lock} bun.lock
-            bun install --no-progress --frozen-lockfile
-          '';
-
-          installPhase = ''
-            mkdir -p $out
-            cp -R ./node_modules $out
-          '';
-
-          outputHash = "sha256-FNNWp3JtF4fGkWRRA0TolI97qBptmsOUNjbLuAmsZf0=";
-          outputHashAlgo = "sha256";
-          outputHashMode = "recursive";
-        };
-
-        # Step 2: build frontend assets
-        frontend = pkgs.stdenv.mkDerivation {
-          pname = "immich-kiosk-frontend";
-          inherit version;
-          src = ./frontend;
-          nativeBuildInputs = [ pkgs.bun pkgs.nodejs ];
-
-          configurePhase = ''
-            cp -R ${node_modules}/node_modules .
-          '';
-
-          buildPhase = ''
-            bun run css
-            bun run js
-            bun run url-builder
-          '';
-
-          installPhase = ''
-            mkdir -p $out
-            cp -r ./public/assets $out
-          '';
-        };
-
       in
       {
-        packages = {
-          default = self.packages.${system}.immich-kiosk;
-
-          immich-kiosk = pkgs.buildGoModule {
-            pname = "immich-kiosk";
-            inherit version;
-            src = ./.;
-            vendorHash = "sha256-O1cH0EGHdOgpo+zhdlYFKVK4cOHg8ZKpsJezdKBv+K0=";
-
-            nativeBuildInputs = with pkgs; [ go-task ];
-
-            preBuild = ''
-
-              # Satisfy go:embed frontend/public
-              mkdir -p frontend/public
-              cp -r ${frontend}/assets frontend/public/assets
-
-              # Generate templ templates
-              go tool templ generate
-            '';
-
-            ldflags = [
-              "-s" "-w"
-              "-X main.version=${version}"
-            ];
-
-            subPackages = [ "." ];
-
-            meta = with pkgs.lib; {
-              description = "Highly configurable slideshows for displaying Immich assets on browsers and devices.";
-              homepage = "https://github.com/damongolding/immich-kiosk";
-              license = licenses.agpl3Only;
-              mainProgram = "immich-kiosk";
-            };
-          };
-        };
-
         devShells.default = pkgs.mkShell {
           buildInputs = with pkgs; [
             go

frontend/bun.lock

@@ -26,14 +26,14 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.12",
+    "@biomejs/biome": "^2.4.13",
     "autoprefixer": "^10.5.0",
-    "choices.js": "^11.2.2",
+    "choices.js": "^11.2.3",
     "date-fns": "^4.1.0",
     "dompurify": "^3.4.1",
     "esbuild": "^0.28.0",
     "htmx.org": "^2.0.10",
-    "postcss": "^8.5.10",
+    "postcss": "^8.5.12",
     "postcss-cli": "^11.0.1",
     "postcss-nested": "^7.0.2",
     "typescript": "^5.9.3"

frontend/package.json

@@ -345,6 +345,8 @@ type Config struct {
 	FilterDate string `json:"filterDate" yaml:"filter_date" mapstructure:"filter_date" query:"filter_date" form:"filter_date" default:""`
 	// FilterNewest filter certain asset bucket assets by the newest X assets
 	FilterNewest int `json:"filterNewest" yaml:"filter_newest" mapstructure:"filter_newest" query:"filter_newest" form:"filter_newest" default:"0"`
+	// FilterExcludeFaces filter certain asset bucket assets by the presence of faces
+	FilterExcludeFaces bool `json:"filterExcludeFaces" yaml:"filter_exclude_faces" mapstructure:"filter_exclude_faces" query:"filter_exclude_faces" form:"filter_exclude_faces" default:"false"`
 
 	// ShowClearCacheButton display a button to clear cache
 	ShowClearCacheButton bool `json:"showClearCacheButton" yaml:"show_clear_cache_button" mapstructure:"show_clear_cache_button" query:"show_clear_cache_button" form:"show_clear_cache_button" default:"false"`

internal/config/config.go

@@ -650,8 +650,9 @@ func (a *Asset) containsTag(tagValue string) bool {
 //   - bool: true if asset meets all criteria, false otherwise
 func (a *Asset) isValidAsset(requestID, deviceID string, allowedTypes []AssetType, wantedRatio ImageOrientation) bool {
 	return a.hasValidBasicProperties(allowedTypes, wantedRatio) &&
-		a.hasValidDateFilter() &&
+		a.hasValidFilterDate() &&
 		a.hasValidPartners() &&
+		a.hasValidFilterExcludeFaces(requestID, deviceID) &&
 		a.hasValidAlbums(requestID, deviceID) &&
 		a.hasValidPeople(requestID, deviceID) &&
 		a.hasValidTags(requestID, deviceID)
@@ -707,12 +708,12 @@ func (a *Asset) isAnimatedGif() bool {
 	return totalSeconds > 0
 }
 
-// hasValidDateFilter validates if the asset's date matches the configured date filter criteria.
+// hasValidFilterDate validates if the asset's date matches the configured date filter criteria.
 // Assets from DateRange buckets bypass the date filter check.
 //
 // Returns:
 //   - bool: true if date is valid or no filter set, false if outside filter range
-func (a *Asset) hasValidDateFilter() bool {
+func (a *Asset) hasValidFilterDate() bool {
 	if a.requestConfig.FilterDate == "" || a.Bucket == kiosk.SourceDateRange {
 		return true
 	}
@@ -726,6 +727,22 @@ func (a *Asset) hasValidDateFilter() bool {
 	return utils.IsTimeBetween(a.LocalDateTime.Local(), dateStart, dateEnd)
 }
 
+// hasValidFilterExcludeFaces validates if the asset has no faces assigned.
+//
+// Returns:
+//   - bool: true if no faces are assigned or no filter set, false otherwise
+func (a *Asset) hasValidFilterExcludeFaces(requestID, deviceID string) bool {
+	if !a.requestConfig.FilterExcludeFaces {
+		return true
+	}
+
+	if len(a.People) == 0 {
+		a.CheckForFaces(requestID, deviceID)
+	}
+
+	return len(a.People) == 0 && len(a.UnassignedFaces) == 0
+}
+
 // hasValidAlbums checks if the asset belongs to any excluded albums.
 // If album data is missing, it fetches it first.
 //

internal/immich/immich_helpers.go

@@ -1,6 +1,6 @@
 version: "3"
 env:
-  VERSION: 0.37.0-beta.1
+  VERSION: 0.38.0
 
 silent: true