From b66990e2c6a579429e165707664031315a512eac Mon Sep 17 00:00:00 2001 From: Andrew DeFaria Date: Thu, 18 Jan 2018 07:38:51 -0800 Subject: [PATCH] Lists fix ups Created new Lists folder and moved set lists to there. Now have one consolidated set list called Practice, one called New Songs for songs we are working on and one for Glen Park because I like jamming there. Changed code to handle new Lists location. Removed old lists. Move songs in my old "To Be Worked On" folder to the general folder. --- Andrew/A Practice List.lst | 19 ----- Andrew/{To Be Worked On => }/American Pie.pro | 0 Andrew/Andrew's Songs.lst | 60 ---------------- Andrew/Ceremony Set 1.lst | 15 ---- Andrew/Ceremony Set 2.lst | 15 ---- Andrew/Ceremony Set 3.lst | 13 ---- Andrew/Ceremony Set 4.lst | 27 ------- .../{To Be Worked On => }/Come Together.pro | 0 Andrew/{ => Lists}/Glen Park.lst | 2 +- Andrew/Lists/New Songs.lst | 15 ++++ Andrew/{AllSongs.lst => Lists/Practice.lst} | 72 ++++++++++--------- .../Me and Bobby McGee.pro | 0 Andrew/{To Be Worked On => }/Mony Mony.pro | 0 Andrew/{To Be Worked On => }/Proud Mary.pro | 0 Andrew/RickSet.lst | 37 ---------- Andrew/Set 1.lst | 14 ---- Andrew/Set 2.lst | 14 ---- Andrew/Set 3.lst | 12 ---- Andrew/Set 4.lst | 22 ------ .../{To Be Worked On => }/Sweet Caroline.pro | 0 web/displayset.php | 4 +- web/songbook.php | 2 +- 22 files changed, 56 insertions(+), 287 deletions(-) delete mode 100644 Andrew/A Practice List.lst rename Andrew/{To Be Worked On => }/American Pie.pro (100%) delete mode 100644 Andrew/Andrew's Songs.lst delete mode 100644 Andrew/Ceremony Set 1.lst delete mode 100644 Andrew/Ceremony Set 2.lst delete mode 100644 Andrew/Ceremony Set 3.lst delete mode 100644 Andrew/Ceremony Set 4.lst rename Andrew/{To Be Worked On => }/Come Together.pro (100%) rename Andrew/{ => Lists}/Glen Park.lst (97%) create mode 100644 Andrew/Lists/New Songs.lst rename Andrew/{AllSongs.lst => Lists/Practice.lst} (58%) rename Andrew/{To Be Worked On => }/Me and Bobby McGee.pro (100%) rename Andrew/{To Be Worked On => }/Mony Mony.pro (100%) rename Andrew/{To Be Worked On => }/Proud Mary.pro (100%) delete mode 100644 Andrew/RickSet.lst delete mode 100644 Andrew/Set 1.lst delete mode 100644 Andrew/Set 2.lst delete mode 100644 Andrew/Set 3.lst delete mode 100644 Andrew/Set 4.lst rename Andrew/{To Be Worked On => }/Sweet Caroline.pro (100%) diff --git a/Andrew/A Practice List.lst b/Andrew/A Practice List.lst deleted file mode 100644 index a82afaa..0000000 --- a/Andrew/A Practice List.lst +++ /dev/null @@ -1,19 +0,0 @@ -Practice List -Peaceful, Easy Feeling - Eagles -Take It Easy - Eagles -Seven Bridges Road - Eagles -Ventura Highway - America -Sultans of Swing - Dire Straights -Under the Boardwalk - The Drifters -Nowhere Man - Beatles -The Letter - Joe Cocker -I Can See Clearly Now - Johnny Nash -Soul Man - The Blues Brothers -Your Momma Don't Dance - Loggins and Messina -Black Water - Doobie Brothers -Behind Blue Eyes - The Who -Doctor My Eyes - Jackson Browne -Don't Let Me Down - Beatles -Lay Down Sally - Eric Clapton -If I Ever Lose My Faith In You - Sting -Do It Again - Steely Dan diff --git a/Andrew/To Be Worked On/American Pie.pro b/Andrew/American Pie.pro similarity index 100% rename from Andrew/To Be Worked On/American Pie.pro rename to Andrew/American Pie.pro diff --git a/Andrew/Andrew's Songs.lst b/Andrew/Andrew's Songs.lst deleted file mode 100644 index c27e951..0000000 --- a/Andrew/Andrew's Songs.lst +++ /dev/null @@ -1,60 +0,0 @@ -Andrew's Songs -Across the Universe - Beatles -All You Need Is Love - Beatles -Amie - Pure Prairie League -Breakdown - Tom Petty -Brown Eyed Girl - Van Morrison -Country Road - John Denver -Daydream Believer - Monkees -Desperado - The Eagles -Drugstore Novels - Cast of Shadows -Fire and Rain - James Taylor -Fool You Never Knew - Tempest -Free Fallin - Tom Petty -Give a Little Bit - Roger Hodgson -Here Comes the Sun - George Harrison -Here in Heaven - Mike Fraser -Hold On - Kansas -Hotel California - Eagles -I Can See Clearly Now - Johnny Nash or Jimmy Cliff -I'm a Believer - Monkees -Imagine - John Lennon -I'm Your Captain - Grand Funk Railroad -I Still Can't Say Goodbye - Chet Atkins -Kashmir - Led Zeppelin -Last Man on Earth - Alice Cooper -Leather And Lace - Stevie Nicks -Let It Be - Beatles -Listen to the Music - Doobie Brothers -Love Her Madly - Doors -Lyin' Eyes - Eagles -Maggie May - Rod Stewart -Margaritaville - Jimmy Buffett -Me and Julio Down by the Schoolyard - Paul Simon -Mother - Pink Floyd -Mrs. Robinson - Paul Simon -My Life - Tempest -Naptime - Jen Hajj -Nothing can stop us now - Tim Minchin -Peaceful, Easy Feeling - Eagles -Piano Man - Billy Joel -Questions - Moody Blues -Ramblin' Man - Allman Brothers Band -Reason to Believe - Tim Hardin (Rod Stewart) -Santa Monica - Everclear -Seems Like a Dream - Tempest -Serenade - Steve Miller -Sister Golden Hair - America -Sitting on the Dock of the Bay - Otis Redding -Space Oddity - David Bowie -Strong Enough to Win - Mike Fraser -Swingtown - Steve Miller -Take It Easy - Eagles -Turn the Page - Bob Seager -Voices - Red Shoes For Romeo -What a Wonderful World - Louis Armstrong -What I've Already Heard - Mike Fraser -Where You Take Me - Jen Hajj -Who'll Stop The Rain - Creedence Clearwater Revival -You Ain't Seen Nothing Yet - Backman Turner Overdrive -Young as You - Mike Fraser diff --git a/Andrew/Ceremony Set 1.lst b/Andrew/Ceremony Set 1.lst deleted file mode 100644 index 2e75b0d..0000000 --- a/Andrew/Ceremony Set 1.lst +++ /dev/null @@ -1,15 +0,0 @@ -Ceremony Set 1 -Love Will Keep Us Alive -Peaceful, Easy Feeling -Nowhere Man -I Can See Clearly Now -Doctor My Eyes -I've Just Seen a Face -Lay Down Sally -Behind Blue Eyes -Norwegian Wood -New Kid in Town -Harvest Moon -Black Water -Suite Judy Blue Eyes -Seven Bridges Road diff --git a/Andrew/Ceremony Set 2.lst b/Andrew/Ceremony Set 2.lst deleted file mode 100644 index 81760e2..0000000 --- a/Andrew/Ceremony Set 2.lst +++ /dev/null @@ -1,15 +0,0 @@ -Ceremony Set 2 -Ventura Highway -Under the Boardwalk -One After 909 -Best of My Love -Landslide -From the Beginning -California Dreaming -Take It Easy -Sultans of Swing -The Letter - Joe Cocker -Wild Nights - Van Morrison -Your Momma Don't Dance -Don't Let Me Down -Do It Again diff --git a/Andrew/Ceremony Set 3.lst b/Andrew/Ceremony Set 3.lst deleted file mode 100644 index f507967..0000000 --- a/Andrew/Ceremony Set 3.lst +++ /dev/null @@ -1,13 +0,0 @@ -Ceremony Set 3 -A Day In The Life -While My Guitar Gently Weeps -Lyin Eyes -What a Wonderful World -If I Ever Lose My Faith In You -Run To You -Refugee -Desperado - Eagles -Let It Be -Sister Golden Hair - America -Pink Houses -All You Need Is Love - Beatles diff --git a/Andrew/Ceremony Set 4.lst b/Andrew/Ceremony Set 4.lst deleted file mode 100644 index 14d115f..0000000 --- a/Andrew/Ceremony Set 4.lst +++ /dev/null @@ -1,27 +0,0 @@ -Ceremony Set 4 -Something -Blackbird - Beatles -Ramble On -Soul Man -All My Loving - Beatles -Tears In Heaven -Mary Janes Last Dance - Tom Petty -Nights In White Satin - Moody Blues -Knocking On Heaven's Door -Here Comes The Sun -Dust In The Wind -Can't Find My Way Home -Southern Cross - Crosby Stills And Nash -Reeling In The Years -Running On Empty Acoustic -Helplessly Hoping - Stephen Stills -Badge -Drugstore Novels -In My Life -Little Wing -Feeling Alright -Four and Twenty -Listen to the Music -Wooden Ships -Midnight Rider -Melissa diff --git a/Andrew/To Be Worked On/Come Together.pro b/Andrew/Come Together.pro similarity index 100% rename from Andrew/To Be Worked On/Come Together.pro rename to Andrew/Come Together.pro diff --git a/Andrew/Glen Park.lst b/Andrew/Lists/Glen Park.lst similarity index 97% rename from Andrew/Glen Park.lst rename to Andrew/Lists/Glen Park.lst index 75a1836..ca705ff 100644 --- a/Andrew/Glen Park.lst +++ b/Andrew/Lists/Glen Park.lst @@ -11,7 +11,7 @@ Lay Down Sally - Eric Clapton Let It Be - Beatles The Letter - Joe Cocker Love Her Madly - Doors -Lyin' Eyes - Eagles +Lyin Eyes - Eagles Peaceful, Easy Feeling - Eagles Revolution - Beatles Sister Golden Hair - America diff --git a/Andrew/Lists/New Songs.lst b/Andrew/Lists/New Songs.lst new file mode 100644 index 0000000..7b805bb --- /dev/null +++ b/Andrew/Lists/New Songs.lst @@ -0,0 +1,15 @@ +New Songs +All My Loving - Beatles +Let It Be - Beatles +Dust in the Wind - Kansas +Lyin Eyes - Eagles +Pink Houses - John Cougar +Something - Beatles +Running on Empty - Jackson Browne +Blackbird - Beatles +Sister Golden Hair - America +Here Comes the Sun - Beatles +Nights in White Satin - Moody Blues +Tears in Heaven - Eric Clapton +Can't Find My Way Home +Knocking on Heaven's Door diff --git a/Andrew/AllSongs.lst b/Andrew/Lists/Practice.lst similarity index 58% rename from Andrew/AllSongs.lst rename to Andrew/Lists/Practice.lst index 80b9349..eeb8256 100644 --- a/Andrew/AllSongs.lst +++ b/Andrew/Lists/Practice.lst @@ -1,41 +1,43 @@ -All Songs -All My Loving - Beatles -Behind Blue Eyes - The Who -Best of My Love - Eagles -Blackbird - Beatles -Black Water - Doobie Brothers -Can't Find My Way Home - Blind Faith -Crossroads - Eric Clapton -Desperado - Eagles +Practice List +Peaceful, Easy Feeling - Eagles +Stand By Me +Nowhere Man - Beatles +I Can See Clearly - Johnny Nash Doctor My Eyes - Jackson Browne -Do It Again - Steely Dan -Don't Let Me Down - Beatles -Drugstore Novels - Cast of Shadows -Dust in the Wind - Kansas -Feeling Alright -From the Beginning - Emerson, Lake and Palmer -Harvest Moon - Neil Young -Here Comes the Sun - Beatles -I Can See Clearly Now - Johnny Nash -If I Ever Lose My Faith In You - Sting +People Get Ready I've Just Seen a Face - Beatles Lay Down Sally - Eric Clapton -Nowhere Man - Beatles -Peaceful, Easy Feeling - Eagles -Reelin' in the Years - Steely Dan -Refuge - Tom Petty -Run To You - Bryan Adams -Seven Bridges Road - Eagles -Sister Golden Hair - America -Soul Man - The Blues Brothers -Southern Cross +Behind Blue Eyes - The Who +Mary Jane's Last Dance +Norwegian Wood - Beatles +New Kid in Town - Eagles +Harvest Moon - Neil Young Suite Judy Blue Eyes - Crosby, Stills and Nash -Sultans of Swing - Dire Straights -Sweet Caroline - Neil Dimaond -Take It Easy - Eagles -Tears in Heaven - Eric Clapton -The Letter - Joe Cocker -Under the Boardwalk - The Drifters +Black Water - Doobie Brothers +Feeling Alright +Seven Bridges Road - Eagles Ventura Highway - America -Whiter Shade of Pale - Moody Blues +If I Ever Lose My Faith In You - Sting +Under the Boardwalk +One After 909 - Beatles +Best of My Love - Eagles +Landslide - Fleetwood Mac +From the Beginning - Emerson, Lake and Palmer +California Dreamin - Moma's and Papa's +Take It Easy - Eagles +Sultans of Swing - Dire Straights Your Momma Don't Dance - Loggins and Messina +Don't Let Me Down - Beatles +Love Will Keep us Alive - Eagles +All You Need Is Love - Beatles +Do It Again - Steely Dan +Soul Man - The Blues Brothers +What a Wonderful World - Louis Armstrong +While My Guitar Gently Weeps - Beatles +A Day in a Life - Beatles +Wild Nights - Van Morrison +The Letter - Joe Cocker +Run To You - Bryan Adams +Refugee - Tom Petty +Reeling in the Years - Steely Dan +Desperado - Eagles diff --git a/Andrew/To Be Worked On/Me and Bobby McGee.pro b/Andrew/Me and Bobby McGee.pro similarity index 100% rename from Andrew/To Be Worked On/Me and Bobby McGee.pro rename to Andrew/Me and Bobby McGee.pro diff --git a/Andrew/To Be Worked On/Mony Mony.pro b/Andrew/Mony Mony.pro similarity index 100% rename from Andrew/To Be Worked On/Mony Mony.pro rename to Andrew/Mony Mony.pro diff --git a/Andrew/To Be Worked On/Proud Mary.pro b/Andrew/Proud Mary.pro similarity index 100% rename from Andrew/To Be Worked On/Proud Mary.pro rename to Andrew/Proud Mary.pro diff --git a/Andrew/RickSet.lst b/Andrew/RickSet.lst deleted file mode 100644 index 451f3b7..0000000 --- a/Andrew/RickSet.lst +++ /dev/null @@ -1,37 +0,0 @@ -RickSet -All Along The Watchtower -Black Water -Bring It On Home to Me -Desperado -Feel Like Making Love -Fire & Rain -Give A Little Bit -Helpless/Knockin On Heaven's Door -Here Comes The Sun -I Can See Clearly Now -I'm So Tired -I'm Your Captain -I've Just Seen a Face -Keep On Rocking -Leather & Lace -Let It Be -Love Her Madly -Lyin Eye's -Maggie May* -More Than Words -Mrs. Robinson -Peaceful, Easy Feeling -People Are Strange -Ramblin Man -Show Me The Way -Sister Golden Hair -Sitting on the Dock of the Bay -Still My Guitar Gently Weeps -Suite Judy Blue Eyes -Swing Town -Take It Easy -Tuesday Afternoon -Turn The Page -Venus -We Can Work it Out -Wild Nights \ No newline at end of file diff --git a/Andrew/Set 1.lst b/Andrew/Set 1.lst deleted file mode 100644 index 6587e7f..0000000 --- a/Andrew/Set 1.lst +++ /dev/null @@ -1,14 +0,0 @@ -Set 1 -I Can See Clearly Now - Johnny Nash -I've Just Seen a Face - Beatles -From the Beginning - Emerson, Lake and Palmer -Landslide - Fleetwood Mac -Badge - Cream -Best of My Love - Eagles -Do It Again - Steely Dan -Drugstore Novels - Cast of Shadows -Harvest Moon - Neil Young -Doctor My Eyes - Jackson Browne -Behind Blue Eyes - The Who -Knockin on Heaven's Door - Bob Dylan -One After 909 - Beatles diff --git a/Andrew/Set 2.lst b/Andrew/Set 2.lst deleted file mode 100644 index e30cc9a..0000000 --- a/Andrew/Set 2.lst +++ /dev/null @@ -1,14 +0,0 @@ -Set 2 -Peaceful, Easy Feeling - Eagles -Seven Bridges Road - Eagles -Take It Easy - Eagles -Sister Golden Hair - America -Little Wing - Jimi Hendrix -Lay Down Sally - Eric Clapton -Can't Find My Way Home - Blind Faith -Pink Houses - John Cougar -Nowhere Man - Beatles -Ventura Highway - America -New Kid in Town - Eagles -Run To You - Bryan Adams -Your Momma Don't Dance - Loggins and Messina diff --git a/Andrew/Set 3.lst b/Andrew/Set 3.lst deleted file mode 100644 index 1d003e0..0000000 --- a/Andrew/Set 3.lst +++ /dev/null @@ -1,12 +0,0 @@ -Set 3 -Under the Boardwalk - The Drifters -Reeling in the Years - Steely Dan -Black Water - Doobie Brothers -If I Ever Lose My Faith In You - Sting -Sultans of Swing - Dire Straights -Feeling Alright - Joe Cocker -Refugee - Tom Petty -Soul Man - The Blues Brothers -Don't Let Me Down - Beatles -The Letter - Joe Cocker -Wild Nights - Van Morrison diff --git a/Andrew/Set 4.lst b/Andrew/Set 4.lst deleted file mode 100644 index 3b77884..0000000 --- a/Andrew/Set 4.lst +++ /dev/null @@ -1,22 +0,0 @@ -Set 4 -Lucky Man - Emerson, Lake and Palmer -Dust in the Wind - Kansas -Your Move - Yes -Southern Cross - Crosby, Stills & Nash -Tears in Heaven - Eric Clapton -Blackbird - Beatles -Something - Beatles -Desperado - Eagles -Crossroads - Cream -Here Comes the Sun - Beatles -I'm Your Captain - Grand Funk Railroad -Midnight Rider - Allman Brothers -Let It Be - Beatles -Listen to the Music - Doobie Brothers -Lyin Eyes - Eagles -In My Life - Beatles -Tequila Sunrise - Eagles -Four & Twenty - Stephen Stills -A Day in a Life - Beatles -Cocaine - Eric Clapton -Turn the Page - Bob Seager diff --git a/Andrew/To Be Worked On/Sweet Caroline.pro b/Andrew/Sweet Caroline.pro similarity index 100% rename from Andrew/To Be Worked On/Sweet Caroline.pro rename to Andrew/Sweet Caroline.pro diff --git a/web/displayset.php b/web/displayset.php index 854c98e..eee3770 100644 --- a/web/displayset.php +++ b/web/displayset.php @@ -4,7 +4,7 @@ - Songbook Artist + Songbook List @@ -37,7 +37,7 @@ print "
    "; $firstLine = true; -foreach (file("$songDir/$set") as $line) { +foreach (file("$songDir/Lists/$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 ae50faa..97debf9 100644 --- a/web/songbook.php +++ b/web/songbook.php @@ -26,7 +26,7 @@ function getSongs ($songDir) { } // getSongs function getSets ($songDir) { - return glob("$songDir/*.lst"); + return glob("$songDir/Lists/*.lst"); } // getSets function songsDropdown () { -- 2.17.1