From 2f57b9969bf4a8a356587f2f38ae1b0c4ad2ede5 Mon Sep 17 00:00:00 2001
From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Thu, 18 Jan 2018 07:59:10 -0800
Subject: [PATCH] Moved lists back to same folder as songs.

Seems Songbook doesn't traverse directories when looking for set lists
---
 Andrew/{Lists => }/Glen Park.lst | 0
 Andrew/{Lists => }/New Songs.lst | 0
 Andrew/{Lists => }/Practice.lst  | 0
 web/displayset.php               | 2 +-
 web/songbook.php                 | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename Andrew/{Lists => }/Glen Park.lst (100%)
 rename Andrew/{Lists => }/New Songs.lst (100%)
 rename Andrew/{Lists => }/Practice.lst (100%)

diff --git a/Andrew/Lists/Glen Park.lst b/Andrew/Glen Park.lst
similarity index 100%
rename from Andrew/Lists/Glen Park.lst
rename to Andrew/Glen Park.lst
diff --git a/Andrew/Lists/New Songs.lst b/Andrew/New Songs.lst
similarity index 100%
rename from Andrew/Lists/New Songs.lst
rename to Andrew/New Songs.lst
diff --git a/Andrew/Lists/Practice.lst b/Andrew/Practice.lst
similarity index 100%
rename from Andrew/Lists/Practice.lst
rename to Andrew/Practice.lst
diff --git a/web/displayset.php b/web/displayset.php
index eee3770..6ca458f 100644
--- a/web/displayset.php
+++ b/web/displayset.php
@@ -37,7 +37,7 @@ print "<ol>";
 
 $firstLine = true;
 
-foreach (file("$songDir/Lists/$set") as $line) {
+foreach (file("$songDir/$set") as $line) {
   // Skip first line which is merely the set name again
   if ($firstLine) {
     $firstLine = false;
diff --git a/web/songbook.php b/web/songbook.php
index 97debf9..ae50faa 100644
--- a/web/songbook.php
+++ b/web/songbook.php
@@ -26,7 +26,7 @@ function getSongs ($songDir) {
 } // getSongs
 
 function getSets ($songDir) {
-  return glob("$songDir/Lists/*.lst");
+  return glob("$songDir/*.lst");
 } // getSets
 
 function songsDropdown () {
-- 
2.17.1