dreamer/PreviouslyOnIFM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of ssh://git.idiopolis.nl:2222/dreamer/PreviouslyOnIFM into develop

Browse Source
This commit is contained in:
dreamer 2020-10-16 13:25:26 +02:00
commit d88e0c6d35
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/handlers/artisthandler.lua
View File

@ -26,29 +26,29 @@ local function Artisthandler(self)
end
local tracks = db.query([[
SELECT track.name AS track_name, track.id
FROM track_artists
INNER JOIN
tracks AS track ON (track_artists.track = track.id)
WHERE track_artists.artist = ?
SELECT track.name AS track_name, track.id
FROM track_artists
INNER JOIN
tracks AS track ON (track_artists.track = track.id)
WHERE track_artists.artist = ?
]], artist["id"])
artist["tracks"] = tracks
for i, track in ipairs(tracks) do
local airtimes = db.query([[
SELECT airtime
FROM airtimes
WHERE track = ?
SELECT airtime, station AS station_id
FROM airtimes
WHERE track = ?
]], track["id"])
artist["tracks"][i]["airtimes"] = {}
for j, airtime in ipairs(airtimes) do
table.insert(artist["tracks"][i]["airtimes"], airtime['airtime'])
table.insert(artist["tracks"][i]["airtimes"], airtime)
end
local releases = db.query([[
SELECT release.id, release.name AS release_name
SELECT release.id AS release_id, release.name AS release_name
FROM track_releases
INNER JOIN
releases AS release ON (track_releases.release = release.id)

22
code/handlers/releasehandler.lua
View File

@ -26,29 +26,29 @@ local function Releasehandler(self)
end
local tracks = db.query([[
SELECT track.name AS track_name, track.id, artist.name AS artist_name
FROM track_releases
SELECT track.name AS track_name, track.id, artist.name AS artist_name
FROM track_releases
INNER JOIN
tracks AS track ON (track_releases.track = track.id)
INNER JOIN
tracks AS track ON (track_releases.track = track.id)
track_artists AS track_artist ON (track_artist.track = track.id)
INNER JOIN
track_artists AS track_artist ON (track_artist.track = track.id)
INNER JOIN
artists AS artist ON (track_artist.artist = artist.id)
WHERE track_releases.release = ?
artists AS artist ON (track_artist.artist = artist.id)
WHERE track_releases.release = ?
]], release["id"])
release["tracks"] = tracks
for i, track in ipairs(tracks) do
local airtimes = db.query([[
SELECT airtime
FROM airtimes
WHERE track = ?
SELECT airtime, station AS station_id
FROM airtimes
WHERE track = ?
]], track["id"])
release["tracks"][i]["airtimes"] = {}
for j, airtime in ipairs(airtimes) do
table.insert(release["tracks"][i]["airtimes"], airtime['airtime'])
table.insert(release["tracks"][i]["airtimes"], airtime)
end
end

20
code/handlers/trackhandler.lua
View File

@ -26,29 +26,29 @@ local function Trackhandler(self)
end
local artists = db.query([[
SELECT artist.name AS artist_name
FROM track_artists
INNER JOIN
artists as artist ON (track_artists.artist = artist.id)
WHERE track_artists.track = ?
SELECT artist.name AS artist_name
FROM track_artists
INNER JOIN
artists AS artist ON (track_artists.artist = artist.id)
WHERE track_artists.track = ?
]], track["id"])
track["artist"] = artists[1]["artist_name"]
local airtimes = db.query([[
SELECT airtime
FROM airtimes
WHERE track = ?
SELECT airtime, station AS station_id
FROM airtimes
WHERE track = ?
]], track["id"])
track["airtimes"] = {}
for i, airtime in ipairs(airtimes) do
track["airtimes"][i] = airtime.airtime
track["airtimes"][i] = airtime
end
local releases = db.query([[
SELECT release.id, release.name AS release_name
SELECT release.id AS release_id, release.name AS release_name
FROM track_releases
INNER JOIN
releases AS release ON (track_releases.release = release.id)