Compare commits

...

2 Commits

Author SHA1 Message Date
jolheiser 590777dea0
feat: custom lexer registry
Signed-off-by: jolheiser <git@jolheiser.com>
2024-07-31 22:18:17 -05:00
jolheiser df7ace7fae
feat: ugit-uci
Signed-off-by: jolheiser <git@jolheiser.com>
2024-07-31 22:09:52 -05:00
3 changed files with 77 additions and 1 deletions

View File

@ -0,0 +1,68 @@
package main
import (
"bytes"
"flag"
"fmt"
"io"
"net/http"
"os"
"github.com/go-git/go-git/v5"
)
func maine() error {
repoDir, ok := os.LookupEnv("UGIT_REPODIR")
if !ok {
panic("UGIT_REPODIR not set")
}
urlFlag := flag.String("url", "http://localhost:3448", "URL for UCI")
flag.StringVar(urlFlag, "u", *urlFlag, "--url")
repoDirFlag := flag.String("repo-dir", "", "Repo dir (including .git)")
flag.StringVar(repoDirFlag, "rd", *repoDirFlag, "--repo-dir")
manifestFlag := flag.String("manifest", ".uci.jsonnet", "Path to manifest in repo")
flag.StringVar(manifestFlag, "m", *manifestFlag, "--manifest")
flag.Parse()
if *repoDirFlag != "" {
repoDir = *repoDirFlag
}
repo, err := git.PlainOpen(repoDir)
if err != nil {
return fmt.Errorf("could not open git dir %q: %w", repoDir, err)
}
tree, err := repo.Worktree()
if err != nil {
return fmt.Errorf("could not get worktree: %w", err)
}
fi, err := tree.Filesystem.Open(*manifestFlag)
if err != nil {
return fmt.Errorf("could not open manifest %q: %w", *manifestFlag, err)
}
defer fi.Close()
data, err := io.ReadAll(fi)
if err != nil {
return fmt.Errorf("could not read manifest: %w", err)
}
resp, err := http.Post(*urlFlag, "application/jsonnet", bytes.NewReader(data))
if err != nil {
return fmt.Errorf("could not post manifest: %w", err)
}
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("non-ok response: %s", resp.Status)
}
return nil
}
func main() {
if err := maine(); err != nil {
fmt.Println(err)
}
}

View File

@ -35,7 +35,7 @@
path = ./.;
});
pwd = ./.;
subPackages = ["cmd/ugitd"];
subPackages = ["cmd/ugitd" "cmd/ugit-uci"];
CGO_ENABLED = 0;
flags = [
"-trimpath"

View File

@ -2,6 +2,7 @@ package markup
import (
"io"
"path/filepath"
"github.com/alecthomas/chroma/v2"
"github.com/alecthomas/chroma/v2/formatters/html"
@ -26,10 +27,17 @@ var (
type code struct{}
var customReg = map[string]string{
".hujson": "json",
}
func setup(source []byte, fileName string) (chroma.Iterator, *chroma.Style, error) {
lexer := lexers.Match(fileName)
if lexer == nil {
lexer = lexers.Fallback
if name, ok := customReg[filepath.Ext(fileName)]; ok {
lexer = lexers.Get(name)
}
}
lexer = chroma.Coalesce(lexer)