Merge branch 'staging' of Niklink/hsmusic-data into staging

17 files changed, 108 insertions, 47 deletions

diff --git a/album/cherubim.txt b/album/cherubim.txt
index cdd6d0ea..c15185df 100644
--- a/album/cherubim.txt
+++ b/album/cherubim.txt
@@ -97,7 +97,7 @@ Commentary:
     And that’s Carne Vale.  An angry little shout from a little green, malevolent angel-baby. Grr. Argh.
 -------------------------------------------------------------------------------
 Track: Green Lolly
-Artist: James Dever, Robert J! Lake
+Artist: Robert J! Lake
 Track Art: Brianne
 Duration: 4:11
 References: The Uranian
@@ -106,12 +106,9 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/green-lolly-2
 - https://youtu.be/oWC2oXU_hP4
-Contributors:
-- James Dever (original theme)
-- Robert J! Lake (arrangement, production)
 -------------------------------------------------------------------------------
 Track: Red Sucker
-Artist: James Dever, Robert J! Lake
+Artist: Kalibration
 Track Art: Dana Smart
 Duration: 3:44
 References: The Undying
@@ -120,9 +117,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/red-sucker-2
 - https://youtu.be/lp7kDAHaWIc
-Contributors:
-- James Dever (theme)
-- Robert J! Lake (arrangement, production)
 -------------------------------------------------------------------------------
 Track: Constant Confinement
 Artist: Erik Scheele
diff --git a/album/homestuck-vol-1-4.txt b/album/homestuck-vol-1-4.txt
index 08b2f931..91b76182 100644
--- a/album/homestuck-vol-1-4.txt
+++ b/album/homestuck-vol-1-4.txt
@@ -401,8 +401,8 @@ URLs:
 Track: Doctor
 Directory: doctor-vol-1-4
 AKA: track:doctor
-Artist: Buzinkai
-Contributors: Clark Powell (production), Michael Vallejo (production)
+Artist: Buzinkai, Clark Powell
+Contributors: Michael Vallejo (percussion)
 Duration: 2:37
 References:
 - track:doctor-original-loop
@@ -468,4 +468,7 @@ Artist: Buzinkai
 Duration: 0:54
 URLs:
 - https://homestuck.bandcamp.com/track/doctor-original-loop-2
-- https://youtu.be/VpXseHnyzDg
+- https://www.youtube.com/watch?v=o0Um9OiP8dU
+Commentary:
+    <i>Buzinkai:</i>
+    <a href='https://www.youtube.com/watch?v=EsG71P_zEIE'>'Doctor' Explained</a>
\ No newline at end of file
diff --git a/album/homestuck-vol-10.txt b/album/homestuck-vol-10.txt
index 6e8c8aae..bfb978f3 100644
--- a/album/homestuck-vol-10.txt
+++ b/album/homestuck-vol-10.txt
@@ -173,7 +173,7 @@ Contributors:
 - viaSatellite (bass)
 - David Dycus (synths, composition)
 - Ian White (trumpet)
-- Kelly Sadwin (violin)
+- Noel Sadwin (violin)
 References:
 - track:showtime-piano-refrain
 - track:showtime-original-mix
@@ -372,7 +372,7 @@ Duration: 2:06
 References: Skaian Ride, Skaia Voyages
 Art Tags:
 - John
-- Dave
+- AH
 URLs:
 - https://homestuck.bandcamp.com/track/skaian-happy-flight-2
 - https://youtu.be/rozLPCPXopw
@@ -641,7 +641,7 @@ URLs:
 Contributors:
 - Marcy Nabors (composition, bass clarinet)
 - Catboss (flute)
-- Kelly Sadwin (violin & viola)
+- Noel Sadwin (violin & viola)
 - Jamie Paige Stanley (percussion)
 - Kyle G. Jamolin (lyrics & choir direction)
 - Ciaran Cain (choir)
diff --git a/album/homestuck-vol-4.txt b/album/homestuck-vol-4.txt
index 738e24b6..77e8e410 100644
--- a/album/homestuck-vol-4.txt
+++ b/album/homestuck-vol-4.txt
@@ -98,8 +98,8 @@ URLs:
 - https://youtu.be/GACczxr7464
 -------------------------------------------------------------------------------
 Track: Doctor
-Artist: Buzinkai
-Contributors: Clark Powell (production), Michael Vallejo (production)
+Artist: Buzinkai, Clark Powell
+Contributors: Michael Vallejo (percussion)
 Duration: 2:37
 References:
 - track:doctor-original-loop
diff --git a/album/homestuck-vol-6.txt b/album/homestuck-vol-6.txt
index 0618c36f..a808fb00 100644
--- a/album/homestuck-vol-6.txt
+++ b/album/homestuck-vol-6.txt
@@ -89,6 +89,8 @@ Commentary:
     THE GAMES WILL NEVER STOP
     you know the rest
     (alternatively: where the heck did that horrible dude come from get him out of the way of the album art jesus)
+
+    I just binged on too much <a href="https://www.youtube.com/watch?v=xkreaWxL224">Go Mario Go</a> and <a href="https://www.youtube.com/watch?v=1cez1x1Gei4">The Heat Is On (bust a groove 2)</a> and went out to mow the lawn and came up with it
 Lyrics:
     Alright bros, are you ready?<br>It's time for the one, the only, GameBro!<br>He's coming to your screen straight from the magazine<br>The mix meister of Master Swords and mushrooms<br>Are you sure you're ready for this?<br>Well come on, get ready, get set, and here we go
     The GameBro is here and he's got the games<br>All you other lamebrainers better feel the shame<br>He can bend the rules, he's too cool for school<br>And he's got just a few cheat codes for you<br>There ain't nothing that'll ever hold this bad boy down<br>That hat that he's wearing's like his personal crown<br>He's got every game beat and skills that sweet<br>But if you want in his crew, you gotta be elite
diff --git a/album/homestuck-vol-8.txt b/album/homestuck-vol-8.txt
index 4ed70922..42031cc0 100644
--- a/album/homestuck-vol-8.txt
+++ b/album/homestuck-vol-8.txt
@@ -567,7 +567,7 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Judgment Day
 Artist: Toby Fox
-Contributors: Kelly Sadwin (violin)
+Contributors: Noel Sadwin (violin)
 Track Art: Lazylaz
 Duration: 2:00
 References:
@@ -664,7 +664,7 @@ URLs:
 -------------------------------------------------------------------------------
 Track: Black Hole / Green Sun
 Artist: Malcolm Brown, Toby Fox
-Contributors: Tensei (electric guitar), Kelly Sadwin (violin)
+Contributors: Tensei (electric guitar), Noel Sadwin (violin)
 Track Art: none
 Duration: 2:30
 References:
diff --git a/album/labyrinths-heart.txt b/album/labyrinths-heart.txt
index e0ec0198..47d6bfd8 100644
--- a/album/labyrinths-heart.txt
+++ b/album/labyrinths-heart.txt
@@ -11,26 +11,31 @@ Groups:
 - Clark Powell
 - Beyond
 URLs:
+- https://clarkpowell.bandcamp.com/album/labyrinths-heart
 - https://www.youtube.com/playlist?list=PLnVpmehyaOFZhrI8iMi4bMrEyl2ZaWd7R
 -------------------------------------------------------------------------------
 Track: Getting Lost
 Duration: 1:22
 URLs:
+- https://clarkpowell.bandcamp.com/track/getting-lost
 - https://youtu.be/MCQjTIw6VY8
 -------------------------------------------------------------------------------
 Track: Minotaur
 Duration: 3:36
 URLs:
+- https://clarkpowell.bandcamp.com/track/minotaur
 - https://youtu.be/NOIaL69tDHI
 -------------------------------------------------------------------------------
 Track: Pleas
 Duration: 3:06
 URLs:
+- https://clarkpowell.bandcamp.com/track/pleas
 - https://youtu.be/F13Mw50d3Zk
 -------------------------------------------------------------------------------
 Track: Forgotten
 Duration: 4:22
 URLs:
+- https://clarkpowell.bandcamp.com/track/forgotten
 - https://youtu.be/Vatl6V7lTpQ
 -------------------------------------------------------------------------------
 Track: Misbegotten
@@ -39,6 +44,7 @@ References:
 - Pencil Holder (demo version)
 - track:lori-and-erich-baker
 URLs:
+- https://clarkpowell.bandcamp.com/track/misbegotten
 - https://youtu.be/9ai9ETnvXQo
 Lyrics:
     <i>Countless bodies remain unidentified, some ending up in unmarked graves and small border town cemeteries.</i>
@@ -48,36 +54,43 @@ Lyrics:
 Track: Calypso Deep
 Duration: 1:46
 URLs:
+- https://clarkpowell.bandcamp.com/track/calypso-deep
 - https://youtu.be/hcg2mriL1sc
 -------------------------------------------------------------------------------
 Track: Cruel Ulysses
 Duration: 2:24
 URLs:
+- https://clarkpowell.bandcamp.com/track/cruel-ulysses
 - https://youtu.be/VvREunKFvkQ
 -------------------------------------------------------------------------------
 Track: Shoreline
 Duration: 3:48
 URLs:
+- https://clarkpowell.bandcamp.com/track/shoreline
 - https://youtu.be/x9Nen28KsS8
 -------------------------------------------------------------------------------
 Track: Bosom of Abraham
 Duration: 2:28
 URLs:
+- https://clarkpowell.bandcamp.com/track/bosom-of-abraham
 - https://youtu.be/pDs5u221UGo
 -------------------------------------------------------------------------------
 Track: Dante
 Duration: 2:12
 URLs:
+- https://clarkpowell.bandcamp.com/track/dante
 - https://youtu.be/B6SGqbdQA9g
 -------------------------------------------------------------------------------
 Track: Tiresias
 Duration: 3:40
 URLs:
+- https://clarkpowell.bandcamp.com/track/tiresias
 - https://youtu.be/_uI2KZD9IYc
 -------------------------------------------------------------------------------
 Track: Fission
 Duration: 2:30
 URLs:
+- https://clarkpowell.bandcamp.com/track/fission
 - https://youtu.be/l_ODZbxdzFg
 -------------------------------------------------------------------------------
 Track: Requiem
@@ -85,14 +98,17 @@ Duration: 4:38
 References: Serenade
 Directory: requiem-labyrinths-heart
 URLs:
+- https://clarkpowell.bandcamp.com/track/requiem
 - https://youtu.be/u4x-_BipEwA
 -------------------------------------------------------------------------------
 Track: I Miss Being Lost
 Duration: 2:48
 URLs:
+- https://clarkpowell.bandcamp.com/track/i-miss-being-lost
 - https://youtu.be/26W6xjT8i8g
 -------------------------------------------------------------------------------
 Track: Come Theseus
 Duration: 1:50
 URLs:
+- https://clarkpowell.bandcamp.com/track/come-theseus
 - https://youtu.be/iPk8jx_C53I
diff --git a/album/namesake.txt b/album/namesake.txt
index 7556791e..a257f73c 100644
--- a/album/namesake.txt
+++ b/album/namesake.txt
@@ -9,6 +9,8 @@ Listed on Homepage: no
 Groups:
 - Clark Powell
 - Beyond
+URLS:
+- https://clarkpowell.bandcamp.com/album/namesake
 Commentary:
     <i>Clark Powell:</i>
     Special thanks to Astro Kid for his beautiful voice, and to Andarix for her keen eyes.
@@ -16,40 +18,52 @@ Commentary:
 Track: Star I Never Caught
 Duration: 3:50
 URLs:
+- https://clarkpowell.bandcamp.com/track/star-i-never-caught
 - https://soundcloud.com/plazmataz/star-i-never-caught
 -------------------------------------------------------------------------------
 Track: Woman I Never Met
 Duration: 2:36
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/woman-i-never-met
 -------------------------------------------------------------------------------
 Track: Day That Never Came
 Duration: 3:22
-Has URLs: no
+Contributors:
+- Astro Kid (Vocals)
+URLs:
+- https://clarkpowell.bandcamp.com/track/day-that-never-came
 -------------------------------------------------------------------------------
 Track: Puzzle I Never Solved
 Duration: 3:20
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/puzzle-i-never-solved
 -------------------------------------------------------------------------------
 Track: Treasure I Never Found
 Duration: 2:28
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/treasure-i-never-found
 -------------------------------------------------------------------------------
 Track: Voice I Never Heard
 Duration: 2:43
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/voice-i-never-heard
 -------------------------------------------------------------------------------
 Track: Country I Never Saw
 Duration: 4:02
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/country-i-never-saw
 -------------------------------------------------------------------------------
 Track: People I Never Knew
 Duration: 3:26
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/people-i-never-knew
 -------------------------------------------------------------------------------
 Track: Sigh I Never Breathed
 Duration: 2:22
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/sigh-i-never-breathed
 -------------------------------------------------------------------------------
 Track: Song I Never Played
 Duration: 1:52
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/song-i-never-played
\ No newline at end of file
diff --git a/album/one-year-older.txt b/album/one-year-older.txt
index b75dc264..fe8f1d19 100644
--- a/album/one-year-older.txt
+++ b/album/one-year-older.txt
@@ -215,6 +215,11 @@ Track Art: K
 Duration: 2:33
 Art Tags:
 - John
+- Vriska
+- Dave
+- Jade
+- Rose
+- Karkat
 URLs:
 - https://erikscheele.bandcamp.com/track/respit
 - https://youtu.be/9eSnvqGpzj8
diff --git a/album/psycholonials-ep-2.txt b/album/psycholonials-ep-2.txt
index eb818050..ddff203f 100644
--- a/album/psycholonials-ep-2.txt
+++ b/album/psycholonials-ep-2.txt
@@ -24,6 +24,8 @@ URLs:
 Track: Together
 AKA: Day That Never Came
 Duration: 2:04
+Contributors:
+- Astro Kid (Vocals)
 URLs:
 - https://psycholonials.bandcamp.com/track/together
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials.txt b/album/psycholonials.txt
index e6a9f8b5..a35a9fae 100644
--- a/album/psycholonials.txt
+++ b/album/psycholonials.txt
@@ -51,6 +51,8 @@ Track: Together
 Directory: together-ost
 AKA: Day That Never Came
 Duration: 2:04
+Contributors:
+- Astro Kid (Vocals)
 URLs:
 - https://psycholonials.bandcamp.com/track/together-2
 -------------------------------------------------------------------------------
@@ -299,6 +301,9 @@ Group: Bonus tracks
 -------------------------------------------------------------------------------
 Track: Together: Vocal Remix
 AKA: Someday
-Artists: Clark Powell, Astro Kid
 Duration: 2:56
+Contributors:
+- Astro Kid (Vocals)
+References:
+- track:day-that-never-came
 Has URLs: no
diff --git a/album/someday.txt b/album/someday.txt
index d580c649..abd12f2c 100644
--- a/album/someday.txt
+++ b/album/someday.txt
@@ -10,18 +10,26 @@ Listed on Homepage: no
 Groups:
 - Clark Powell
 - Beyond
+URLs:
+- https://clarkpowell.bandcamp.com/album/someday
 Commentary:
     <i>Clark Powell:</i>
     High Tide is a short film created by Kristin Kemper, and this is the single release of the film's score! It has been remastered for your listening pleasure, and remixed (also for your listening pleasure).
     High Tide in all its glory lives at <a href="https://vimeo.com/70976988">vimeo.com/70976988</a>
 -------------------------------------------------------------------------------
 Track: Someday
+Artist: Clark Powell
 Duration: 3:58
+References: Day That Never Came
+Contributors:
+- Astro Kid (Vocals)
 URLs:
+- https://clarkpowell.bandcamp.com/track/someday-feat-astro-kid
 - https://soundcloud.com/plazmataz/someday-feat-astro-kid
 -------------------------------------------------------------------------------
 Track: Someday (Astro Kid Remix)
 Artist: Astro Kid
 Duration: 4:41
 References: Someday
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/someday-astro-kid-remix
\ No newline at end of file
diff --git a/album/strife-2.txt b/album/strife-2.txt
index 60396afe..1f56b31b 100644
--- a/album/strife-2.txt
+++ b/album/strife-2.txt
@@ -152,4 +152,5 @@ URLs:
 -------------------------------------------------------------------------------
 Track: Duet
 Duration: 2:37
-Has URLs: no
\ No newline at end of file
+URLs:
+- https://www.youtube.com/watch?v=oJHJGgbpeMI
\ No newline at end of file
diff --git a/album/the-baby-is-you.txt b/album/the-baby-is-you.txt
index 1b17aaa8..0a3005e0 100644
--- a/album/the-baby-is-you.txt
+++ b/album/the-baby-is-you.txt
@@ -2,7 +2,7 @@ Album: The Baby is You
 Artist: Toby Fox
 Cover Art: Astroliner
 Has Track Art: no
-Date: September 27, 2010
+Date: October 13, 2010
 Date Added: January 12, 2021
 Groups:
 - Toby Fox
diff --git a/album/the-wanderers.txt b/album/the-wanderers.txt
index 97f2454d..73d19067 100644
--- a/album/the-wanderers.txt
+++ b/album/the-wanderers.txt
@@ -53,7 +53,7 @@ URLs: https://youtu.be/KrimTgZi5uk
 -------------------------------------------------------------------------------
 Track: Endless Expanse
 Artist: Erik Scheele
-Track Art: Guy
+Track Art: Carla Bravo
 Duration: 5:59
 Art Tags:
 - WV
diff --git a/album/unreleased-tracks.txt b/album/unreleased-tracks.txt
index ff7e4ab8..a561ecb6 100644
--- a/album/unreleased-tracks.txt
+++ b/album/unreleased-tracks.txt
@@ -1628,7 +1628,7 @@ URLs: https://www.youtube.com/watch?v=ejU1lK-3C4U
 Track: Celestial Fantasia
 Artist: Seth Peelle
 Duration: 5:48
-URLs: https://www.youtube.com/watch?v=dUA7oEyZT0Y
+URLs: https://www.youtube.com/watch?v=OEYox7zoOvU
 -------------------------------------------------------------------------------
 Track: Chrono Trigger
 Artist: Chrono Trigger
@@ -1738,7 +1738,7 @@ URLs: https://www.youtube.com/watch?v=yz5rDb7-kLk
 Track: Fear of the Heavens
 Artist: Secret of Mana
 Duration: 1:42
-URLs: https://www.youtube.com/watch?v=NFN0GLAMJ3k
+URLs: https://www.youtube.com/watch?v=dGna-qHdg-k
 -------------------------------------------------------------------------------
 Track: Featherlight
 Artist: Toris Crow
@@ -1879,7 +1879,7 @@ URLs: https://www.youtube.com/watch?v=ZZ5LpwO-An4
 Track: Historia Crux
 Artist: Final Fantasy
 Duration: 4:28
-URLs: https://www.youtube.com/watch?v=FWHJRNT8gcs
+URLs: https://www.youtube.com/watch?v=4CTjzAL3XT8
 -------------------------------------------------------------------------------
 Track: Hotel Mario
 Artist: Super Mario
@@ -1909,7 +1909,7 @@ URLs: https://youtu.be/0mYBSayCsH0
 Track: Icirrus City
 Artist: Pokémon
 Duration: 2:05
-URLs: https://www.youtube.com/watch?v=nDNqwdjCGBQ
+URLs: https://www.youtube.com/watch?v=vMTqSl-usYI
 -------------------------------------------------------------------------------
 Track: I Really, Really, Really Like This Image
 Artist: Hot Dad
@@ -1974,7 +1974,7 @@ URLs: https://www.youtube.com/watch?v=dFBKHSitIjo
 Track: Left-Hand Remix
 Artist: Rhythm Heaven
 Duration: 2:55
-URLs: https://www.youtube.com/watch?v=s8Mx18uR1dY
+URLs: https://www.youtube.com/watch?v=2xNDTPbdO80
 -------------------------------------------------------------------------------
 Track: Let it Snow! Let it Snow! Let it Snow!
 Artist: Sammy Cahn, Jule Styne
@@ -2423,7 +2423,7 @@ Commentary:
 Track: Terra's Theme
 Artist: Final Fantasy
 Duration: 3:50
-URLs: https://www.youtube.com/watch?v=a6t_uyg_pF8
+URLs: https://www.youtube.com/watch?v=PiI7rDqv9FQ
 -------------------------------------------------------------------------------
 Track: Title (Mega Man 3)
 Artist: Mega Man
@@ -2448,7 +2448,7 @@ URLs: https://www.youtube.com/watch?v=xq7z_xMGPM8
 Track: The Decisive Battle
 Artist: Final Fantasy
 Duration: 2:00
-URLs: https://www.youtube.com/watch?v=lxKb48wvt60
+URLs: https://www.youtube.com/watch?v=6SB4_iQWwoQ
 -------------------------------------------------------------------------------
 Track: The First Noel
 Artist: Lost in History
diff --git a/album/we-are-all-satellites.txt b/album/we-are-all-satellites.txt
index 4f1f9c97..7ea57917 100644
--- a/album/we-are-all-satellites.txt
+++ b/album/we-are-all-satellites.txt
@@ -9,40 +9,51 @@ Listed on Homepage: no
 Groups:
 - Clark Powell
 - Beyond
+URLs:
+- https://clarkpowell.bandcamp.com/album/we-are-all-satellites
 -------------------------------------------------------------------------------
 Track: Harrigan
 Duration: 4:32
 URLs:
+- https://clarkpowell.bandcamp.com/track/harrigan
 - https://soundcloud.com/plazmataz/harrigan
 -------------------------------------------------------------------------------
 Track: She Needs to Come Home
 Duration: 3:39
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/she-needs-to-come-home
 -------------------------------------------------------------------------------
 Track: Mischief
 Duration: 3:44
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/mischief
 -------------------------------------------------------------------------------
 Track: Miranda
 Duration: 3:22
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/miranda
 -------------------------------------------------------------------------------
 Track: A Romance of Protons and Neutrons
 Duration: 4:24
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/a-romance-of-protons-and-neutrons
 -------------------------------------------------------------------------------
 Track: A Heaven Broad and Ochre
 Duration: 4:09
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/a-heaven-broad-and-ochre
 -------------------------------------------------------------------------------
 Track: Lunatic
 Duration: 5:48
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/lunatic
 -------------------------------------------------------------------------------
 Track: An Old One
 Duration: 3:04
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/an-old-one
 -------------------------------------------------------------------------------
 Track: 15874
 Duration: 2:19
-Has URLs: no
+URLs:
+- https://clarkpowell.bandcamp.com/track/15874
\ No newline at end of file