aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--go.mod2
-rw-r--r--go.sum10
-rw-r--r--main.go71
3 files changed, 45 insertions, 38 deletions
diff --git a/go.mod b/go.mod
index 4cdf6bf..cda7110 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@ module git.sr.ht/~sircmpwn/kineto
go 1.15
require (
- git.sr.ht/~adnano/gmi v0.0.1-alpha.1
+ git.sr.ht/~adnano/go-gemini v0.1.0 // indirect
git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3
)
diff --git a/go.sum b/go.sum
index 2a98b22..258033c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,8 @@
-git.sr.ht/~adnano/gmi v0.0.1-alpha.1 h1:zXcPeenDDt3opygDCunf52x3IJdVFEc1V0wf8aHshzc=
-git.sr.ht/~adnano/gmi v0.0.1-alpha.1/go.mod h1:4MWQDsleal4HRi/LuxxM6ymWJQikP3Gh7xZindVCHzg=
+git.sr.ht/~adnano/go-gemini v0.1.0 h1:UqRT90kR+/8q5s/JemmDPH6A9VocBezIuWbOpZYBypU=
+git.sr.ht/~adnano/go-gemini v0.1.0/go.mod h1:If1VxEWcZDrRt5FeAFnGTcM2Ud1E3BXs3VJ5rnZWKq0=
git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3 h1:4wDp4BKF7NQqoh73VXpZsB/t1OEhDpz/zEpmdQfbjDk=
git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/main.go b/main.go
index b22edd7..87449c2 100644
--- a/main.go
+++ b/main.go
@@ -12,44 +12,44 @@ import (
"os"
"strings"
- "git.sr.ht/~adnano/gmi"
+ "git.sr.ht/~adnano/go-gemini"
"git.sr.ht/~sircmpwn/getopt"
)
var gemtextPage = template.Must(template.
New("gemtext").
Funcs(template.FuncMap{
- "heading": func(line gmi.Line) *GemtextHeading {
+ "heading": func(line gemini.Line) *GemtextHeading {
switch l := line.(type) {
- case gmi.LineHeading1:
+ case gemini.LineHeading1:
return &GemtextHeading{1, string(l)}
- case gmi.LineHeading2:
+ case gemini.LineHeading2:
return &GemtextHeading{2, string(l)}
- case gmi.LineHeading3:
+ case gemini.LineHeading3:
return &GemtextHeading{3, string(l)}
default:
return nil
}
},
- "link": func(line gmi.Line) *gmi.LineLink {
+ "link": func(line gemini.Line) *gemini.LineLink {
switch l := line.(type) {
- case gmi.LineLink:
+ case gemini.LineLink:
return &l
default:
return nil
}
},
- "li": func(line gmi.Line) *gmi.LineListItem {
+ "li": func(line gemini.Line) *gemini.LineListItem {
switch l := line.(type) {
- case gmi.LineListItem:
+ case gemini.LineListItem:
return &l
default:
return nil
}
},
- "pre_toggle_on": func(ctx *GemtextContext, line gmi.Line) *gmi.LinePreformattingToggle {
+ "pre_toggle_on": func(ctx *GemtextContext, line gemini.Line) *gemini.LinePreformattingToggle {
switch l := line.(type) {
- case gmi.LinePreformattingToggle:
+ case gemini.LinePreformattingToggle:
if ctx.Pre % 4 == 0 {
ctx.Pre += 1
return &l
@@ -60,9 +60,9 @@ var gemtextPage = template.Must(template.
return nil
}
},
- "pre_toggle_off": func(ctx *GemtextContext, line gmi.Line) *gmi.LinePreformattingToggle {
+ "pre_toggle_off": func(ctx *GemtextContext, line gemini.Line) *gemini.LinePreformattingToggle {
switch l := line.(type) {
- case gmi.LinePreformattingToggle:
+ case gemini.LinePreformattingToggle:
if ctx.Pre % 4 == 3 {
ctx.Pre += 1
return &l
@@ -73,25 +73,25 @@ var gemtextPage = template.Must(template.
return nil
}
},
- "pre": func(line gmi.Line) *gmi.LinePreformattedText {
+ "pre": func(line gemini.Line) *gemini.LinePreformattedText {
switch l := line.(type) {
- case gmi.LinePreformattedText:
+ case gemini.LinePreformattedText:
return &l
default:
return nil
}
},
- "quote": func(line gmi.Line) *gmi.LineQuote {
+ "quote": func(line gemini.Line) *gemini.LineQuote {
switch l := line.(type) {
- case gmi.LineQuote:
+ case gemini.LineQuote:
return &l
default:
return nil
}
},
- "text": func(line gmi.Line) *gmi.LineText {
+ "text": func(line gemini.Line) *gemini.LineText {
switch l := line.(type) {
- case gmi.LineText:
+ case gemini.LineText:
return &l
default:
return nil
@@ -265,14 +265,27 @@ dl dt {
dl dt:not(:first-child) {
margin-top: 0.5rem;
}
+
+a {
+ position: relative;
+}
+
+a:before {
+ content: '⇒';
+ color: #999;
+ text-decoration: none;
+ font-weight: bold;
+ position: absolute;
+ left: -1.25rem;
+}
`
type GemtextContext struct {
CSS string
External bool
- Lines []gmi.Line
+ Lines []gemini.Line
Pre int
- Resp *gmi.Response
+ Resp *gemini.Response
Title string
URL *url.URL
}
@@ -282,10 +295,10 @@ type GemtextHeading struct {
Text string
}
-func proxyGemini(req gmi.Request, external bool,
+func proxyGemini(req gemini.Request, external bool,
w http.ResponseWriter, r *http.Request) {
- client := gmi.Client{
- TrustCertificate: func(_ string, _ *x509.Certificate, _ *gmi.KnownHosts) error {
+ client := gemini.Client{
+ TrustCertificate: func(_ string, _ *x509.Certificate, _ *gemini.KnownHosts) error {
return nil
},
}
@@ -353,17 +366,17 @@ func proxyGemini(req gmi.Request, external bool,
}
w.Header().Add("Content-Type", "text/html")
- text := gmi.Parse(bytes.NewReader(resp.Body))
+ text := gemini.Parse(bytes.NewReader(resp.Body))
ctx := &GemtextContext{
CSS: defaultCSS,
External: external,
- Lines: []gmi.Line(text),
+ Lines: []gemini.Line(text),
Resp: resp,
Title: req.URL.Host + " " + req.URL.Path,
URL: u,
}
for _, line := range text {
- if h, ok := line.(gmi.LineHeading1); ok {
+ if h, ok := line.(gemini.LineHeading1); ok {
ctx.Title = string(h)
break
}
@@ -415,7 +428,7 @@ func main() {
return
}
- req := gmi.Request{}
+ req := gemini.Request{}
req.URL = &url.URL{}
req.URL.Scheme = root.Scheme
req.URL.Host = root.Host
@@ -435,7 +448,7 @@ func main() {
if len(path) != 4 {
path = append(path, "")
}
- req := gmi.Request{}
+ req := gemini.Request{}
req.URL, err = url.Parse(fmt.Sprintf("gemini://%s/%s", path[2], path[3]))
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 02:32:01 +0000