convert markdown to gemtext and display README.md files
") => %s here ", httpURL)) ") ----------------------------- ")
This commit is contained in:
parent
9b100e88a2
commit
63775d57e0
GPG key ID:
CB9BF1910F3F7469
3 changed files with 84 additions and 5 deletions
7
go.mod
7
go.mod
|
|
@ -7,3 +7,10 @@ require (
|
|||
github.com/kulak/gemini v1.2.2
|
||||
github.com/mattn/go-sqlite3 v1.14.32
|
||||
)
|
||||
|
||||
require (
|
||||
git.sr.ht/~kota/fuckery v0.2.0 // indirect
|
||||
git.sr.ht/~kota/goldmark-gemtext v0.3.3 // indirect
|
||||
git.sr.ht/~kota/goldmark-wiki v0.0.0-20211119234413-891f759dc3aa // indirect
|
||||
github.com/yuin/goldmark v1.7.13 // indirect
|
||||
)
|
||||
|
|
|
|||
11
go.sum
11
go.sum
|
|
@ -1,7 +1,14 @@
|
|||
git.sr.ht/~kota/fuckery v0.2.0 h1:0JfnSMiQWFVFdGplolb2ZuRqDQLG5uAzDmH/oSaRj9Y=
|
||||
git.sr.ht/~kota/fuckery v0.2.0/go.mod h1:UuYM/CTzL6F/FYB/uulUV1ceymM5NSJv2Qif3VVj/s8=
|
||||
git.sr.ht/~kota/goldmark-gemtext v0.3.3 h1:Vchc1qgEoBE0XgztZFJwKyAYmzNL/C0t34F+gNw0FDU=
|
||||
git.sr.ht/~kota/goldmark-gemtext v0.3.3/go.mod h1:nWcD/0KzomgMaY9t7odGt7mc5QWiaTnrP6CwxYDJHYY=
|
||||
git.sr.ht/~kota/goldmark-wiki v0.0.0-20211119234413-891f759dc3aa h1:4JHg1p9hfnZEJtVjmhFhvYV4RO12mMDQf6NFolFJDzo=
|
||||
git.sr.ht/~kota/goldmark-wiki v0.0.0-20211119234413-891f759dc3aa/go.mod h1:7bNFInCQWKDjV6b8qsLDwQ/q5XrVMjrACQjOnJGXe/4=
|
||||
git.travisshears.com/travisshears/gemlog-cli v1.1.0 h1:iFMIeYyzPvoUw2sQqGg8PTejCcKxgmhjy5HqpVo3Ag8=
|
||||
git.travisshears.com/travisshears/gemlog-cli v1.1.0/go.mod h1:N6l94N174EhDOIHU0/RlJ0PWrxB0BMa0W6LcpgAtvCE=
|
||||
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/kulak/gemini v1.2.2 h1:wPFOAFFdOf9ZaHcpMwTq1xYUWxmyV3h0uQl0OXCGa+A=
|
||||
github.com/kulak/gemini v1.2.2/go.mod h1:8yiD7yhLkUGvOpdvgd/0nKQD2I0ChIAKD3yHuT13R5k=
|
||||
github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
|
||||
|
|
@ -11,6 +18,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
|
|||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/yuin/goldmark v1.4.4/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
|
||||
github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA=
|
||||
github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package codeview
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
|
|
@ -9,6 +10,10 @@ import (
|
|||
"net/url"
|
||||
"strings"
|
||||
|
||||
gemtext "git.sr.ht/~kota/goldmark-gemtext"
|
||||
goldmark "github.com/yuin/goldmark"
|
||||
"github.com/yuin/goldmark/extension"
|
||||
|
||||
"github.com/kulak/gemini"
|
||||
)
|
||||
|
||||
|
|
@ -88,6 +93,7 @@ func serveDir(w gemini.ResponseWriter, req *gemini.Request, path string) {
|
|||
Path string `json:"path"`
|
||||
URL string `json:"html_url"`
|
||||
Type string `json:"type"`
|
||||
RawURL string `json:"download_url"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(body, &dirRes); err != nil {
|
||||
|
|
@ -99,7 +105,7 @@ func serveDir(w gemini.ResponseWriter, req *gemini.Request, path string) {
|
|||
|
||||
var content strings.Builder
|
||||
w.WriteStatusMsg(gemini.StatusSuccess, "text/gemini")
|
||||
content.WriteString("# Dir CodeView\n")
|
||||
content.WriteString("# Directory CodeView\n")
|
||||
httpURL := fmt.Sprintf("https://git.travisshears.com/travisshears/personal-gemini-capsule/src/branch/main/%s", filepath)
|
||||
if branch != "" {
|
||||
httpURL = fmt.Sprintf("https://git.travisshears.com/travisshears/personal-gemini-capsule/src/branch/%s/%s", branch, filepath)
|
||||
|
|
@ -108,6 +114,22 @@ func serveDir(w gemini.ResponseWriter, req *gemini.Request, path string) {
|
|||
}
|
||||
content.WriteString(fmt.Sprintf("This is a code view which proxies my personal git server. On the clearnet the following dir is available:\n=> %s here\n\n", httpURL))
|
||||
|
||||
// print readme page
|
||||
// var readmeURL string
|
||||
for _, file := range dirRes {
|
||||
if file.Type == "file" && file.Name == "README.md" {
|
||||
slog.Info("Found README.md", "file", file)
|
||||
gemtext, err := getRemoteMarkdownFile(file.RawURL)
|
||||
if err != nil {
|
||||
slog.Error("Failed to fetch README.md", "url", file.RawURL, "error", err)
|
||||
continue
|
||||
}
|
||||
content.WriteString("README.md found. The following is a markdown to gemtext conversion with directory listing below\n")
|
||||
content.WriteString(gemtext)
|
||||
content.WriteString("\n\n-----------------------------\n\n")
|
||||
}
|
||||
}
|
||||
|
||||
for _, file := range dirRes {
|
||||
switch file.Type {
|
||||
case "dir":
|
||||
|
|
@ -123,6 +145,45 @@ func serveDir(w gemini.ResponseWriter, req *gemini.Request, path string) {
|
|||
w.WriteBody([]byte(content.String()))
|
||||
}
|
||||
|
||||
func getRemoteMarkdownFile(url string) (string, error) {
|
||||
resp, err := http.Get(url)
|
||||
if err != nil {
|
||||
slog.Error("Failed to fetch remote markdown file", "url", url, "error", err)
|
||||
return "", err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
slog.Error("Failed to fetch remote markdown file", "url", url, "status", resp.Status)
|
||||
return "", fmt.Errorf("failed to fetch remote markdown file")
|
||||
}
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
slog.Error("Failed to read remote markdown file", "url", url, "error", err)
|
||||
return "", err
|
||||
}
|
||||
|
||||
return convertMdToGemtext(string(body)), nil
|
||||
}
|
||||
|
||||
func convertMdToGemtext(markdown string) string {
|
||||
var buf bytes.Buffer
|
||||
md := goldmark.New(
|
||||
goldmark.WithExtensions(
|
||||
extension.Linkify,
|
||||
extension.Strikethrough,
|
||||
),
|
||||
)
|
||||
|
||||
// set some options
|
||||
// options := []Option{WithHeadingLink(HeadingLinkAuto), WithCodeSpan(CodeSpanMarkdown)}
|
||||
|
||||
md.SetRenderer(gemtext.New())
|
||||
_ = md.Convert([]byte(markdown), &buf) // ignoring errors for example
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
func serveFile(w gemini.ResponseWriter, req *gemini.Request, path string) {
|
||||
path = strings.TrimPrefix(path, "/codeview/raw/")
|
||||
rawURL := strings.Replace(path, "src", "raw", 1)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue