erick/kineto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for custom CSS.

Browse source
This commit is contained in:
José Mota 2021-02-14 22:42:51 +00:00 committed by Drew DeVault
parent 8f35e0a2b1
commit 1975525eeb
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -12,13 +12,16 @@ Geminispace, but it defaults to a specific domain.
``` ```
$ go build $ go build
$ ./kineto [-b 127.0.0.1:8080] gemini://example.org $ ./kineto [-b 127.0.0.1:8080] [-s style.css] gemini://example.org
``` ```
The -b argument is optional and allows you to bind to an arbitrary address; by The -b argument is optional and allows you to bind to an arbitrary address; by
default kineto will bind to `:8080`. You should set up some external reverse default kineto will bind to `:8080`. You should set up some external reverse
proxy like nginx to forward traffic to this port and add TLS. proxy like nginx to forward traffic to this port and add TLS.
The -s argument is optional and allows you to specify a custom CSS file. By
default kineto will serve its built-in style.
## "kineto"? ## "kineto"?
It's named after the Contraves-Goerz Kineto Tracking Mount, which is used by It's named after the Contraves-Goerz Kineto Tracking Mount, which is used by

25
main.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"html/template" "html/template"
"io" "io"
"io/ioutil"
"log" "log"
"mime" "mime"
"net/http" "net/http"
@ -324,7 +325,7 @@ dl dt:not(:first-child) {
pre { pre {
background-color: #222; background-color: #222;
} }
a { a {
color: #0087BD; color: #0087BD;
} }
@ -380,7 +381,7 @@ type GemtextHeading struct {
} }
func proxyGemini(req gemini.Request, external bool, root *url.URL, func proxyGemini(req gemini.Request, external bool, root *url.URL,
w http.ResponseWriter, r *http.Request) { w http.ResponseWriter, r *http.Request, css string) {
client := gemini.Client{ client := gemini.Client{
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
} }
@ -401,7 +402,7 @@ func proxyGemini(req gemini.Request, external bool, root *url.URL,
case 10, 11: case 10, 11:
w.Header().Add("Content-Type", "text/html") w.Header().Add("Content-Type", "text/html")
err = inputPage.Execute(w, &InputContext{ err = inputPage.Execute(w, &InputContext{
CSS: defaultCSS, CSS: css,
Prompt: resp.Meta, Prompt: resp.Meta,
Secret: resp.Status == 11, Secret: resp.Status == 11,
URL: req.URL, URL: req.URL,
@ -469,7 +470,7 @@ func proxyGemini(req gemini.Request, external bool, root *url.URL,
w.Header().Add("Content-Type", "text/html") w.Header().Add("Content-Type", "text/html")
ctx := &GemtextContext{ ctx := &GemtextContext{
CSS: defaultCSS, CSS: css,
External: external, External: external,
Resp: resp, Resp: resp,
Title: req.URL.Host + " " + req.URL.Path, Title: req.URL.Host + " " + req.URL.Path,
@ -499,9 +500,10 @@ func proxyGemini(req gemini.Request, external bool, root *url.URL,
func main() { func main() {
var ( var (
bind string = ":8080" bind string = ":8080"
css string = defaultCSS
) )
opts, optind, err := getopt.Getopts(os.Args, "b:c:") opts, optind, err := getopt.Getopts(os.Args, "b:c:s:")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -509,8 +511,15 @@ func main() {
switch opt.Option { switch opt.Option {
case 'b': case 'b':
bind = opt.Value bind = opt.Value
} case 's':
cssContent, err := ioutil.ReadFile(opt.Value)
if (err == nil) {
css = string(cssContent)
} else {
log.Fatalf("Error opening custom CSS from '%s': %v", opt.Value, err)
}
} }
}
args := os.Args[optind:] args := os.Args[optind:]
if len(args) != 1 { if len(args) != 1 {
@ -555,7 +564,7 @@ func main() {
req.URL.Path = r.URL.Path req.URL.Path = r.URL.Path
req.Host = root.Host req.Host = root.Host
req.URL.RawQuery = r.URL.RawQuery req.URL.RawQuery = r.URL.RawQuery
proxyGemini(req, false, root, w, r) proxyGemini(req, false, root, w, r, css)
})) }))
http.Handle("/x/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.Handle("/x/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@ -578,7 +587,7 @@ func main() {
} }
req.Host = path[2] req.Host = path[2]
log.Printf("%s (external) %s%s", r.Method, path[2], path[3]) log.Printf("%s (external) %s%s", r.Method, path[2], path[3])
proxyGemini(req, true, root, w, r) proxyGemini(req, true, root, w, r, css)
})) }))
log.Printf("HTTP server listening on %s", bind) log.Printf("HTTP server listening on %s", bind)