1diff --git a/Makefile b/Makefile
2index c1deac1178f2c824ff5d1418b7de10e010e1eb86..743c0fd2e391830b12b52616a9acd68b37ef9aa3 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -6,6 +6,19 @@ GO_TEST=go test -v -timeout 100ms -shuffle on -parallel `nproc`
6 GO_BUILD=go build -v -ldflags '-w -s'
7 GO_RUN=go run -v
8
9+# Development setup
10+DB_TYPE?=sqlite
11+DB_CON?=main.db
12+LOG_LEVEL?=error
13+SCHEDULER_COUNT?=`nproc`
14+CACHE_PATH?=$(HOME)/cache
15+AES_KEY?=`openssl rand -rand /dev/urandom 32 | base64`
16+
17+ifneq (,$(wildcard ./.env))
18+ include .env
19+ export
20+endif
21+
22 all: build
23
24 build: sass tmpl
25@@ -19,9 +32,12 @@ upx --best --ultra-brute $(OUT)
26
27 run: sass
28 $(GO_RUN) $(SERVER) \
29- --log-level error \
30- --aes-key=6368616e676520746869732070617373 \
31- --cache-path=${HOME}/.thumb
32+ --db-type=$(DB_TYPE) \
33+ --db-con="$(DB_CON)" \
34+ --log-level=$(LOG_LEVEL) \
35+ --scheduler-count=$(SCHEDULER_COUNT) \
36+ --cache-path="$(CACHE_PATH)" \
37+ --aes-key="$(AES_KEY)"
38
39 sass:
40 @mkdir -p static
41@@ -75,3 +91,7 @@ -exec gci write -s standard -s default -s "prefix(git.sr.ht/~gabrielgio/img)" {} +
42
43 alignment:
44 betteralign -apply ./...
45+
46+watch:
47+ find . \( ! -name "*.qtpl.go" -a \( -name "*.go" -o -name "*.qtpl" -o -name "main.scss" \) \) | \
48+ entr -sr 'make run'
49diff --git a/README.md b/README.md
50index a008d7f85f3780fae96c8df6ca4dfc0a0e314da7..256cfb303cbc74475e5647634cc9aa0693f2cc18 100644
51--- a/README.md
52+++ b/README.md
53@@ -1,8 +1,59 @@
54 # Lens
55
56 A read only file explorer with media capabilities.
57-
58-# Dev requirements
59+
60+# Dev
61+
62+To run the project you simply need to run:
63+
64+```bash
65+make run
66+```
67+
68+It should run using sqlite with a randon AES key. But if you don't set a
69+`AES_KEY` a new one will generated every time the project is realead and you
70+will be logged out.
71+
72+You can also create a `.env` file which will be read by make to populate the
73+environment variables, e.g.:
74+
75+```ini
76+# .env
77+DB_TYPE=psql
78+DB_CON=host=localhost user=admin password=admin dbname=lens port=5432
79+LOG_LEVEL=error
80+SCHEDULER_COUNT=10
81+CACHE_PATH=/home/myhome/.thumb
82+AES_KEY=X4Eu3OT/WqUtUJhGLUtQ4xRahwhWYaSs+k2a03Kz1A8=
83+```
84+
85+Obs.: don't quote the value, that will be done automatically.
86+
87+Throughout the development you can also run `make watch` for a hot reload
88+experience. It will feedback loop a bit faster.
89+
90+## Build and install
91+
92+To build you simply run:
93+```
94+make
95+```
96+
97+And a `./bin/lens` will be created.
98+
99+To install run:
100+
101+```
102+make install
103+```
104+
105+Or you can pass a custom target folder.
106+
107+```
108+PREFIX=~/.local/ make install
109+```
110+
111+# Requirements
112
113 ## qtc
114
115diff --git a/cmd/server/main.go b/cmd/server/main.go
116index a3d5124e758937ca88d4b1cc89160e87f191bb39..035d00aba84f2c6f54ce952f28c9b28b6b719e9e 100644
117--- a/cmd/server/main.go
118+++ b/cmd/server/main.go
119@@ -2,7 +2,7 @@ package main
120
121 import (
122 "context"
123- "encoding/hex"
124+ "encoding/base64"
125 "errors"
126 "net/http"
127 "os"
128@@ -66,7 +66,7 @@ if *dbType == "sqlite" {
129 *schedulerCount = 1
130 }
131
132- hexKey, err := hex.DecodeString(*key)
133+ baseKey, err := base64.StdEncoding.DecodeString(*key)
134 if err != nil {
135 panic("failed to decode key database: " + err.Error())
136 }
137@@ -84,7 +84,7 @@ )
138
139 // middleware
140 var (
141- authMiddleware = ext.NewAuthMiddleware(hexKey, logger.WithField("context", "auth"))
142+ authMiddleware = ext.NewAuthMiddleware(baseKey, logger.WithField("context", "auth"))
143 logMiddleware = ext.NewLogMiddleare(logger.WithField("context", "http"))
144 initialMiddleware = ext.NewInitialSetupMiddleware(userRepository)
145 )
146@@ -99,7 +99,7 @@ scheduler := worker.NewScheduler(*schedulerCount)
147
148 // controller
149 var (
150- userController = service.NewAuthController(userRepository, userRepository, hexKey)
151+ userController = service.NewAuthController(userRepository, userRepository, baseKey)
152 fileSystemController = service.NewFileSystemController(fileSystemRepository, userRepository)
153 )
154