From d58a77164dc37c445bc275d0bee5dbc7f06d7e7d Mon Sep 17 00:00:00 2001
From: Ken D'Ambrosio <ken@jots.org>
Date: Tue, 12 May 2026 17:26:06 +0000
Subject: Show slideshow button for folders with media anywhere in hierarchy

- slideshow_view now uses all_media_entries for non-root dirs so the
  slideshow traverses sub-albums instead of only direct files
- album.erb condition simplified: show launcher when albums OR media
  entries exist (previously hidden for folders with only sub-albums)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app.rb          | 4 +---
 views/album.erb | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app.rb b/app.rb
index 1fc5f69..cf371c8 100644
--- a/app.rb
+++ b/app.rb
@@ -342,9 +342,7 @@ def slideshow_view(rel)
     top_dirs = params[:dirs]&.split(',')&.map(&:strip)&.reject(&:empty?)
     all_media_entries(top_dirs: top_dirs&.any? ? top_dirs : nil)
   else
-    album_files(dir, data)
-      .select { |e| %i[image video].include?(e[:type]) }
-      .map    { |e| e.merge(file_rel: "#{rel}/#{e[:name]}") }
+    all_media_entries(top_dirs: [rel])
   end
   erb :slideshow, layout: false
 end
diff --git a/views/album.erb b/views/album.erb
index 3dc4fdb..8577bdb 100644
--- a/views/album.erb
+++ b/views/album.erb
@@ -10,7 +10,7 @@
   <% end %>
   <h1><%= @title %></h1>
   <% if @desc %><p class="album-desc"><%= @desc %></p><% end %>
-  <% if @rel.empty? ? @albums.any? : @entries.any? { |e| %i[image video].include?(e[:type]) } %>
+  <% if @albums.any? || @entries.any? { |e| %i[image video].include?(e[:type]) } %>
   <div class="ss-launcher">
     <a href="/slideshow/<%= @rel %>" id="ss-launch" data-base="/slideshow/<%= @rel %>" class="btn">Slideshow</a>
     <div class="ss-opts">
-- 
cgit v1.2.3