Rename to use the right name (woops)

README.md

@@ -1,8 +1,4 @@
-# vocoder
+# voicegardens
-
-> A vocoder (/ˈvoʊkoʊdər/, a portmanteau of voice and encoder) is a category
-> of voice codec that analyzes and synthesizes the human voice signal for
-> audio data compression, multiplexing, voice encryption or voice transformation.
 
 ## @ Interwebz
 
@@ -32,13 +28,13 @@ $ sudo apt install -y make git
 ### Get your discount source code
 
 ```bash
-$ git clone ssh://gitea@vvvvvvaria.org:12345/varia/vocoder.git
+$ git clone ssh://gitea@vvvvvvaria.org:12345/varia/voicegardens.git
-$ cd vocoder
+$ cd voicegardens
 ```
 
 ### Do the Python dance
 
-```
+```bash
 $ python3 -m venv .venv
 $ source .venv/bin/activate
 $ pip install -r requirements.txt
@@ -46,10 +42,17 @@ $ pip install -r requirements.txt
 
 ### Run the server
 
-```
+```bash
 $ make dev-serve
 ```
 
+### Deploy the site
+
+```bash
+$ make test-deploy  # https://doesitsparkjoy.voicegardens.org
+$ make prod-deploy  # https://voicegardens.org
+```
+
 ### Layers of the Onion
 
 * [Flask](http://flask.palletsprojects.com/en/1.1.x/)

makefile

@@ -1,14 +1,14 @@
 PROD_PORT    := :9090
 PROD_WORKERS := 4
-ARCHIVE_DIR  := ./vocoder/archive
+ARCHIVE_DIR  := ./voicegardens/archive
 
 default: dev-serve
 
 dev-serve:
-	@FLASK_ENV=development FLASK_APP=vocoder.server flask run
+	@FLASK_ENV=development FLASK_APP=voicegardens.server flask run
 
 clear-archive:
 	@rm -rf $(ARCHIVE_DIR)/*
 
 prod-serve:
-	@gunicorn --workers $(PROD_WORKERS) --bind $(PROD_PORT) vocoder.server:app
+	@gunicorn --workers $(PROD_WORKERS) --bind $(PROD_PORT) voicegardens.server:app

venv/bin/activate

@@ -0,0 +1,76 @@
+# This file must be used with "source bin/activate" *from bash*
+# you cannot run it directly
+
+deactivate () {
+    # reset old environment variables
+    if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then
+        PATH="${_OLD_VIRTUAL_PATH:-}"
+        export PATH
+        unset _OLD_VIRTUAL_PATH
+    fi
+    if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then
+        PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}"
+        export PYTHONHOME
+        unset _OLD_VIRTUAL_PYTHONHOME
+    fi
+
+    # This should detect bash and zsh, which have a hash command that must
+    # be called to get it to forget past commands.  Without forgetting
+    # past commands the $PATH changes we made may not be respected
+    if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
+        hash -r
+    fi
+
+    if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
+        PS1="${_OLD_VIRTUAL_PS1:-}"
+        export PS1
+        unset _OLD_VIRTUAL_PS1
+    fi
+
+    unset VIRTUAL_ENV
+    if [ ! "$1" = "nondestructive" ] ; then
+    # Self destruct!
+        unset -f deactivate
+    fi
+}
+
+# unset irrelevant variables
+deactivate nondestructive
+
+VIRTUAL_ENV="/home/decentral1se/hacking/voicegardens/venv"
+export VIRTUAL_ENV
+
+_OLD_VIRTUAL_PATH="$PATH"
+PATH="$VIRTUAL_ENV/bin:$PATH"
+export PATH
+
+# unset PYTHONHOME if set
+# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
+# could use `if (set -u; : $PYTHONHOME) ;` in bash
+if [ -n "${PYTHONHOME:-}" ] ; then
+    _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
+    unset PYTHONHOME
+fi
+
+if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
+    _OLD_VIRTUAL_PS1="${PS1:-}"
+    if [ "x(venv) " != x ] ; then
+	PS1="(venv) ${PS1:-}"
+    else
+    if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then
+        # special case for Aspen magic directories
+        # see http://www.zetadev.com/software/aspen/
+        PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1"
+    else
+        PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1"
+    fi
+    fi
+    export PS1
+fi
+
+# This should detect bash and zsh, which have a hash command that must
+# be called to get it to forget past commands.  Without forgetting
+# past commands the $PATH changes we made may not be respected
+if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
+    hash -r
+fi

venv/bin/activate.csh

@@ -0,0 +1,37 @@
+# This file must be used with "source bin/activate.csh" *from csh*.
+# You cannot run it directly.
+# Created by Davide Di Blasi <davidedb@gmail.com>.
+# Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>
+
+alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
+
+# Unset irrelevant variables.
+deactivate nondestructive
+
+setenv VIRTUAL_ENV "/home/decentral1se/hacking/voicegardens/venv"
+
+set _OLD_VIRTUAL_PATH="$PATH"
+setenv PATH "$VIRTUAL_ENV/bin:$PATH"
+
+
+set _OLD_VIRTUAL_PROMPT="$prompt"
+
+if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then
+    if ("venv" != "") then
+        set env_name = "venv"
+    else
+        if (`basename "VIRTUAL_ENV"` == "__") then
+            # special case for Aspen magic directories
+            # see http://www.zetadev.com/software/aspen/
+            set env_name = `basename \`dirname "$VIRTUAL_ENV"\``
+        else
+            set env_name = `basename "$VIRTUAL_ENV"`
+        endif
+    endif
+    set prompt = "[$env_name] $prompt"
+    unset env_name
+endif
+
+alias pydoc python -m pydoc
+
+rehash

venv/bin/activate.fish

@@ -0,0 +1,75 @@
+# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org)
+# you cannot run it directly
+
+function deactivate  -d "Exit virtualenv and return to normal shell environment"
+    # reset old environment variables
+    if test -n "$_OLD_VIRTUAL_PATH"
+        set -gx PATH $_OLD_VIRTUAL_PATH
+        set -e _OLD_VIRTUAL_PATH
+    end
+    if test -n "$_OLD_VIRTUAL_PYTHONHOME"
+        set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME
+        set -e _OLD_VIRTUAL_PYTHONHOME
+    end
+
+    if test -n "$_OLD_FISH_PROMPT_OVERRIDE"
+        functions -e fish_prompt
+        set -e _OLD_FISH_PROMPT_OVERRIDE
+        functions -c _old_fish_prompt fish_prompt
+        functions -e _old_fish_prompt
+    end
+
+    set -e VIRTUAL_ENV
+    if test "$argv[1]" != "nondestructive"
+        # Self destruct!
+        functions -e deactivate
+    end
+end
+
+# unset irrelevant variables
+deactivate nondestructive
+
+set -gx VIRTUAL_ENV "/home/decentral1se/hacking/voicegardens/venv"
+
+set -gx _OLD_VIRTUAL_PATH $PATH
+set -gx PATH "$VIRTUAL_ENV/bin" $PATH
+
+# unset PYTHONHOME if set
+if set -q PYTHONHOME
+    set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME
+    set -e PYTHONHOME
+end
+
+if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
+    # fish uses a function instead of an env var to generate the prompt.
+
+    # save the current fish_prompt function as the function _old_fish_prompt
+    functions -c fish_prompt _old_fish_prompt
+
+    # with the original prompt function renamed, we can override with our own.
+    function fish_prompt
+        # Save the return status of the last command
+        set -l old_status $status
+
+        # Prompt override?
+        if test -n "(venv) "
+            printf "%s%s" "(venv) " (set_color normal)
+        else
+            # ...Otherwise, prepend env
+            set -l _checkbase (basename "$VIRTUAL_ENV")
+            if test $_checkbase = "__"
+                # special case for Aspen magic directories
+                # see http://www.zetadev.com/software/aspen/
+                printf "%s[%s]%s " (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal)
+            else
+                printf "%s(%s)%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal)
+            end
+        end
+
+        # Restore the return status of the previous command.
+        echo "exit $old_status" | .
+        _old_fish_prompt
+    end
+
+    set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV"
+end

venv/bin/python

@@ -0,0 +1 @@
+python3

venv/bin/python3

@@ -0,0 +1 @@
+/home/decentral1se/.pyenv/versions/3.7.2/bin/python3

venv/lib64

@@ -0,0 +1 @@
+lib

venv/pyvenv.cfg

@@ -0,0 +1,3 @@
+home = /home/decentral1se/.pyenv/versions/3.7.2/bin
+include-system-site-packages = false
+version = 3.7.2

vocoder/server.py → voicegardens/server.py

@@ -1,4 +1,4 @@
-"""Flask server for the vocoder back-end."""
+"""Flask server for the voicegardens back-end."""
 
 import os.path
 from pathlib import Path

vocoder/static/vocoder.js → voicegardens/static/voicegardens.js

@@ -1,7 +1,7 @@
 "use strict";
 
 //
-// Vocoder front-end Javascript
+// Voicegardens front-end Javascript
 //
 
 var archiveUrl = window.location + "add-to-archive";

vocoder/templates/archive.html → voicegardens/templates/archive.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>vocoder.org: archive</title>
+    <title>voicegardens.org: archive</title>
   </head>
   <body>
     <ul>

vocoder/templates/index.html → voicegardens/templates/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>vocoder.org: home</title>
+    <title>voicegardens.org: home</title>
     <link
       rel="stylesheet"
       href="/static/leaflet/leaflet.css"
@@ -29,6 +29,6 @@
     <script src="/static/p5js/p5.sound.min.js" charset="utf-8"></script>
     <script src="/static/p5js/p5.collide2d.min.js" charset="utf-8"></script>
     <script src="/static/axios/axios.min.js"></script>
-    <script src="/static/vocoder.js" charset="utf-8"></script>
+    <script src="/static/voicegardens.js" charset="utf-8"></script>
   </body>
 </html>