trying to fix random

nathan-gs · Sep 16, 2024 · dfad147 · dfad147
1 parent 12f288a
commit dfad147
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/package.nix b/package.nix
@@ -4,7 +4,7 @@ sbt.lib.mkSbtDerivation {
   inherit pkgs;
 
   pname = "photoprism-slideshow";
-  version = "0.2.3";
+  version = "0.2.4";
 
   depsSha256 = "sha256-SdrAk1e0YN5yWEpx0j9lflNbjuxf2damPKXb/yM6erc=";
 

diff --git a/src/main/scala/photoprism/slideshow/main.scala b/src/main/scala/photoprism/slideshow/main.scala
@@ -123,9 +123,7 @@ object PhotoprismSlideshowApp extends cask.MainRoutes{
   def randomPhoto(categories: String) = {
 
     // Ugly hack for IN condition
-    val categoriesList = categories.split(",").map(_.trim).filter(_.nonEmpty).toList
-    val input = (0 to 6).map(i => categoriesList.lift(i).getOrElse("TO_BE_IGNORED"))
-
+    val categoriesList = categories.split(",").map(_.trim).filter(_.nonEmpty).toList    
 
     ds.run:
       val photo = (sql"""
@@ -135,7 +133,7 @@ object PhotoprismSlideshowApp extends cask.MainRoutes{
           INNER JOIN photos_albums pa ON pa.photo_uid = p.photo_uid
           INNER JOIN albums a ON a.album_uid = pa.album_uid
           WHERE a.album_type = 'album' 
-          AND a.album_category IN (${input(0)}, ${input(1)}, ${input(2)}, ${input(3)}, ${input(4)}, ${input(5)}, ${input(6)}) 
+          AND a.album_category IN (${categoriesList.mkString("'", "','", "'")})
           AND p.photo_type = 'image'        
           ORDER BY ${sqlRandomFunction} LIMIT 1""".read[Photo]).headOption.getOrElse(Photo("INVALID_PHOTO","INVALID PHOTO","","",""))
       cask.Response(
@@ -155,7 +153,8 @@ object PhotoprismSlideshowApp extends cask.MainRoutes{
 
     // Ugly hack for IN condition
     val categoriesList = categories.split(",").map(_.trim).filter(_.nonEmpty).toList
-    val input = (0 to 6).map(i => categoriesList.lift(i).getOrElse("TO_BE_IGNORED"))
+
+    categoriesList.join(",")
 
 
     ds.run:
@@ -166,7 +165,7 @@ object PhotoprismSlideshowApp extends cask.MainRoutes{
           INNER JOIN photos_albums pa ON pa.photo_uid = p.photo_uid
           INNER JOIN albums a ON a.album_uid = pa.album_uid
           WHERE a.album_type = 'album' 
-          AND a.album_category IN (${input(0)}, ${input(1)}, ${input(2)}, ${input(3)}, ${input(4)}, ${input(5)}, ${input(6)}) 
+          AND a.album_category IN (${categoriesList.mkString("'", "','", "'")})
           AND p.photo_type = 'image'        
           ORDER BY ${sqlRandomFunction} LIMIT 1""".read[Photo]).headOption.getOrElse(Photo("INVALID_PHOTO","INVALID PHOTO","","",""))
       cask.Response(