Updated library, database, new stuff

ReadMe.md

@@ -3,10 +3,16 @@ not actually csv files, except `music-cleaned-2.csv`, which is tab-delimmited to
 handle this. It also was abandoned because of handling issues with the `csv`
 library on LuaRocks.
 
+As it has been a while since my initial work on this, I don't remember what
+order of operations led to my initial database, except that it contained all
+tracks played on Friday Night Tracks from episode 150-205. I have since added
+tracks from episodes 12-149 and 226-230.
+
 ## music.json
 
 An object of objects, each track indexed by a normalized form of its name, which
-is all lowercase alphanumeric characters only.
+is all lowercase alphanumeric characters only. Note that these are not enforced
+or formalized by the library, but convention I have adopted.
 
 - `names`: A list of names equivalent to this track (some tracks have duplicate
   names due to formatting differences)
@@ -23,13 +29,17 @@ is all lowercase alphanumeric characters only.
 
 A simple interface library to use in a Lua REPL.
 
-- `load(force)` (called immediately) loads `music.json`
-- `save()` saves to `music.json`
+- `load(force, file_name)` loads from specified file or `music.json` (called
+  immediately by default, but exposed so you can force a reload or a different
+  file)
+- `save(file_name)` saves to `file_name` or `music.json`
 - `add(str)` adds a new track (checks for duplicates)
+- `add_file(file_name)` adds new tracks from the specified file (file must have
+  one track per line, ignores empty lines)
 - `find(str)` finds possible track matches by normalizing the input string,
   returns them in a list
-- `set(match, info)` match can be a list (as is returned by find) or a
-  normalized track name, info must be a table of key-value pairs, these will be
-  set on the matched tracks, overwriting existing values if a key is already in
-  use
+- `set(match, info)` match can be a list (as is returned by find) or a track
+  name (either will be normalized), info must be a table of key-value pairs,
+  these will be set on the matched tracks, overwriting existing values if a key
+  is already in use
 - `normalize(str)` returns a normalized form of the input string

music.lua

@@ -8,23 +8,27 @@ function music.normalize(str)
   return str:gsub("%W", ""):lower()
 end
 
-function music.load(force)
+function music.load(force, file_name)
   if music.data and not force then
     print("Music library was already loaded, use 'music.load(true)' to force load.")
-    return
+    return false
   end
-  local file = io.open("music.json", "r")
+  local file, err = io.open(file_name or "music.json", "r")
+  if not file then error(err) end
   music.data = cjson.decode(file:read("*a"))
   file:close()
   print("Music library loaded.")
+  return true
 end
 
-function music.save()
+function music.save(file_name)
   local str = cjson.encode(music.data)
-  local file = io.open("music.json", "w")
+  local file, err = io.open(file_name or "music.json", "w")
+  if not file then error(err) end
   file:write(str)
   file:close()
   print("Music library saved.")
+  return true
 end
 
 function music.find(str)
@@ -41,41 +45,54 @@ end
 
 function music.add(name)
   local normalized = music.normalize(name)
-  if music.data[normalized] then
-    local duplicate = false
-    for _, existing_name in ipairs(music.data[normalized].names) do
+  local entry = music.data[normalized]
+  if entry then
+    for _, existing_name in ipairs(entry.names) do
       if existing_name == name then
-        duplicate = true
         print("Already in library.")
-        break
+        return false
       end
     end
-    if not duplicate then
-      table.insert(music.data[normalized].names, name)
-      print("Already in library. Added as alternate name of '" .. musoc.data[normalized].names[1] .. "'")
-    end
+    table.insert(entry.names, name)
+    print("Already in library (normalized to: '" .. normalized .. "'). Added as alternate name of '" .. entry.names[1] .. "'")
+    return true
   else
     music.data[normalized] = { names = { name } }
     print("Track added (normalized to: '" .. normalized .. "')")
+    return true
   end
 end
 
--- match is a normalized name or a list of normalized names, info is a table of key-value pairs to be set
+function music.add_file(file_name)
+  local file, err = io.open(file_name, "r")
+  if not file then error(err) end
+  for track in file:lines() do
+    if #track > 0 then
+      music.add(track)
+    end
+  end
+  file:close()
+  return true
+end
+
+-- match is a normalized name or a list of names, info is a table of key-value pairs to be set
 function music.set(match, info)
   if type(match) == "table" then
     for _, value in ipairs(match) do
       music.set(value, info)
     end
-    return
+    return true
   end
 
-  tab = music.data[match]
+  tab = music.data[music.normalize(match)]
   if not tab then
     print("'" .. tab .. "' does not exist!")
+    return false
   end
   for key, value in pairs(info) do
     tab[key] = value
   end
+  return true
 end
 
 -- returns a list of all tracks with a `url` key but no `downloaded` key.

sources/tracklist 225-230.txt

@@ -0,0 +1,366 @@
+Deadmau5 & LIGHTS - When The Summer Dies
+Gloria Tells - Heartbreaker (Instrumental Version)
+YACHT - You Fuck Me Up
+Grabbitz - Pigs In The Sky [Explicit]
+MGMT - Electric Feel [Justice Remix]
+Aldous Young - Bottles
+ilLegal Content - Trap My Guitar (Original Mix)
+ilLegal Content - Come On Dance (Original Mix)
+Soulwax - NY Excuse
+Zammuto - IO
+Auvic - Embers Inside (feat. Caroline Kim)
+Gramatik - No Way Out
+Zero, Noisy - Mother Nature (Original Mix)
+Feed Me - If It Bounces
+Tony Romera - MS69 (Original Mix)
+Feed Me - Tamp Tamp Tamp
+Nothing But Thieves - Futureproof
+YACHT - I Thought the Future Would Be Cooler
+Elderbrook - Old Friend
+Tollef - Sunshine (Extended Mix)
+Martin Garrix Tove Lo - Pressure (feat. Tove Lo)
+Sia, Kenzie - EXHALE (feat. Sia) (Original Mix)
+Pig&Dan - Breadrin Beats (Nicolas Massayeff Remix)
+Jungle - Truth
+Muzz, Cammie Robinson - Star Glide feat. Cammie Robinson (Original Mix)
+The Prodigy - Voodoo People (Pendulum Mix)
+Sub Focus - Rock It (Wilkinson Remix)
+ilLegal Content - GAS (Original Mix)
+Mitekiss, Pixie Cola - Seventeen feat. Pixie Cola (Original Mix)
+Pendulum & Hybrid Minds - Louder Than Words
+SY (DE) - Can't Get Enough (DJOKO Remix)
+Sekret Chadow - Mc Fly (Original Mix)
+-Urbano- - Countdown (Original Mix)
+Hybrid - No One Knows
+Wolfgun - Starlight
+Freestylers, Plump DJs - I Am feat. Plump DJs (Original Mix)
+Darius + Rotteen - ⌜𝙏𝙄𝘾𝙆𝙀𝙏 𝙋𝙇𝙀𝘼𝙎𝙀?⌟
+Bakey - Bring It Back (Original Mix)
+KOAN Sound - Elevator Machine Room
+Vittoria Fleet - David (Original Mix)
+Hybrid - End Of The World
+Terry Riley - A Rainbow In Curved Air
+Don Davis - Shake, Borrow, Switch
+Rob D - Clubbed to Death (Kurayamino Mix)
+The Who - Eminence Front
+Portal, Hippie Mafia - Wormhole Wobble (Original Mix)
+Bobmo - Sonic Soul
+Kikoru - Out of Service
+Coppola, 2STRANGE - Kings & Queens (feat. 2STRANGE) (Original Mix)
+Dr. Fresch, Glass Petals - The Answer (Original Mix)
+New Northern - Excuses (Original Mix)
+Artelax, Fortu & Mendoza - Hybrid (Club Mix)
+Dirty Sound Boys - Go Bro! (Extended Mix)
+Valve - Vague Voices
+Birocratic - Extra Fresh
+Ian Brown - Longsight M13
+Trent Reznor And Atticus Ross - The Place You Are Right Now
+Hidden Orchestra - Tired & Awake
+Jon Gomm - Butterfly Hurricane
+Fenick & Delayde - Longwayhome
+Hans Zimmer - The Mole
+Trent Reznor And Atticus Ross - Them and Us
+Above & Beyond - Common Ground
+Mord Fustang - The Lake
+Gloria Tells - Heartbreaker (Instrumental Version)
+The Knocks - Get Happy (NVDES Edit) [feat. Blu DeTiger]
+Tamtrum - Milky Boy
+Sunny Day Sets Fire - Brainless (Baron Von Luxxury Remix)
+ARTY - One Night Away (Extended Mix)
+Stephen Walking - JC-08 (2018)
+Gramatik - No Way Out
+Chaos Chaos - 2008
+-Urbano- - Give Me The Funky Beat (Original Mix)
+Elemental & Mister Frisbee - Grown Folks Night Out
+Case 82 - Elevate Your Love (Original Mix)
+Herve - Together (Illegal Bass Extended Mix)
+Ondamike - We Built This City On Bass (2021 Mix)
+SY (DE) - Can't Get Enough (DJOKO Remix)
+MUZZ feat. MVE - Out There
+Keeno - Pancake's Breakfast
+Keeno - Break the Silence
+Lacheque - ファンクBEATS
+Hoax - Big Up (Original)
+Bill Brown - Tour Intro - WindowsXP OS
+Bill Brown - Tour6bed - WindowsXP OS
+The Black Mamba - Love Is on My Side (Portugal)
+JGT - Get Down (Original Mix)
+Colombo - Always Remember It (Original Mix)
+Ebende - For Love (Original Mix)
+Black Strobe - Boogie In Zero Gravity (Radio Edit)
+Elemental & Mr Frisbee - READY OR NOT Feat: Dr Syntax
+Why Mona - At the Top
+Macy Gray and The California Jet Club - Thinking of You
+Ian Taylor - Garden
+James Hannigan & Ian Taylor - Garden
+James Hannigan - Village Dance
+melodysheep - Pressure Waves
+League of Legends - Awaken
+Infected Mushroom - Becoming Insane
+Demi Riquisimo - Dictionary of fools
+Sidney Charles - Grindin (Original Mix)
+Ranger Trucco - In My Mind (Original Mix)
+Westend - Get This Party Started (Extended Mix)
+Nari - That's The Way (Original Mix)
+Karin Park, Aspyer - The Rest Of Your Life feat. Karin Park (Extended Mix)
+DJ Icey - All The Time (Club Mix)
+Herve - Together (Illegal Bass Extended Mix)
+Kolombo, Marcellus (UK) - Twisted (Extended Mix)
+Carbon - Switzerland Connection (Original Mix)
+Kideko - Around the World (Original Mix)
+Kikoru - Out of Service
+The Midnight - Vampires
+Rchetype - Secondhand Smoke
+Jon Gomm - Check You're Still Breathing
+Yoko Kanno - Space Lion
+BT - The Internal Locus
+Westwood Recordings x Moontricks x Shred Kelly - For What It's Worth
+Half an Orange - Mark Twain (Glacier Remix)
+Gloria Tells - Heartbreaker (Instrumental Version)
+MNDR - Save Yourself (with Big Data)
+Dyro, Conro - Memory Bank (Original Mix)
+Studio Killers - Ode To The Bouncer
+Gramatik - No Way Out
+Keenhouse - Starpower Outage
+pronobozo - Coming Back [Explicit]
+Tokyo Machine, Saxsquatch - CANTINA (Original Mix)
+Nitro Fun - Cheat Codes
+Nobody Beats The Drum - Let It Go (Original Mix)
+Phoenix - Lisztomania (Alex Metric remix)
+The Shoes - Time to Dance (Sebastian Remix)
+The Sponges - Make It Juicy! (Original Mix)
+Shift K3Y - Push Ya Back Out (Extended Mix)
+Elite Force - Melodik Hypnotik (Miles Dyson Mix)
+Aldous Young - Bottles
+Jendrik - I Don't Feel Hate (Germany)
+Boom Boom Satellites - Loaded (Japan Tour 2006 Live Studio Coast)
+Conro - The Chase (Original Mix)
+Urbandawn, Tyson Kelly - Come Together feat. Tyson Kelly (Original Mix)
+Sub Focus - Airplane (Culture Shock Remix)
+Gentlemens Club, The Slopes - Wasted Time (Original Mix)
+Charlotte Haining - Carried Away (Deadline Remix)
+菅野よう子 (Yoko Kanno) - walt
+Kyan - Nothing Beyond
+Bongo and The Soul Jar - Western road
+SY (DE) - Can't Get Enough (DJOKO Remix)
+Austero - Waterdogs
+Venetian Snares - Nutimik
+KOAN Sound - Traverse
+Hybrid - Flashpoint (Original Mix)
+Hybrid - Nails (Original Mix)
+Gjon's Tears - Tout L'Univers (Switzerland)
+Infected Mushroom - Leftovers
+Don Davis - Shake, Borrow, Switch
+神前暁 (Yoko Kanno) - Inpatience
+Professor Elemental - Don't Feed The Trolls
+Demi Riquisimo - Dictionary of fools
+Tiny Magnetic Pets - Cold War Neon
+神前暁 (Yoko Kanno) - Whereabout of truth
+The Presets, Golden Features - Control (Original Mix)
+Fulltone - Happy Accidents (Original Mix)
+Fabian Krooss, Jacob Stille - Watatata (Original Mix)
+Greenage - A Walk in the Clouds (Original Mix)
+Jules, Spencer Brown, Wilt Claybourne - waves.wav feat. Jules (Original Mix)
+Noissier - Signals (Original Mix)
+Spencer Brown - Windows 95 on Acid (Original Mix)
+Renzo Marini - Insane Robot (Digital Mess Remix)
+From Now On - Clearer Views
+Kikoru - Waiting in Vain
+COLONEL RED - Wake
+BT - Pale Antlers
+Austero - Nosebleed
+L'Indécis - Fried Potatoes
+Gyvus - Lemon Tea
+Bonus Points - Sangria Sunset
+Emapea - In Nature
+Alev Lenz - May The Angels
+Eric Rylos - Waking Out of the World
+Micatone - A Part Of Me
+Saint Motel - Van Horn
+Gloria Tells - Heartbreaker (Instrumental Version)
+Dynamite MC, Krafty Kuts - Masterplan (feat. Dynamite MC) (Original Mix)
+City 17 - Making Good Time (V.F.D Remix)
+BSOD - Pitches Love Me
+Aldous Young - Bottles
+Eddie - Shine (Original Mix)
+Winnetka Bowling League - Kombucha (BRKLYN Remix)
+Icona Pop - I Love It feat. Charli XCX (Hot Mouth Remix)
+GoldFish, Julia Church - Heart Shaped Box (Original Mix)
+Knife Party - Ghost Train
+Bodyrox - Yeah Yeah (Chocolate Puma Remix)
+Nicky Romero, Teamworx, Joseph Feinstein - World Through Your Eyes feat. Joseph Feinstein (Original Mix)
+Jaycen A'mour, Downlowd - Street Mantra (Original Mix)
+Exeat - I Don't Want You to Go (Extended Mix)
+From Now On - Clearer Views
+Particle House - AFRD
+Noga Erez - NO news on TV (Acoustic Live - Kids Against The Machine)
+Young The Giant - Mirror Master
+The Cat Empire - Hello
+Demi Riquisimo - Dictionary of fools
+Cheap Cuts - Check Your Phone (feat. Pete Wentz)
+Why Mona - Rabbit Hole
+Grant & Emily Vaughn - Move On
+Daniel Olsén & Jonathan Eng - Begin Again (feat. Linnea Olsson)
+Unlike Pluto & Why Mona - Rewind
+Two Feet - I Feel Like I'm Drowning
+Pig&Dan - Breadrin Beats (Nicolas Massayeff Remix)
+BONES UK - Filthy Freaks
+Defunk, Slynk - Techno Viking (Original Mix)
+The Weeknd - Blinding Lights (Original Mix)
+Amoss, Fre4knc - Dragger (Original Mix)
+Chimpo, Kings Of The Rollers - Shella feat. Chimpo (Halogenix Remix)
+One True God - Addicted (Kumarion Remix)
+Unglued - Crusty Rolls (Original Mix)
+Flegma - Numen (Vertex Remix)
+Kikoru - Out of Service
+Craig Palmer - Name Dropper
+Larry Owens - Interlude (The Joy Of Painting)
+Stefan Olesten - Bright Expectations [Main Track]
+Professor Elemental - Good Morning feat. Nick Maxwell
+Mind Tree - Close Your Eyes So You Can See
+Digital Base, Andy Vibes - Baby Don't Go (Original Mix)
+Danny Dee - Shake Your Body (Original Mix)
+Boom Boom Satellites - Joyride Remix - Progression > Final Operation - BBS Remix
+Origa - inner universe
+Daniel Pemberton - The Musicians Play Their Instruments…
+Above & Beyond - Alone Tonight (Live At The Hollywood Bowl)
+Boom Boom Satellites - Entering Orbit
+Art Of Tones - Where The One Is (Original Mix)
+Milion (NL) - Treat U Right (Original Mix)
+Hausman & Wynnwood - Catharsis (Extended Mix)
+Kasper Koman - The Blind Navigator (Extended Mix)
+Phaeleh - Journey
+Yheti - A Little Bit Goes a Long Way
+Stephan Bodzin - Liebe Ist...
+Nightmares On Wax - I Am You (Live In Chicago) (Original Mix)
+Marcus Marr, Chet Faker - Learning For Your Love
+Swardy - Down
+Blue Dot Sessions - This Our Home
+Yazz Ahmed - Ruby Bridges
+Air - All I Need
+Swardy - I Remember Maine
+little robots - He Carries Heavy Loads
+Jingle Punks - Don't Hate Me
+Gloria Tells - Heartbreaker (Instrumental Version)
+Chris Lake, Chris Lorenzo, Anti Up - Sensational (Extended Mix)
+Haywyre - Let Me Hear That (Krafty Kuts Remix)
+The Brainkiller - Don't Make Me Hurt (Original Mix)
+ilLegal Content - Relationships (Original Mix)
+Professor Kliq - Chaos
+Freeland - Under Control
+BSOD - Fives
+Alex Metric & Steve Angello - Open Your Eyes (Original Mix)
+Curbi, Brooke Tomlinson - Spiritual (Mriya) [feat. Brooke Tomlinson] (Extended Mix)
+Christian Lukes, Jack Fluga - Put Your Hands In The Air feat. Jack Fluga (Extended Mix)
+Feed Me - Silicone Lube
+Beyond Therapy, EchoFly, Angie Brown - Higher (Beyond Therapy Extended Rave Mix)
+Aldous Young - Bottles
+Niall Horan - Nice To Meet Ya
+Fever The Ghost - Source
+Justice - Helix
+Tom Holkenborg - Meet Sonic (Before We Start I Gotta Tell You This)
+Pedestrian Tactics - The Accident
+Freeland - Best Fish Tacos in Ensenda
+Kikoru - Out of Service
+Pirate Jams - I Want You (Original Mix)
+Zoe Johnston, Above & Beyond - Love Is Not Enough feat. Zoë Johnston (Hybrid Minds Remix)
+Phace & Kemal - MODE 101
+Chill Qin - 大夢初醒 Awakening Into Buddhahood
+Don Davis - Switch Or Break Show
+Don Davis - Shake, Borrow, Switch
+Atype - Believe In Us (Original Mix)
+Burn In Noise - Orders from a Machine (Purple Shapes Remix)
+Schmid - 140 Part 3
+Pray For Bass - Let's Go (Original Mix)
+Colombo - Move Move (Original Mix)
+FM-3 - Non Stop (Original Mix)
+Bill Brown - Tour Intro - WindowsXP OS
+Bill Brown - Tour6bed - WindowsXP OS
+Nuits De Sons - Cosmic Girl (Original Mix)
+BT - 1.618 (Electronic Opus Version)
+Avari - Of The Heavens
+Freeland - Physical World
+The Sponges - Jerry Brain (Extended Mix)
+Sasha, dubspeeka - Khepri (Sasha Rework)
+Fort Arkansas - The Deep End (Croatia Squad Remix)
+Juan Hansen, Hannes Bieger - Burn Your Love (Original)
+凛として時雨 (Ling Tosite Sigure) - Enigmatic Feeling (中野雅之 Remix) (Masayuki Nakano)
+Terry Riley - A Rainbow In Curved Air
+Andrew Huang - Liftoff
+Principles Of Geometry - Streamsters
+Caravan Palace - Miracle
+Jeremy Blake - Cerulean Drip
+Russ Landau - The Strong Will Survive
+COLONEL RED - Stand Up
+Hidden Orchestra - Footsteps
+Nightmares On Wax, Mozez - Citizen Kane (Album Version)
+Professor Kliq - Kwanusila
+From Now On - Clearer Views
+Nathan Fake - The Sky Was Pink (Holden Remix)
+Yoshihisa Hirano & Hideki Taniuchi - Kyrie for orchestra
+Trevor Something - Analogue Soul
+melodysheep - What Do You Hear?
+melodysheep - A Sound from the Void
+Blue Dot Sessions - In Passage
+Approaching Nirvana - Dire Dire Docks Remix
+Mikel & GameChops - Dark World
+Radiohead - Desert Island Disk
+I DONT KNOW HOW BUT THEY FOUND ME - Sugar Pills
+Gloria Tells - Heartbreaker (Instrumental Version)
+grandson, Moby Rich - Happy Pill
+Tamtrum - I Think Of Me When I Touch Myself
+Auvic - The Oathkeeper
+Alex Gopher - The Game (Eddy Temple Morris Remix)
+Missill - Glitch feat. Jahcoozi (Original Mix)
+Aldous Young - Bottles
+Oliver - Control (Nom De Strip Remix)
+Rob Gasser - Meltdown (Feat. Richard Caddock) (Original Mix)
+Karl Sav - Octoadic (Original Mix)
+Boom Boom Satellites - Flutter
+Will Jay - Lies
+BONES UK - Limbs
+Artisan - Plexus
+Plump DJs - Rocket Soul (Original Mix)
+AGL - Monophonic
+NoMBe - Do Whatchu Want To Me
+Harry Belafonte - Paradise In Gazankulu
+Hybrid - Just For Today
+Freeland - Burn the Clock
+Boom Boom Satellites - On The Painted Desert
+Trentemøller - Moan (Trentemøller Remix Radio Edit)
+Austero - Waterdogs
+ShockOne - Polygon feat. Reija Lee (Original Mix)
+Ross D - I Need You
+DC Breaks - Halo Vip (Original Mix)
+Kikoru - Out of Service
+Gramatik - Native Son Prequel (feat. Leo Napier)
+Renegade Brass Band - Vicarious Visions
+Professor Elemental - The Inn At The End Of Time (feat. Nick Maxwell)
+Calum Graham - Wild Woman
+Cosmic Energy, Heavy Drop - The Future (Original Mix)
+Tripo, Samra - Selfie (Original Mix)
+From Now On - Clearer Views
+Grabbitz & Pierce Fulton - Information Overload
+Joe Garston - Adventures In Suburbia (Original Mix)
+Jeremy Blake - You Will Hear Thunder
+Marsh - Find Me (feat. Katherine Amy) (Original Mix)
+PrototypeRaptor - Aire Blvd
+Shift K3Y - Rhythm Of The Drum (Extended Mix)
+Freqish - Let's Get High (Original Mix)
+Tommy Theo, Waze & Odyssey - Always (Extended)
+Bill Brown - Tour Intro - WindowsXP OS
+Funkstörung - Laid Out (feat. Anothr)
+BOOM BOOM SATELLITES - 40 -FORTY-
+Bill Withers - Use Me
+Boom Boom Satellites - Spellbound
+Solar Bears - Longer Life
+Au5 - The Void
+Phil Collins - Two Worlds
+Gregory Porter - Liquid Spirit
+Kenny Loggins - I'm Alright
+Joe Walsh - Rocky Mountain Way
+Paul Simon - 50 Ways To Leave Your Lover
+Ben Salisbury, Geoff Barrow - Entering Devs [FNT Edit]
+Free - Oh I Wept
+AVEM - Strum (Original Mix)
+chad lawson - the story never ends