From 98eca7d594960aa616786cbd491b937d50f55499 Mon Sep 17 00:00:00 2001 From: Joris Date: Wed, 27 Dec 2023 18:21:37 +0100 Subject: First version with 2 songs --- .gitignore | 1 + README.md | 11 +++ bin/build | 7 ++ bin/dev-server | 17 ++++ flake.lock | 60 +++++++++++++ flake.nix | 21 +++++ main.py | 147 ++++++++++++++++++++++++++++++ public/index.html | 15 ++++ public/main.css | 85 ++++++++++++++++++ songs/ben-e-king/stand-by-me.lisp | 53 +++++++++++ songs/graeme-allwright/petit-garcon.lisp | 45 ++++++++++ src/main.lisp | 150 +++++++++++++++++++++++++++++++ 12 files changed, 612 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100755 bin/build create mode 100755 bin/dev-server create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 main.py create mode 100644 public/index.html create mode 100644 public/main.css create mode 100644 songs/ben-e-king/stand-by-me.lisp create mode 100644 songs/graeme-allwright/petit-garcon.lisp create mode 100644 src/main.lisp diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7e54d92 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +public/songs diff --git a/README.md b/README.md new file mode 100644 index 0000000..b7a9b4c --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# Music + +Available at [https://music.guyonvarch.me](https://music.guyonvarch.me). + +## Getting started + + nix develop --command bin/dev-server + +## Build + + nix develop --command bin/build diff --git a/bin/build b/bin/build new file mode 100755 index 0000000..3230144 --- /dev/null +++ b/bin/build @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")/.." + +echo "Building…" +sbcl --script src/main.lisp +echo "Done." diff --git a/bin/dev-server b/bin/dev-server new file mode 100755 index 0000000..82f8d46 --- /dev/null +++ b/bin/dev-server @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -euo pipefail + +# Serve public + +fuser -k 8000/tcp || true +python -m http.server --directory public 8000 & +trap "fuser -k 8000/tcp" EXIT + +# Build HTML recipes on changes + +watchexec \ + --clear \ + --restart \ + --watch src \ + --watch songs \ + "bin/build" diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..16203c8 --- /dev/null +++ b/flake.lock @@ -0,0 +1,60 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1703685222, + "narHash": "sha256-zo8ud0+ldS8vYwl0PhNX214h0VhQDe0oKJgTtcy9Zps=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5ff137aa81ff67b11459da96ea245970d9adc061", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..4b24639 --- /dev/null +++ b/flake.nix @@ -0,0 +1,21 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem + (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + devShell = pkgs.mkShell { + buildInputs = with pkgs; [ + psmisc # fuser + sbcl + watchexec + ]; + }; + } + ); +} diff --git a/main.py b/main.py new file mode 100644 index 0000000..a4494ff --- /dev/null +++ b/main.py @@ -0,0 +1,147 @@ +import string + +atom_end = set('()"\'') | set(string.whitespace) + +def parse(sexp): + stack, i, length = [[]], 0, len(sexp) + while i < length: + c = sexp[i] + + reading = type(stack[-1]) + if reading == list: + match c: + case '(': + stack.append([]) + case ')': + stack[-2].append(stack.pop()) + if stack[-1][0] == ('quote',): stack[-2].append(stack.pop()) + case '"': + stack.append('') + case "'": + stack.append([('quote',)]) + case _: + if c in string.whitespace: + pass + else: + stack.append((c,)) + elif reading == str: + if c == '"': + stack[-2].append(stack.pop()) + if stack[-1][0] == ('quote',): stack[-2].append(stack.pop()) + elif c == '\\': + i += 1 + stack[-1] += sexp[i] + else: + stack[-1] += c + elif reading == tuple: + if c in atom_end: + atom = stack.pop() + if atom[0][0].isdigit(): + stack[-1].append(eval(atom[0])) + else: + stack[-1].append(atom) + if stack[-1][0] == ('quote',): + stack[-2].append(stack.pop()) + continue + else: + stack[-1] = ((stack[-1][0] + c),) + i += 1 + return stack.pop() + +def h(node, attributes, *children): + res_attrs = '' + if type(attributes) == dict: + for key in attributes: + res_attrs += f' {key}={attributes[key]}' + else: + children = [attributes] + list(children) + + res = f'<{node} {res_attrs}>' + if type(children) in [tuple, list]: + res += ''.join(children) + elif type(children) == str: + res += children + + res += f'' + return res + +def lines(s: str): + return [h('div', x) for x in s.split('\n')] + +def chord_line(sexp): + res = '' + for x in sexp: + res += h('td', { 'class': 'g-Chord' }, x[0]) + return res + +def chords(sexp): + return h('section', + { 'class': 'g-Section' }, + h('h2', { 'class': 'g-Subtitle' }, 'Accords'), + h('table', { 'class': 'g-Chords' }, *[h('tr', {}, chord_line(x)) for x in sexp])) + +part_names = { + 'intro': 'Intro', + 'verse': 'Couplet', + 'chorus': 'Refrain', + 'interlude': 'Interlude' +} + +def lyrics(sexp): + ys = [] + for x in sexp: + match x: + case [(name)]: + ys.append(h('section', + { 'class': 'g-Section' }, + h('div', + { 'class': 'g-Lyrics__Part' }, + h('h3', part_names[name[0]])))) + case [(name), s]: + ys.append(h('section', + { 'class': 'g-Section' }, + h('div', + { 'class': 'g-Lyrics__Part' }, + h('h3', part_names[name[0]]), + h('div', { 'class': 'g-Lyrics__Paragraph' }, *lines(s))))) + return h('section', + { 'class': 'g-Section' }, + h('h2', { 'class': 'g-Subtitle' }, 'Paroles'), + h('div', { 'class': 'g-Lyrics' }, *ys)) + +def sexp_prop(sexp, name): + return [x[1:] for x in sexp if x[0][0] == name][0] + +# ----------------- + +with open('ben-e-king-stand-by-me.lisp', 'r') as f: + content = f.read() + +sexp = parse(content) + +title = sexp_prop(sexp, 'title')[0] +subtitle = sexp_prop(sexp, 'from')[0] + +html = f''' + + + + + {title} – {subtitle} + + + +''' + +html += h('body', + h('section', + { 'class': 'g-Section' }, + h('h1', { 'class': 'g-Title' }, title), + h('div', { 'class': 'g-Author' }, subtitle)), + chords(sexp_prop(sexp, 'chords')), + lyrics(sexp_prop(sexp, 'lyrics'))) + +with open('ben-e-king-stand-by-me.html', 'w') as f: + f.write(html) + +print('OK') diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..1aba3bd --- /dev/null +++ b/public/index.html @@ -0,0 +1,15 @@ + + + + +Music + + + +

Music

+ +