filipriec/universal_web_loco_rewrite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

terminal based website playing music now

Browse Source
This commit is contained in:
Priec
2026-05-19 17:13:23 +02:00
parent cbd642c62c
commit e9439382cc
8 changed files with 580 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
assets/static/css/theme.css
View File

@@ -249,6 +249,38 @@ body {
} }
.term-empty-cmd { font-size: 0.8rem; color: oklch(var(--bc) / 0.45); } .term-empty-cmd { font-size: 0.8rem; color: oklch(var(--bc) / 0.45); }
/* --- how-it-works note + form helpers (admin) -------------- */
.term-note {
margin-bottom: 1.5rem;
padding: 0.9rem 1.1rem;
background: oklch(var(--b2));
border: 1px solid oklch(var(--b3));
border-left: 3px solid oklch(var(--a));
}
.term-note-title { margin-bottom: 0.55rem; font-size: 0.8rem; color: oklch(var(--a)); }
.term-step { display: flex; gap: 0.55rem; font-size: 0.88rem; }
.term-step + .term-step { margin-top: 0.3rem; }
.term-step-n { flex: none; color: oklch(var(--p)); }
.term-note-foot { margin-top: 0.6rem; font-size: 0.8rem; color: oklch(var(--bc) / 0.6); }
.term-help { margin-top: 0.2rem; font-size: 0.76rem; color: oklch(var(--bc) / 0.55); }
.term-picklist {
border: 1px solid oklch(var(--b3));
background: oklch(var(--b1));
max-height: 18rem;
overflow-y: auto;
}
.term-pick {
display: flex;
align-items: center;
gap: 0.65rem;
padding: 0.5rem 0.7rem;
border-top: 1px solid oklch(var(--b3));
cursor: pointer;
}
.term-pick:first-child { border-top: 0; }
.term-pick:hover { background: oklch(var(--b2)); }
.term-formdiv { margin: 1.25rem 0; border-top: 1px dashed oklch(var(--b3)); }
/* --- terminal session block (mockup-code substitute) ------- */ /* --- terminal session block (mockup-code substitute) ------- */
.term-screen { .term-screen {
background: oklch(var(--b1)); background: oklch(var(--b1));

134
assets/views/admin/audio/albums.html
View File

@@ -1,66 +1,88 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% block title %}Audio Albums{% endblock title %} {% block title %}Albums{% endblock title %}
{% block crumb %}audio/albums{% endblock crumb %}
{% block content %} {% block content %}
<div class="space-y-2"> <header class="term-cmd">
<div class="flex flex-wrap items-center justify-between gap-3"> <div>
<div> <p class="term-cmd-line">
<h1 class="text-2xl font-bold">Audio Albums</h1> <span class="t-red">root@universal-web</span><span class="t-dim">:</span><span class="t-yellow">/admin/audio</span><span class="t-dim">#</span>
<p class="text-sm opacity-70">Create albums and upload audio tracks.</p> ls albums/
</div> </p>
<div class="flex flex-wrap gap-2"> <h1 class="term-title">albums</h1>
<a href="/admin/audio/tracks" class="btn btn-ghost btn-sm">Songs</a> <p class="term-sub">// step 2 — group songs into a release with a cover.</p>
<a href="/admin/audio/albums/create" class="btn btn-neutral btn-sm">New album</a>
</div>
</div> </div>
<div class="term-cmd-actions">
<a href="/admin/audio/albums/create" class="btn btn-primary btn-sm">[ + new album ]</a>
<a href="/admin/audio/tracks" class="btn btn-outline btn-sm">[ songs ]</a>
</div>
</header>
<div class="card border border-base-300 bg-base-100 shadow-sm"> <div class="term-note">
<div class="card-body"> <p class="term-note-title"># before you make an album</p>
{% if albums | length > 0 %} <div class="term-step">
<div class="overflow-x-auto"> <span class="term-step-n">[1]</span>
<table class="table"> <span><a href="/admin/audio/tracks" class="t-blue">upload your songs</a> first &mdash; an album is built from songs that already exist.</span>
<thead> </div>
<tr> <div class="term-step">
<th>Album</th> <span class="term-step-n">[2]</span>
<th>Status</th> <span>create the album here, then tick the songs that belong to it (or upload more into it later).</span>
<th>Tracks</th> </div>
<th class="text-right">Actions</th> </div>
</tr>
</thead> <div class="card">
<tbody> <div class="term-head">
{% for row in albums %} <span class="term-dots" aria-hidden="true">
<tr> <span class="term-dot r"></span><span class="term-dot y"></span><span class="term-dot g"></span>
<td class="font-medium">{{ row.album.title }}</td> </span>
<td> <span class="term-head-name">~/audio/albums/</span>
{% if row.album.published %} <span class="term-head-meta term-tag is-purple">{{ albums | length }} albums</span>
<span class="badge">Published</span> </div>
{% else %} <div class="card-body">
<span class="badge opacity-70">Draft</span> {% if albums | length > 0 %}
{% endif %} <div class="overflow-x-auto">
</td> <table class="table">
<td>{{ row.track_count }}</td> <thead>
<td> <tr>
<div class="flex gap-2"> <th>album</th>
<a href="/admin/audio/albums/{{ row.album.id }}/tracks" class="btn btn-ghost btn-sm">Tracks</a> <th>status</th>
<a href="/audio/albums/{{ row.album.slug }}" class="btn btn-ghost btn-sm">View</a> <th>songs</th>
</div> <th class="text-right">actions</th>
</td> </tr>
</tr> </thead>
{% endfor %} <tbody>
</tbody> {% for row in albums %}
</table> <tr>
<td class="font-medium">{{ row.album.title }}</td>
<td>
{% if row.album.published %}
<span class="term-tag is-green">published</span>
{% else %}
<span class="term-tag">draft</span>
{% endif %}
</td>
<td>{{ row.track_count }}</td>
<td>
<div class="flex flex-wrap gap-2">
<a href="/admin/audio/albums/{{ row.album.id }}/tracks" class="btn btn-primary btn-sm">open &amp; edit</a>
<a href="/audio/albums/{{ row.album.slug }}" class="btn btn-ghost btn-sm">view</a>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="term-empty">
<p class="font-medium">no albums yet</p>
<p class="term-empty-cmd">$ create an album to group your songs into a release</p>
<div class="pt-2">
<a href="/admin/audio/albums/create" class="btn btn-primary btn-sm">[ + new album ]</a>
</div> </div>
{% else %} </div>
<div class="text-center"> {% endif %}
<p class="font-medium">No albums yet.</p>
<p class="text-sm opacity-70">Create an album before uploading tracks.</p>
<div class="pt-2">
<a href="/admin/audio/albums/create" class="btn btn-neutral btn-sm">New album</a>
</div>
</div>
{% endif %}
</div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

149
assets/views/admin/audio/new_album.html
View File

@@ -1,77 +1,100 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% block title %}New Audio Album{% endblock title %} {% block title %}New album{% endblock title %}
{% block crumb %}audio/new-album{% endblock crumb %}
{% block content %} {% block content %}
<div class="space-y-2"> <header class="term-cmd">
<div class="flex flex-wrap items-center justify-between gap-3"> <div>
<div> <p class="term-cmd-line">
<h1 class="text-2xl font-bold">New Audio Album</h1> <span class="t-red">root@universal-web</span><span class="t-dim">:</span><span class="t-yellow">/admin/audio</span><span class="t-dim">#</span>
<p class="text-sm opacity-70">Create a container for uploaded tracks.</p> mkdir albums/new
</div> </p>
<a href="/admin/audio/albums" class="btn btn-ghost btn-sm">Back to albums</a> <h1 class="term-title">new album</h1>
<p class="term-sub">// fill in the details, then tick the songs to include.</p>
</div> </div>
<div class="term-cmd-actions">
<a href="/admin/audio/albums" class="btn btn-outline btn-sm">[ cancel ]</a>
</div>
</header>
<div class="card border border-base-300 bg-base-100 shadow-sm"> <div class="card">
<div class="card-body"> <div class="term-head">
<form method="post" action="/admin/audio/albums/create" class="space-y-2"> <span class="term-dots" aria-hidden="true">
<div class="form-control"> <span class="term-dot r"></span><span class="term-dot y"></span><span class="term-dot g"></span>
<label class="label"><span class="label-text">Title</span></label> </span>
<input type="text" name="title" required class="input input-bordered w-full"> <span class="term-head-name">~/audio/albums/new</span>
</div>
<div class="card-body">
<form method="post" action="/admin/audio/albums/create" enctype="multipart/form-data" class="space-y-2">
<div class="form-control">
<label class="label"><span class="label-text t-green">album title *</span></label>
<input type="text" name="title" required class="input input-bordered w-full" placeholder="e.g. Live at Home">
</div>
<div class="form-control">
<label class="label"><span class="label-text t-green">artist</span></label>
<input type="text" name="artist" class="input input-bordered w-full">
</div>
<div class="form-control">
<label class="label"><span class="label-text t-green">release date</span></label>
<input type="date" name="release_date" class="input input-bordered w-full">
</div>
<div class="form-control">
<label class="label"><span class="label-text t-green">cover image</span></label>
<input type="file" name="cover" accept="image/png,image/jpeg,image/webp,image/gif" class="file-input file-input-bordered w-full">
<p class="term-help">optional &mdash; png, jpg, webp or gif; uploaded right here, shown on the album page.</p>
</div>
<div class="form-control">
<label class="label"><span class="label-text t-green">description</span></label>
<textarea name="description" rows="5" class="textarea textarea-bordered w-full"></textarea>
</div>
<div class="term-formdiv"></div>
<div class="form-control">
<label class="label"><span class="label-text t-green">songs in this album</span></label>
{% if available_tracks | length > 0 %}
<div class="term-picklist">
{% for song in available_tracks %}
<label class="term-pick">
<input type="checkbox" name="track_ids" value="{{ song.id }}" class="checkbox checkbox-sm">
<span class="min-w-0 flex-1 font-medium">{{ song.title }}</span>
{% if song.published %}
<span class="term-tag is-green">published</span>
{% else %}
<span class="term-tag">draft</span>
{% endif %}
</label>
{% endfor %}
</div> </div>
<p class="term-help">only songs that aren&rsquo;t in an album yet are shown. you can add or remove songs after creating the album.</p>
<div class="form-control"> {% else %}
<label class="label"><span class="label-text">Artist</span></label> <div class="term-picklist">
<input type="text" name="artist" class="input input-bordered w-full"> <div class="term-pick">
</div> <span class="term-help" style="margin:0">
no free songs to add &mdash;
<div class="form-control"> <a href="/admin/audio/tracks/upload" class="t-blue">upload a song</a> first,
<label class="label"><span class="label-text">Release date</span></label> or create the album empty and add songs later.
<input type="date" name="release_date" class="input input-bordered w-full"> </span>
</div>
<div class="form-control">
<label class="label"><span class="label-text">Cover image id</span></label>
<input type="text" name="cover_image_id" class="input input-bordered w-full">
</div>
<div class="form-control">
<label class="label"><span class="label-text">Description</span></label>
<textarea name="description" rows="6" class="textarea textarea-bordered w-full"></textarea>
</div>
<div class="form-control">
<label class="label"><span class="label-text">Songs</span></label>
{% if available_tracks | length > 0 %}
<div class="divide-y divide-base-300 rounded border border-base-300">
{% for song in available_tracks %}
<label class="flex cursor-pointer items-center gap-3 p-2 hover:bg-base-200">
<input type="checkbox" name="track_ids" value="{{ song.id }}" class="checkbox checkbox-sm">
<span class="min-w-0 flex-1">
<span class="block truncate font-medium">{{ song.title }}</span>
<span class="block truncate text-xs opacity-70">{{ song.audio_file_id }}</span>
</span>
</label>
{% endfor %}
</div> </div>
{% else %}
<div class="rounded border border-base-300 p-2 text-sm opacity-70">
No ungrouped songs available.
</div>
{% endif %}
</div> </div>
{% endif %}
</div>
<label class="label cursor-pointer justify-start gap-2"> <label class="label cursor-pointer justify-start gap-2">
<input type="checkbox" name="published" class="checkbox checkbox-sm"> <input type="checkbox" name="published" class="checkbox checkbox-sm">
<span class="label-text">Published</span> <span class="label-text">publish now &mdash; visitors can see this album (leave off for a draft)</span>
</label> </label>
<div class="flex flex-wrap gap-2 pt-2"> <div class="flex flex-wrap gap-2 pt-2">
<button type="submit" class="btn btn-neutral btn-sm">Create</button> <button type="submit" class="btn btn-primary btn-sm">[ create album ]</button>
<a href="/admin/audio/albums" class="btn btn-ghost btn-sm">Cancel</a> <a href="/admin/audio/albums" class="btn btn-ghost btn-sm">cancel</a>
</div> </div>
</form> </form>
</div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

169
assets/views/admin/audio/songs.html
View File

@@ -1,85 +1,106 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% block title %}Songs{% endblock title %} {% block title %}Songs{% endblock title %}
{% block crumb %}audio/songs{% endblock crumb %}
{% block content %} {% block content %}
<div class="space-y-2"> <header class="term-cmd">
<div class="flex flex-wrap items-center justify-between gap-3"> <div>
<div> <p class="term-cmd-line">
<h1 class="text-2xl font-bold">Songs</h1> <span class="t-red">root@universal-web</span><span class="t-dim">:</span><span class="t-yellow">/admin/audio</span><span class="t-dim">#</span>
<p class="text-sm opacity-70">Publish songs directly; albums only group them together.</p> ls songs/
</div> </p>
<div class="flex flex-wrap gap-2"> <h1 class="term-title">songs</h1>
<a href="/admin/audio/tracks/upload" class="btn btn-neutral btn-sm">Upload song</a> <p class="term-sub">// step 1 — every audio file you upload becomes a song.</p>
<a href="/admin/audio/albums" class="btn btn-ghost btn-sm">Albums</a>
</div>
</div> </div>
<div class="term-cmd-actions">
<a href="/admin/audio/tracks/upload" class="btn btn-primary btn-sm">[ &uarr; upload a song ]</a>
<a href="/admin/audio/albums" class="btn btn-outline btn-sm">[ albums ]</a>
</div>
</header>
<div class="card border border-base-300 bg-base-100 shadow-sm"> <div class="term-note">
<div class="card-body"> <p class="term-note-title"># how audio works</p>
{% if tracks | length > 0 %} <div class="term-step">
<div class="overflow-x-auto"> <span class="term-step-n">[1]</span>
<table class="table"> <span><b class="t-green">upload a song</b> &mdash; pick an audio file here; it becomes a song you can publish.</span>
<thead> </div>
<tr> <div class="term-step">
<th>Song</th> <span class="term-step-n">[2]</span>
<th>Group</th> <span><b class="t-green">make an album</b> (optional) &mdash; group songs together with a cover and a track order.</span>
<th>File</th> </div>
<th>Status</th> <p class="term-note-foot">a song can be published on its own (a single) or as part of an album &mdash; your choice.</p>
<th class="text-right">Actions</th> </div>
</tr>
</thead> <div class="card">
<tbody> <div class="term-head">
{% for track in tracks %} <span class="term-dots" aria-hidden="true">
<tr> <span class="term-dot r"></span><span class="term-dot y"></span><span class="term-dot g"></span>
<td class="font-medium">{{ track.title }}</td> </span>
<td> <span class="term-head-name">~/audio/songs/</span>
{% if track.album_id %} <span class="term-head-meta term-tag is-green">{{ tracks | length }} songs</span>
<span class="badge">Album</span> </div>
{% else %} <div class="card-body">
<span class="badge opacity-70">Ungrouped</span> {% if tracks | length > 0 %}
{% endif %} <div class="overflow-x-auto">
</td> <table class="table">
<td class="text-sm">{{ track.audio_file_id }}</td> <thead>
<td> <tr>
{% if track.published %} <th>song</th>
<span class="badge">Published</span> <th>where</th>
{% else %} <th>status</th>
<span class="badge opacity-70">Draft</span> <th class="text-right">actions</th>
{% endif %} </tr>
</td> </thead>
<td> <tbody>
<div class="flex gap-2"> {% for track in tracks %}
<a href="/audio/tracks/{{ track.id }}/stream" class="btn btn-ghost btn-sm">Play</a> <tr>
{% if track.published %} <td class="font-medium">{{ track.title }}</td>
<form method="post" action="/admin/audio/tracks/{{ track.id }}/unpublish"> <td>
<button type="submit" class="btn btn-ghost btn-sm">Unpublish</button> {% if track.album_id %}
</form> <span class="term-tag is-purple">in an album</span>
{% else %} {% else %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/publish"> <span class="term-tag is-blue">single</span>
<button type="submit" class="btn btn-ghost btn-sm">Publish</button> {% endif %}
</form> </td>
{% endif %} <td>
<form method="post" action="/admin/audio/tracks/{{ track.id }}/delete"> {% if track.published %}
<button type="submit" class="btn btn-ghost btn-sm">Delete</button> <span class="term-tag is-green">published</span>
</form> {% else %}
</div> <span class="term-tag">draft</span>
</td> {% endif %}
</tr> </td>
{% endfor %} <td>
</tbody> <div class="flex flex-wrap gap-2">
</table> <a href="/audio/tracks/{{ track.id }}/stream" class="btn btn-ghost btn-sm">play</a>
{% if track.published %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/unpublish">
<button type="submit" class="btn btn-ghost btn-sm">unpublish</button>
</form>
{% else %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/publish">
<button type="submit" class="btn btn-ghost btn-sm t-green">publish</button>
</form>
{% endif %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/delete">
<button type="submit" class="btn btn-ghost btn-sm t-red">delete</button>
</form>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="term-empty">
<p class="font-medium">no songs yet</p>
<p class="term-empty-cmd">$ upload your first audio file to get started</p>
<div class="pt-2">
<a href="/admin/audio/tracks/upload" class="btn btn-primary btn-sm">[ &uarr; upload a song ]</a>
</div> </div>
{% else %} </div>
<div class="text-center"> {% endif %}
<p class="font-medium">No songs yet.</p>
<p class="text-sm opacity-70">Upload a song, then group it into an album when needed.</p>
<div class="pt-2">
<a href="/admin/audio/tracks/upload" class="btn btn-neutral btn-sm">Upload song</a>
</div>
</div>
{% endif %}
</div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

210
assets/views/admin/audio/tracks.html
View File

@@ -1,104 +1,130 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% block title %}{{ album.title }} Tracks{% endblock title %} {% block title %}{{ album.title }} — tracks{% endblock title %}
{% block crumb %}audio/{{ album.slug }}{% endblock crumb %}
{% block content %} {% block content %}
<div class="space-y-2"> <header class="term-cmd">
<div class="flex flex-wrap items-center justify-between gap-3"> <div>
<div> <p class="term-cmd-line">
<h1 class="text-2xl font-bold">{{ album.title }}</h1> <span class="t-red">root@universal-web</span><span class="t-dim">:</span><span class="t-yellow">/admin/audio/{{ album.slug }}</span><span class="t-dim">#</span>
<p class="text-sm opacity-70">Uploaded tracks for this album.</p> ls
</div> </p>
<div class="flex flex-wrap gap-2"> <h1 class="term-title">{{ album.title }}</h1>
<a href="/admin/audio/albums/{{ album.id }}/tracks/upload" class="btn btn-neutral btn-sm">Upload track</a> <p class="term-sub">
<a href="/admin/audio/albums" class="btn btn-ghost btn-sm">Back to albums</a> // album &middot; {{ tracks | length }} song(s) &middot;
</div> {% if album.published %}<span class="t-green">published</span>{% else %}<span class="t-yellow">draft</span>{% endif %}
</p>
</div> </div>
<div class="term-cmd-actions">
<a href="/admin/audio/albums/{{ album.id }}/tracks/upload" class="btn btn-primary btn-sm">[ &uarr; upload song into album ]</a>
<a href="/audio/albums/{{ album.slug }}" class="btn btn-outline btn-sm">[ view ]</a>
<a href="/admin/audio/albums" class="btn btn-outline btn-sm">[ albums ]</a>
</div>
</header>
<div class="card border border-base-300 bg-base-100 shadow-sm"> <div class="term-note">
<div class="card-body"> <p class="term-note-title"># two ways to add a song to this album</p>
{% if available_tracks | length > 0 %} <div class="term-step">
<form method="post" action="/admin/audio/albums/{{ album.id }}/tracks/add" class="mb-4 flex flex-wrap items-end gap-2"> <span class="term-step-n">[a]</span>
<div class="form-control flex-1"> <span><b class="t-green">upload a new file</b> straight into the album &mdash; use the button above.</span>
<label class="label"><span class="label-text">Add existing song</span></label> </div>
<select name="track_id" required class="select select-bordered w-full"> <div class="term-step">
{% for song in available_tracks %} <span class="term-step-n">[b]</span>
<option value="{{ song.id }}">{{ song.title }}</option> <span><b class="t-green">pick an existing song</b> that isn&rsquo;t in any album yet &mdash; use the form below.</span>
{% endfor %} </div>
</select> </div>
</div>
<button type="submit" class="btn btn-neutral btn-sm">Add to album</button>
</form>
{% endif %}
{% if tracks | length > 0 %} <div class="card">
<div class="overflow-x-auto"> <div class="term-head">
<table class="table"> <span class="term-dots" aria-hidden="true">
<thead> <span class="term-dot r"></span><span class="term-dot y"></span><span class="term-dot g"></span>
<tr> </span>
<th>Track</th> <span class="term-head-name">~/audio/{{ album.slug }}/tracklist</span>
<th>File</th> <span class="term-head-meta term-tag is-purple">{{ tracks | length }} songs</span>
<th>Status</th> </div>
<th>Featured</th> <div class="card-body">
<th class="text-right">Actions</th> {% if available_tracks | length > 0 %}
</tr> <form method="post" action="/admin/audio/albums/{{ album.id }}/tracks/add" class="space-y-2">
</thead> <div class="form-control">
<tbody> <label class="label"><span class="label-text t-green">add an existing song</span></label>
{% for track in tracks %} <select name="track_id" required class="select select-bordered w-full">
<tr> {% for song in available_tracks %}
<td class="font-medium"> <option value="{{ song.id }}">{{ song.title }}</option>
{% if track.track_number %}{{ track.track_number }}. {% endif %}{{ track.title }} {% endfor %}
</td> </select>
<td class="text-sm">{{ track.audio_file_id }}</td> <p class="term-help">these are songs you&rsquo;ve uploaded that aren&rsquo;t in an album yet.</p>
<td>
{% if track.published %}
<span class="badge">Published</span>
{% else %}
<span class="badge opacity-70">Draft</span>
{% endif %}
</td>
<td>
{% if track.featured %}
<span class="badge">Yes</span>
{% else %}
<span class="badge opacity-70">No</span>
{% endif %}
</td>
<td>
<div class="flex gap-2">
<a href="/audio/tracks/{{ track.id }}/stream" class="btn btn-ghost btn-sm">Play</a>
{% if track.published %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/unpublish">
<button type="submit" class="btn btn-ghost btn-sm">Unpublish</button>
</form>
{% else %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/publish">
<button type="submit" class="btn btn-ghost btn-sm">Publish</button>
</form>
{% endif %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/remove-from-album">
<button type="submit" class="btn btn-ghost btn-sm">Remove</button>
</form>
<form method="post" action="/admin/audio/tracks/{{ track.id }}/delete">
<button type="submit" class="btn btn-ghost btn-sm">Delete</button>
</form>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div> </div>
{% else %} <button type="submit" class="btn btn-outline btn-sm">[ + add to album ]</button>
<div class="text-center"> </form>
<p class="font-medium">No tracks yet.</p> <div class="term-formdiv"></div>
<p class="text-sm opacity-70">Upload the first audio file for this album.</p> {% endif %}
<div class="pt-2">
<a href="/admin/audio/albums/{{ album.id }}/tracks/upload" class="btn btn-neutral btn-sm">Upload track</a> {% if tracks | length > 0 %}
</div> <div class="overflow-x-auto">
<table class="table">
<thead>
<tr>
<th>#</th>
<th>song</th>
<th>status</th>
<th>featured</th>
<th class="text-right">actions</th>
</tr>
</thead>
<tbody>
{% for track in tracks %}
<tr>
<td class="t-dim">{% if track.track_number %}{{ track.track_number }}{% else %}&mdash;{% endif %}</td>
<td class="font-medium">{{ track.title }}</td>
<td>
{% if track.published %}
<span class="term-tag is-green">published</span>
{% else %}
<span class="term-tag">draft</span>
{% endif %}
</td>
<td>
{% if track.featured %}
<span class="term-tag is-aqua">featured</span>
{% else %}
<span class="t-dim">—</span>
{% endif %}
</td>
<td>
<div class="flex flex-wrap gap-2">
<a href="/audio/tracks/{{ track.id }}/stream" class="btn btn-ghost btn-sm">play</a>
{% if track.published %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/unpublish">
<button type="submit" class="btn btn-ghost btn-sm">unpublish</button>
</form>
{% else %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/publish">
<button type="submit" class="btn btn-ghost btn-sm t-green">publish</button>
</form>
{% endif %}
<form method="post" action="/admin/audio/tracks/{{ track.id }}/remove-from-album">
<button type="submit" class="btn btn-ghost btn-sm">remove from album</button>
</form>
<form method="post" action="/admin/audio/tracks/{{ track.id }}/delete">
<button type="submit" class="btn btn-ghost btn-sm t-red">delete</button>
</form>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="term-empty">
<p class="font-medium">this album has no songs yet</p>
<p class="term-empty-cmd">$ upload a file into the album, or add an existing song above</p>
<div class="pt-2">
<a href="/admin/audio/albums/{{ album.id }}/tracks/upload" class="btn btn-primary btn-sm">[ &uarr; upload song into album ]</a>
</div> </div>
{% endif %} </div>
</div> {% endif %}
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

116
assets/views/admin/audio/upload_track.html
View File

@@ -1,67 +1,83 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% block title %}Upload Track{% endblock title %} {% block title %}Upload song{% endblock title %}
{% block crumb %}audio/upload{% endblock crumb %}
{% block content %} {% block content %}
<div class="space-y-2"> <header class="term-cmd">
<div class="flex flex-wrap items-center justify-between gap-3"> <div>
<div> <p class="term-cmd-line">
<h1 class="text-2xl font-bold">Upload Track</h1> <span class="t-red">root@universal-web</span><span class="t-dim">:</span><span class="t-yellow">/admin/audio</span><span class="t-dim">#</span>
{% if album %} {% if album %}cp song.mp3 {{ album.slug }}/{% else %}cp song.mp3 songs/{% endif %}
<p class="text-sm opacity-70">{{ album.title }}</p> </p>
{% else %} <h1 class="term-title">upload a song</h1>
<p class="text-sm opacity-70">Ungrouped song</p>
{% endif %}
</div>
{% if album %} {% if album %}
<a href="/admin/audio/albums/{{ album.id }}/tracks" class="btn btn-ghost btn-sm">Back to tracks</a> <p class="term-sub">// goes straight into the album &ldquo;{{ album.title }}&rdquo;.</p>
{% else %} {% else %}
<a href="/admin/audio/tracks" class="btn btn-ghost btn-sm">Back to songs</a> <p class="term-sub">// uploads as a standalone song (a single) &mdash; you can add it to an album later.</p>
{% endif %} {% endif %}
</div> </div>
<div class="term-cmd-actions">
{% if album %}
<a href="/admin/audio/albums/{{ album.id }}/tracks" class="btn btn-outline btn-sm">[ cancel ]</a>
{% else %}
<a href="/admin/audio/tracks" class="btn btn-outline btn-sm">[ cancel ]</a>
{% endif %}
</div>
</header>
<div class="card">
<div class="term-head">
<span class="term-dots" aria-hidden="true">
<span class="term-dot r"></span><span class="term-dot y"></span><span class="term-dot g"></span>
</span>
<span class="term-head-name">{% if album %}~/audio/{{ album.slug }}/upload{% else %}~/audio/songs/upload{% endif %}</span>
</div>
<div class="card-body">
{% if album %}
<form method="post" action="/admin/audio/albums/{{ album.id }}/tracks/upload-file" enctype="multipart/form-data" class="space-y-2">
{% else %}
<form method="post" action="/admin/audio/tracks/upload-file" enctype="multipart/form-data" class="space-y-2">
{% endif %}
<div class="form-control">
<label class="label"><span class="label-text t-green">1. audio file *</span></label>
<input type="file" name="file" accept="audio/mpeg,audio/wav,audio/ogg,audio/flac,audio/aac,audio/mp4,audio/webm" required class="file-input file-input-bordered w-full">
<p class="term-help">required &mdash; mp3, wav, ogg, flac, aac, m4a or webm.</p>
</div>
<div class="form-control">
<label class="label"><span class="label-text t-green">2. title</span></label>
<input type="text" name="title" class="input input-bordered w-full" placeholder="e.g. Sunburst Jam">
<p class="term-help">optional &mdash; leave blank to use the audio file&rsquo;s name.</p>
</div>
<div class="card border border-base-300 bg-base-100 shadow-sm">
<div class="card-body">
{% if album %} {% if album %}
<form method="post" action="/admin/audio/albums/{{ album.id }}/tracks/upload-file" enctype="multipart/form-data" class="space-y-2"> <div class="form-control">
{% else %} <label class="label"><span class="label-text t-green">3. track number</span></label>
<form method="post" action="/admin/audio/tracks/upload-file" enctype="multipart/form-data" class="space-y-2"> <input type="number" name="track_number" min="1" class="input input-bordered w-full" placeholder="1">
<p class="term-help">optional &mdash; this song&rsquo;s position in the album&rsquo;s track list.</p>
</div>
{% endif %} {% endif %}
<div class="form-control">
<label class="label"><span class="label-text">Audio file</span></label>
<input type="file" name="file" accept="audio/mpeg,audio/wav,audio/ogg,audio/flac,audio/aac,audio/mp4,audio/webm" required class="file-input file-input-bordered w-full">
</div>
<div class="form-control"> <label class="label cursor-pointer justify-start gap-2">
<label class="label"><span class="label-text">Title</span></label> <input type="checkbox" name="featured" class="checkbox checkbox-sm">
<input type="text" name="title" class="input input-bordered w-full"> <span class="label-text">featured &mdash; highlight this song on the site</span>
</div> </label>
<div class="form-control"> <label class="label cursor-pointer justify-start gap-2">
<label class="label"><span class="label-text">Track number</span></label> <input type="checkbox" name="published" class="checkbox checkbox-sm">
<input type="number" name="track_number" min="1" class="input input-bordered w-full"> <span class="label-text">publish now &mdash; visitors can see it (leave off to keep it a draft)</span>
</div> </label>
<label class="label cursor-pointer justify-start gap-2"> <div class="flex flex-wrap gap-2 pt-2">
<input type="checkbox" name="featured" class="checkbox checkbox-sm"> <button type="submit" class="btn btn-primary btn-sm">[ &uarr; upload song ]</button>
<span class="label-text">Featured</span> {% if album %}
</label> <a href="/admin/audio/albums/{{ album.id }}/tracks" class="btn btn-ghost btn-sm">cancel</a>
{% else %}
<label class="label cursor-pointer justify-start gap-2"> <a href="/admin/audio/tracks" class="btn btn-ghost btn-sm">cancel</a>
<input type="checkbox" name="published" class="checkbox checkbox-sm"> {% endif %}
<span class="label-text">Published</span> </div>
</label> </form>
<div class="flex flex-wrap gap-2 pt-2">
<button type="submit" class="btn btn-neutral btn-sm">Upload</button>
{% if album %}
<a href="/admin/audio/albums/{{ album.id }}/tracks" class="btn btn-ghost btn-sm">Cancel</a>
{% else %}
<a href="/admin/audio/tracks" class="btn btn-ghost btn-sm">Cancel</a>
{% endif %}
</div>
</form>
</div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}

2
assets/views/admin/index.html
View File

@@ -68,7 +68,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<h2 class="card-title text-base">audio</h2> <h2 class="card-title text-base">audio</h2>
<p class="text-sm opacity-70">create albums and upload tracks.</p> <p class="text-sm opacity-70">upload songs, then group them into albums.</p>
<div class="pt-2"> <div class="pt-2">
<a href="/admin/audio/albums" class="btn btn-primary btn-sm">[ manage → ]</a> <a href="/admin/audio/albums" class="btn btn-primary btn-sm">[ manage → ]</a>
</div> </div>

128
src/controllers/media.rs
View File

@@ -36,15 +36,16 @@ const IMAGE_MAX_BYTES: usize = 10 * 1024 * 1024;
pub const AUDIO_STORAGE_DIR: &str = "audio"; pub const AUDIO_STORAGE_DIR: &str = "audio";
pub const IMAGE_STORAGE_DIR: &str = "images"; pub const IMAGE_STORAGE_DIR: &str = "images";
#[derive(Debug, Deserialize)] /// Album-create form, parsed manually from `multipart/form-data` so the page
struct AlbumForm { /// can both upload a cover image and submit any number of `track_ids`
title: String, /// checkboxes (a urlencoded `Form` can't deserialize repeated keys into a Vec).
description: Option<String>, struct ParsedAlbumForm {
cover_image_id: Option<String>, title: Option<String>,
artist: Option<String>, artist: Option<String>,
release_date: Option<String>, release_date: Option<String>,
published: Option<String>, description: Option<String>,
#[serde(default)] published: bool,
cover: Option<Vec<u8>>,
track_ids: Vec<Uuid>, track_ids: Vec<Uuid>,
} }
@@ -104,10 +105,6 @@ fn normalize_empty(value: Option<String>) -> Option<String> {
}) })
} }
fn is_checked(value: &Option<String>) -> bool {
value.as_deref().is_some_and(|value| value == "on" || value == "true" || value == "1")
}
fn safe_filename(filename: &str) -> Result<&str> { fn safe_filename(filename: &str) -> Result<&str> {
if filename.is_empty() if filename.is_empty()
|| filename.contains('/') || filename.contains('/')
@@ -275,6 +272,73 @@ async fn read_track_upload(
Ok((data, title, track_number, featured, published)) Ok((data, title, track_number, featured, published))
} }
/// Parse the new-album `multipart/form-data` body: text fields, an optional
/// cover image file, and zero or more `track_ids` checkbox values.
async fn read_album_form(mut multipart: Multipart) -> Result<ParsedAlbumForm> {
let mut form = ParsedAlbumForm {
title: None,
artist: None,
release_date: None,
description: None,
published: false,
cover: None,
track_ids: Vec::new(),
};
while let Some(mut field) = multipart
.next_field()
.await
.map_err(|err| Error::BadRequest(format!("invalid multipart data: {err}")))?
{
let name = field.name().unwrap_or("").to_string();
if name == "cover" {
let mut data = Vec::new();
while let Some(chunk) = field
.chunk()
.await
.map_err(|err| Error::BadRequest(format!("invalid multipart chunk: {err}")))?
{
data.extend_from_slice(&chunk);
if data.len() > IMAGE_MAX_BYTES {
return Err(Error::BadRequest(format!(
"cover image is larger than {} MB",
IMAGE_MAX_BYTES / 1024 / 1024
)));
}
}
// An unselected file input still sends an empty `cover` part.
if !data.is_empty() {
form.cover = Some(data);
}
} else {
let value = field
.text()
.await
.map_err(|err| Error::BadRequest(format!("invalid multipart field: {err}")))?;
match name.as_str() {
"title" => form.title = normalize_empty(Some(value)),
"artist" => form.artist = normalize_empty(Some(value)),
"release_date" => form.release_date = normalize_empty(Some(value)),
"description" => form.description = normalize_empty(Some(value)),
"published" => {
form.published = value == "on" || value == "true" || value == "1";
}
"track_ids" => {
let trimmed = value.trim();
if !trimmed.is_empty() {
let id = Uuid::parse_str(trimmed)
.map_err(|_| Error::BadRequest("invalid song selection".to_string()))?;
form.track_ids.push(id);
}
}
_ => {}
}
}
}
Ok(form)
}
async fn unique_album_slug(ctx: &AppContext, title: &str) -> Result<String> { async fn unique_album_slug(ctx: &AppContext, title: &str) -> Result<String> {
let base = slugify(title); let base = slugify(title);
let mut slug = base.clone(); let mut slug = base.clone();
@@ -557,34 +621,50 @@ async fn admin_album_new(auth: auth::JWT, ViewEngine(v): ViewEngine<TeraView>, S
async fn admin_album_create( async fn admin_album_create(
auth: auth::JWT, auth: auth::JWT,
State(ctx): State<AppContext>, State(ctx): State<AppContext>,
Form(params): Form<AlbumForm>, multipart: Multipart,
) -> Result<Response> { ) -> Result<Response> {
let admin_user = admin::current_admin(auth, &ctx).await?; let admin_user = admin::current_admin(auth, &ctx).await?;
let published = is_checked(&params.published); let form = read_album_form(multipart).await?;
let release_date = normalize_empty(params.release_date)
let title = form
.title
.ok_or_else(|| Error::BadRequest("album title is required".to_string()))?;
let release_date = form
.release_date
.and_then(|date| NaiveDate::parse_from_str(&date, "%Y-%m-%d").ok()); .and_then(|date| NaiveDate::parse_from_str(&date, "%Y-%m-%d").ok());
// Store the uploaded cover (if any) and keep its filename as cover_image_id.
let cover_image_id = match form.cover {
Some(data) => {
let extension = detect_image_extension(&data)?;
Some(store_upload(&ctx, IMAGE_STORAGE_DIR, extension, data).await?)
}
None => None,
};
let album = audio_albums::ActiveModel { let album = audio_albums::ActiveModel {
id: Set(Uuid::new_v4()), id: Set(Uuid::new_v4()),
title: Set(params.title.clone()), title: Set(title.clone()),
slug: Set(unique_album_slug(&ctx, &params.title).await?), slug: Set(unique_album_slug(&ctx, &title).await?),
description: Set(normalize_empty(params.description)), description: Set(form.description),
cover_image_id: Set(normalize_empty(params.cover_image_id)), cover_image_id: Set(cover_image_id),
artist: Set(normalize_empty(params.artist)), artist: Set(form.artist),
release_date: Set(release_date), release_date: Set(release_date),
published: Set(published), published: Set(form.published),
uploader_id: Set(admin_user.id), uploader_id: Set(admin_user.id),
view_count: Set(0), view_count: Set(0),
published_at: Set(published.then(|| Utc::now().into())), published_at: Set(form.published.then(|| Utc::now().into())),
..Default::default() ..Default::default()
} }
.insert(&ctx.db) .insert(&ctx.db)
.await?; .await?;
for track_id in params.track_ids { for track_id in form.track_ids {
let track = track_by_id(&ctx, track_id).await?; let track = track_by_id(&ctx, track_id).await?;
if track.album_id.is_some() { if track.album_id.is_some() {
return Err(Error::BadRequest("selected song already belongs to an album".to_string())); return Err(Error::BadRequest(
"selected song already belongs to an album".to_string(),
));
} }
let mut active = track.into_active_model(); let mut active = track.into_active_model();
@@ -922,7 +1002,7 @@ pub fn routes() -> Routes {
.add("/admin/images/upload", post(admin_image_upload).layer(DefaultBodyLimit::max(IMAGE_MAX_BYTES + 1024 * 1024))) .add("/admin/images/upload", post(admin_image_upload).layer(DefaultBodyLimit::max(IMAGE_MAX_BYTES + 1024 * 1024)))
.add("/admin/audio/albums", get(admin_albums)) .add("/admin/audio/albums", get(admin_albums))
.add("/admin/audio/albums/create", get(admin_album_new)) .add("/admin/audio/albums/create", get(admin_album_new))
.add("/admin/audio/albums/create", post(admin_album_create)) .add("/admin/audio/albums/create", post(admin_album_create).layer(DefaultBodyLimit::max(IMAGE_MAX_BYTES + 1024 * 1024)))
.add("/admin/audio/tracks", get(admin_tracks)) .add("/admin/audio/tracks", get(admin_tracks))
.add("/admin/audio/tracks/upload", get(admin_song_upload_form)) .add("/admin/audio/tracks/upload", get(admin_song_upload_form))
.add("/admin/audio/tracks/upload-file", post(admin_song_upload).layer(DefaultBodyLimit::max(AUDIO_MAX_BYTES + 1024 * 1024))) .add("/admin/audio/tracks/upload-file", post(admin_song_upload).layer(DefaultBodyLimit::max(AUDIO_MAX_BYTES + 1024 * 1024)))