removed old data, fixed search.lua, searched for more music

This commit is contained in:
Tangent / Rose / Nebula Rosa 2022-02-09 08:54:15 -07:00
parent d4b672d9e0
commit 197d53e226
15 changed files with 290 additions and 11771 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
*.DS_Store
tmp/

View File

@ -1,12 +1,7 @@
Note: Due to commas existing in the source data, all CSV files in `sources` are
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.
tracks from episodes 12-149 and 226-234.
## music.json
@ -28,7 +23,7 @@ enforced by the library.
updating the database, sue me) (note: this script has an issue with tracks
with special characters in their names, I am not sure of the cause)
(Note: I'm sure I've downloaded many tracks that aren't marked as downloaded.)
(I'm also sure I've downloaded many tracks that aren't marked as downloaded.)
## music.lua

File diff suppressed because one or more lines are too long

View File

@ -1,16 +1,19 @@
#!/usr/bin/env lua
#!/usr/bin/env luajit
local success, urlencode = pcall(function() return require("urlencode") end)
if not success then
urlencode = nil
print("Install 'urlencode' through LuaRocks for this script to function optimally.")
end
local success, music = pcall(function() return require("music") end)
if not success then
print("music.lua library (and its adjacent music.json database) must be installed.")
return
local function checkreq(name, display)
local success, library = pcall(function() return require(name) end)
if not success then
print("'" .. display or name .. "' missing.")
return nil
else
return library
end
end
local urlencode = checkreq('urlencode')
checkreq('cjson', 'lua-cjson')
local music = checkreq('music')
local help = [[Usage:
search <count> <funkwhale>
@ -20,7 +23,7 @@ local help = [[Usage:
<funkwhale>: Whether or not to search my FunkWhale instance for the track also.
Optionally requires urlencode to be installed from LuaRocks.
Currently only tested on MacOS 11.4 (Big Sur).
Currently only tested on MacOS 11.4 to 12.1.
]]
if arg[1]:find("h") then
print(help)

View File

@ -1,37 +0,0 @@
#!/usr/bin/env lua
-- csv library appears to not function correctly here, so a different script was used
local csv = require("csv")
local cjson = require("cjson")
local input = csv.open("music-cleaned-2.csv", { separator = "\t" })
local music = {}
for fields in input:lines() do
music[fields[1]] = {}
if fields[2] and #fields[2] > 0 then
local alternate_names = fields[2]
local names = {}
local index = alternate_names:find("|")
while index do
local name = alternate_names:sub(1, index - 1)
if name and #name > 0 then
table.insert(names, name)
end
alternate_names = alternate_names:sub(index + 1)
end
if alternate_names and #alternate_names > 0 then
table.insert(names, alternate_names)
end
if #names > 0 then
music[fields[1]].alternate_names = names
end
end
end
local data = cjson.encode(music)
local output = io.open("music.json", "w")
output:write(data)
output:close()

View File

@ -1,25 +0,0 @@
#!/usr/bin/env lua
local htmlparser = require("htmlparser")
local input_file, err = io.open("grand-tracklist-150-to-225.html", "r")
if not input_file then error(err) end
local root = htmlparser.parse(input_file:read("*a"), 10000)
input_file:close()
local list = root:select("li")
local output_file = io.open("music.csv", "a")
for _, item in ipairs(list) do
local content = item:getcontent()
if #content < 200 then
output_file:write(content .. "\n")
else
print("Item of length " .. #content .. " ignored.")
end
end
output_file:close()

View File

@ -1,22 +0,0 @@
#!/usr/bin/env lua
local cjson = require("cjson")
local music = io.open("music-cleaned.csv", "r")
local unique_tracks = {}
for track in music:lines() do
local normalized_track = track:gsub("%W", ""):lower()
if unique_tracks[normalized_track] then
table.insert(unique_tracks[normalized_track].names, track)
else
unique_tracks[normalized_track] = { names = { track } }
end
end
music:close()
local output_file = io.open("music.json", "w")
output_file:write(cjson.encode(unique_tracks))
output_file:close()

View File

@ -1,42 +0,0 @@
#!/usr/bin/env lua
-- local csv = require("csv")
--
-- local music = csv.open("music-cleaned.csv", {
-- separator = ",",
-- header = true,
-- columns = {
-- track = { name = "Track" },
-- url = { name = "Download URL" },
-- note = { name = "Note" },
-- duplicate = { name = "Duplicate" },
-- }
-- })
local music = io.open("music-cleaned.csv", "r")
local unique_tracks = {}
-- for fields in music:lines() do
-- local track = fields.track
for track in music:lines() do
local normalized_track = track:gsub("%W", ""):lower()
if unique_tracks[normalized_track] then
table.insert(unique_tracks[normalized_track].alternate_names, track)
else
unique_tracks[normalized_track] = { name = track, alternate_names = {} }
end
end
music:close()
local output_file = io.open("music-cleaned-2.csv", "w")
for _, track in pairs(unique_tracks) do
local alternate_names = ""
if #track.alternate_names > 0 then
alternate_names = table.concat(track.alternate_names, "|")
end
output_file:write(track.name .. "\t" .. alternate_names .. "\n")
end
output_file:close()

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +0,0 @@
#!/usr/bin/env lua
local music = io.open("music.csv", "r")
local unique = {}
for line in music:lines() do
if not unique[line] then
unique[line] = line
end
end
music:close()
local output_file = io.open("music-cleaned.csv", "w")
for line in pairs(unique) do
output_file:write(line .. "\n")
end
output_file:close()

View File

@ -0,0 +1,272 @@
Biig Piig - Feels Right
Gloria Tells - Heartbreaker (Instrumental Version)
The Pretty Reckless - Fucked Up World
The Young Punx - Rock Star (Understand)
Aldous Young - Bottles
Monsta - Messiah (Feed Me Remix)
Gammer - Pigface (Dougal & Gammer Edit)
Wolfgang Gartner - Mike Tyson (Original Mix)
The Young Punx - Boys Like Bass feat. Reset! (Edit)
Felguk - Blow Out (Lazy Rich's Impossible Remix)
Yuksek - Extra Ball ( The Noisy Freaks Remix )
Plastik Funk, Dario Trapani, Ivan Cappello, Sh3 - Sweet Harmony feat. Sh3 (Plastik Funk Extended Club Edit)
Zedd, Grabbitz, VALORANT - Die For You (Zedd Extended Remix)
DJs from Mars - Phat Ass Drop (Club Mix)
Gramatik - No Way Out
The Weeknd - Sacrifice
C2C Feat Derek Martin - Happy
EyeOnEyez Gucci Mane Pedestrian Tactics - Polar Bear (feat. Gucci Mane) [Pedestrian Tactics Remix]
Pineo & Loeb & Sparkee - Ghosts 'N' Stuff (feat. Christiana)
SY (DE) - Can't Get Enough (DJOKO Remix)
The Young Punx - Sugarcandysupernova (Edit)
The Young Punx - Love Tha Sound (Original Mix)
Vylet Pony - the yak song (ft. nekosnicker, galaxysquid, & namii)
Nona Reeves - LOVE TOGETHER (Original Version)
Paramore - CrushCrushCrush (Rchetype Remix)
The Young Punx - Drum and Bacharach (Original Mix)
Grafix featuring Reiki Ruawai - Somewhere
Wilkinson, iiola - Close Your Eyes (Original Mix)
Shantel - Backwood
Lords Of Motion - Just Feel It (Original Mix)
Au5 - Cryptochrome
Vylet Pony - Our Light and After (ft. Pepper Mei)
IMANU & The Caracal Project - Neiges
Jack Shore & Tollef - Dreaming of Me (feat. Jaime Deraz)
David Blazer - Finally (Bungalow Remix)
HEYZ - Darkest Little Friend (feat. darkDARK) (Original Mix)
AC/DC - Wild Reputation
Jackson And His Computerband - Billy
From Now On - Clearer Views
The Chemical Brothers - Snow
The Chemical Brothers - Escape Velocity
Schmid - 140 Part 3
A.Skillz - 7 Day Weekend (Original Mix)
The Young Punx - Kowloon Kickback (Original Mix)
Sekret Chadow - This Is Old School (Original Mix)
Vylet Pony - Voyages
Dusky - Ingrid Is a Hybrid
Darius + Rotteen - ⌜𝙏𝙄𝘾𝙆𝙀𝙏 𝙋𝙇𝙀𝘼𝙎𝙀?⌟
Nigel Good feat Sarah Clark - Always Running (Original Mix)
U2 - Mysterious Ways
Kikoru - Out of Service
Kikoru - Are You Sure
June LaLonde - Empty The Chair
Justin Jay - Storm ft. Chris Lorenzo
Vylet Pony - THE THINGS THAT BIND US (ft. CalamariSpider)
Underworld - Jumbo
[Dunkelbunt] - In the fields of Musashino
BOOM BOOM SATELLITES - PANACEA
Tosca - H.D.A.
Moods - Snaring River
Otxhello - Happy In My Mind
Mac Quayle - 1.3_1-Ichosethis.ogg
Lena Raine - Madeline and Theo
Nightmares on Wax - On It Maestro
Moontricks - Midnight Groove (Original Mix)
Fox Stevenson - Good Time
Gloria Tells - Heartbreaker (Instrumental Version)
Tamtrum - Ass Rider
Auvic - Portal Drive
Hideki Naganuma - Sneakman
London Elektricity - All Hell Is Breaking Loose
Boom Boom Satellites - Shut Up and Explode
Artisan - Plexus
Aldous Young - Bottles
Plump DJs - Gobbstopper (Original Mix)
Mord Fustang - Milky Way
Sinden, The Count - Beeper feat. Kid Sister (Fake Blood Remix)
Kill the Noise - Louder (feat. Tommy Trash)
TAISUN - Senorita Remix (Perfect Driver Music)
Pig&Dan - Breadrin Beats (Nicolas Massayeff Remix)
Jungle - House In LA
Low Hum - House On Fire
Rezz, Dove Cameron - Taste of You (Original Mix)
Froxic - Shock Therapy (Original Mix)
No Mana - M00N (Original Mix)
Pendulum - Girl In The Fire
MUZZ feat. PAV4N & Miss Trouble - The Warehouse
OneDa, Sam Binga & Particle - Rude Girl
Rchetype - Supernova
Nhato - Atlantis [FNT 138 BPM Edit]
Au5 & AMIDY feat. Karra - Way Down [Paradox's Melody Only Edit]
PROFF - Whale Song (Extended Mix)
deadmau5 - Hyperlandia feat. Foster The People (Radio Edit)
Akinyemi & Birocratic - Time
Mord Fustang - THE PRISM OF TIME
Au5 and Chime - Voidwalkers
Nobuko Toda x Kazuma Jinnouchi - Noiseless Warzone
Professor Elemental - End Of Level Boss
Claude VonStroke, Mike Kerrigan - I Caught A Vibe (Original Mix)
D-Fast Beats - Moving Your Ass (Original Mix)
Keenhouse - Civic Transit (Anoraak Lax Rmx)
Auvic - Inner Journey (feat. Robot Love)
Auvic - Fugue Arts
Kerry Leva - Stay With Me
Test Shot Starfish - Ascent
David Arnold and Michael Price - The Game Is On
サカナクション (Sakanaction) - Ame (B) -SAKANATRIBE × ATM version-
From Now On - Clearer Views
Sekret Chadow - This Is Old School (Original Mix)
Ray Parker Jr - Just Havin' Fun
Carl Carlton - Groovin
神前暁 - Impending darkness
Maribou State - Tongue
Mr. Bill - Corot-7b
Solar Bears - Longer Life
Arcane Kelci Hahn - A Story of Opposites
Outsiders, Freedom Fighters - Sticklights (Modus Remix)
Eskimo - Sex-A-Holica
Till Von Sein - Graceland (Original Mix)
Eleonora, Jelly For The Babies, Ultravizion - Amber Lake (OHMZ Deep Vision)
Dirty Vegas - Days Go By (CamelPhat Extended Remix)
MK, Celeste - Stop This Flame (Celeste x MK Extended)
Local Singles - NIRFU (Extended Mix)
Christian Burns - Any Love (Hausman Extended Remix)
Wolfgun - STARS FALLING
Peace Orchestra - Double Drums
[Dunkelbunt] - In the fields of Musashino
Philanthrope & mommy - Burgundy
HIYU - Oceans of Luma Teaser (Furality Online Xperience)
BT - Smartbomb
Gloria Tells - Heartbreaker (Instrumental Version)
Devora - Body Bag [Explicit] (ROMES Remix)
Confetti - Rob A Bank
Detach - Timeline (Original Mix)
Aldous Young - Bottles
Aggresivnes - Put The New Needle (Colombo Remix)
ilLegal Content - Fashion Killer (Original Mix)
ShockOne - Polygon (Dirtyphonics Remix)
SY (DE) - Can't Get Enough (DJOKO Remix)
Above & Beyond - Blue Sky Action
Above & Beyond - A.I. (Original Mix)
Fedde Le Grand, Merk & Kremont - Give Me Some (Extended Mix)
Landis, DJ Crespo - Funked Up (Original Mix)
Christian Lukes, Jack Fluga - Put Your Hands In The Air feat. Jack Fluga (Extended Mix)
MUZZ - Born For This
Michael Jackson - Thriller (Steve Aoki Midnight Hour Remix)
From Now On - Clearer Views
Autolux - Blanket
Jungle - Heavy, California
deadmau5 - Cat Thruster
Sigrid - Mirror
Pedestrian Tactics - Where'd My Head Go? (Original Mix)
Demi Riquisimo - Dictionary of fools
Boston - Rock & Roll Band
Camp Kubrick - Johnny's Online (Original Mix)
Haim - Now I'm In It
Boom Boom Satellites - Back On My Feet
Professor Kliq - The Most Beautiful Day (2013)
Bill Brown - Tour Intro - WindowsXP OS
Bill Brown - Tour6bed - WindowsXP OS
MUZZ feat. MVE - Out There
1991 - Odyssey (Original Mix)
Danny Byrd, D Double E - Selecta (Extended)
Seibel - ICO (Original Mix)
Au5 & AMIDY feat. Karra - Way Down [Paradox's Melody Only Edit]
Yiannis Ioannides - Control?
Professor Kliq - 28 Days In 2019
Professor Kliq - 28 Days In 2019
Mord Fustang - ARTIFACT 2
Rage Against The Machine - Wake Up
Snake City - Trouble Finds Me (Instrumental Version)
Till Von Sein - Graceland (Original Mix)
Tim Carleton & Darrick Deel - Opus No. 1
Till Von Sein - Graceland (Original Mix)
Nobuko Toda x Kazuma Jinnouchi - Raiders
The Darrow Chem Syndicate - Future Message (Rasco Remix)
Summer Bright, Mr Stabalina - Put Ya Hands Up (Original Mix)
GreenFlamez - Flow (Original Mix)
Professor Elemental - Show Stopper (feat. Nick Maxwell)
Purple Disco Machine, Pink Flamingo Rhythm Revue - Money Money (Original Mix)
Four Tet - 4T Recordings (Original Mix)
Night Riots - Tokyo Diamond Eyes (feat. The Holy Dark) [Acoustic]
Infected Mushroom - Walking on the Moon (Original Mix)
Kikoru - Out of Service
Kikoru - Are You Sure
Don Diablo - Cheque (Original Mix)
Tian - Far Away (Original Mix)
Hugo Doche - Waiting For (Extended Mix)
Kah-lo, Riton - Fake I.D (Original Mix)
Mark Henning - Jilted Love (Original Mix)
Mic Newman - The Aries (Original Mix)
Hybrid - Lights Go Down Knives Come Out
Mr FijiWiji & Direct - Tomorrow (feat. Matt Van & Holly Drummond)
Monsieur Dodo - Road
Tiny Magnetic Pets - Here Comes The Noise ll (White)
Quivver - Moonlight Pools (Original Mix)
Air - La femme d'argent
SAULT - Wildfires
CVD - Inner Mind Jazz
Dayzer - Forget I Exist
Kaya Project - Walking Through (Ambient Mix)
Blue Dot Sessions - In Passage
Blue Dot Sessions - Tower of Mirrors
Hentzup - what you gonna do
Emapea - Big Small Talks
plusma - case closed
L'Indécis - Fried Potatoes
WYS, Sweet Medicine - Spanish Castle
Pale 3 - Opening (Sissi Search) (Pale 3 feat. Michael Brook)
Trevor Gordon Hall - Pine Tree and Power Lines
Jeremy Blake - Like the World Is New
Gramatik - No Way Out
Daiki Kasho & Jonathan Underdown - SURV1V3
Greenskeepers - Vagabond
Tamtrum - Smart
Feed Me, Crystal Fighters - Love Is All I Got (Original Mix)
SY (DE) - Can't Get Enough (DJOKO Remix)
Casual, Tony Romera - Boogie feat. CASUAL (Extended Mix)
Syd Arthur - Edge Of The Earth
Cheap Cuts - Check Your Phone (feat. Pete Wentz)
Pasha, Ellis - Brand New Phone (Original Mix)
zircon - Take the Metro
BOOM BOOM SATELLITES - Let It Lift
CIOZ - Suddenly Silence (Original Mix)
Blanke - Breathe (Original Mix)
K Motionz, Emily Makis - High Note (Extended Mix)
Calyx & TeeBee - Set the Tone (Original Mix)
Etherwood - They're Here
Florian Seraul - Up and Go
Hybrid - Lost Angels
Lacheque - Don't Sink
Mystic State feat. Elana Montgomery - Fly
Goldie - The Mirrored River
Kassian - London Orbital (Original Mix)
James Hannigan & Ian Taylor - Oasis
The Queenstons - i'm sure it's ok
Favored Nations - The Set Up
Kikoru - Out of Service
Kikoru - Are You Sure
Lone - Hidden by Horizons feat. Morgane Diet (Original Mix)
Virtual Riot - Logout (Original Mix)
Colonel Red - Talk 2 Me
The Crystal Method - High Roller
DJ DIlect, Sorrow Sky - Days Gone (Bass Mix)
Freeland - Big Wednesday
CVD - Dog Voices
VOLO - Dreamstate
Japanese Breakfast - Posing in Bondage
Soul Inscribed - DJ Lift Me
JazzZ - Wetin
Till Von Sein - Graceland (Original Mix)
Eskimo, CPU - Filthy Dog (Original Mix)
Eskimo, DJ Vlado - Ave Summa That (Original)
Neelix - You & I Belong (Progressive Mix)
Bill Brown - Tour6bed - WindowsXP OS
Jokke Ilsøe - Feeling Good (Trentemøller Remix)
Moby - Go (Trentemøller Remix)
Giant, Dot N Life - Moving On (Extended Mix)
York - Farewell To The Moon (PROFF Extended Remix)
LQ - Keep Hiding (Original Mix)
XAI - エバーグリーン (Evergreen)
A.M. Architect - Unspoken
Jon Gomm - Swallow You Whole
Nightmares on Wax - Wonder (feat. Haile Supreme & Shabaka Hutchings)
FC Kahuna, John Digweed, Damian Lazarus - Hayling (John Digweed & Nick Muir Reprise)
Jacob Collier - He Won't Hold You
Yoshihisa Hirano, Hideki Taniuchi and Various - Kitai
Yoko Kanno / Raj Ramayya - Strangers
CVD - And Man Created Karma
VOLO - Fade to Light
L'Indécis - Staying There
London Grammar - Hey Now