Add binary files support (#503)

internal/web/handlers/gist/create.go

@@ -1,14 +1,15 @@
 package gist
 
 import (
+	"net/url"
+	"strconv"
+	"strings"
+
 	"github.com/google/uuid"
 	"github.com/thomiceli/opengist/internal/db"
 	"github.com/thomiceli/opengist/internal/i18n"
 	"github.com/thomiceli/opengist/internal/validator"
 	"github.com/thomiceli/opengist/internal/web/context"
-	"net/url"
-	"strconv"
-	"strings"
 )
 
 func Create(ctx *context.Context) error {

internal/web/handlers/gist/download.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/thomiceli/opengist/internal/db"
 	"github.com/thomiceli/opengist/internal/web/context"
-	"github.com/thomiceli/opengist/internal/web/handlers"
 )
 
 func RawFile(ctx *context.Context) error {
@@ -20,10 +19,8 @@ func RawFile(ctx *context.Context) error {
 	if file == nil {
 		return ctx.NotFound("File not found")
 	}
-	contentType := handlers.GetContentTypeFromFilename(file.Filename)
-	ContentDisposition := handlers.GetContentDisposition(file.Filename)
-	ctx.Response().Header().Set("Content-Type", contentType)
-	ctx.Response().Header().Set("Content-Disposition", ContentDisposition)
+	ctx.Response().Header().Set("Content-Type", file.MimeType.ContentType)
+	ctx.Response().Header().Set("Content-Disposition", "inline; filename=\""+file.Filename+"\"")
 	return ctx.PlainText(200, file.Content)
 }
 
@@ -38,7 +35,7 @@ func DownloadFile(ctx *context.Context) error {
 		return ctx.NotFound("File not found")
 	}
 
-	ctx.Response().Header().Set("Content-Type", "text/plain")
+	ctx.Response().Header().Set("Content-Type", file.MimeType.ContentType)
 	ctx.Response().Header().Set("Content-Disposition", "attachment; filename="+file.Filename)
 	ctx.Response().Header().Set("Content-Length", strconv.Itoa(len(file.Content)))
 	_, err = ctx.Response().Write([]byte(file.Content))

internal/web/handlers/gist/gist.go

@@ -5,12 +5,13 @@ import (
 	"bytes"
 	gojson "encoding/json"
 	"fmt"
+	"net/url"
+	"time"
+
 	"github.com/thomiceli/opengist/internal/db"
 	"github.com/thomiceli/opengist/internal/git"
 	"github.com/thomiceli/opengist/internal/render"
 	"github.com/thomiceli/opengist/internal/web/context"
-	"net/url"
-	"time"
 )
 
 func GistIndex(ctx *context.Context) error {
@@ -34,7 +35,7 @@ func GistIndex(ctx *context.Context) error {
 		return ctx.ErrorRes(500, "Error fetching files", err)
 	}
 
-	renderedFiles := render.HighlightFiles(files)
+	renderedFiles := render.RenderFiles(files)
 
 	ctx.SetData("page", "code")
 	ctx.SetData("commit", revision)
@@ -51,7 +52,7 @@ func GistJson(ctx *context.Context) error {
 		return ctx.ErrorRes(500, "Error fetching files", err)
 	}
 
-	renderedFiles := render.HighlightFiles(files)
+	renderedFiles := render.RenderFiles(files)
 	ctx.SetData("files", renderedFiles)
 
 	topics, err := gist.GetTopics()
@@ -106,7 +107,7 @@ func GistJs(ctx *context.Context) error {
 		return ctx.ErrorRes(500, "Error fetching files", err)
 	}
 
-	renderedFiles := render.HighlightFiles(files)
+	renderedFiles := render.RenderFiles(files)
 	ctx.SetData("files", renderedFiles)
 
 	htmlbuf := bytes.Buffer{}

internal/web/handlers/util.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"html/template"
 	"net/url"
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -141,22 +140,3 @@ func ParseSearchQueryStr(query string) (string, map[string]string) {
 	content := strings.TrimSpace(contentBuilder.String())
 	return content, metadata
 }
-
-func GetContentTypeFromFilename(filename string) (ret string) {
-	ext := strings.ToLower(filepath.Ext(filename))
-
-	switch ext {
-	case ".css":
-		ret = "text/css"
-	default:
-		ret = "text/plain"
-	}
-
-	// add charset=utf-8, if not, unicode charset will be broken
-	ret += "; charset=utf-8"
-	return
-}
-
-func GetContentDisposition(filename string) string {
-	return "inline; filename=\"" + filename + "\""
-}

internal/web/server/middlewares.go

@@ -3,6 +3,13 @@ package server
 import (
 	"errors"
 	"fmt"
+	"html/template"
+	"net/http"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"time"
+
 	"github.com/labstack/echo-contrib/echoprometheus"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
@@ -15,12 +22,6 @@ import (
 	"github.com/thomiceli/opengist/internal/web/handlers"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
-	"html/template"
-	"net/http"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
 )
 
 func (s *Server) useCustomContext() {
@@ -54,7 +55,7 @@ func (s *Server) registerMiddlewares() {
 			return nil
 		},
 	}))
-	//s.echo.Use(middleware.Recover())
+	s.echo.Use(middleware.Recover())
 	s.echo.Use(middleware.Secure())
 	s.echo.Use(Middleware(sessionInit).toEcho())
 

internal/web/server/renderer.go

@@ -4,16 +4,6 @@ import (
 	gojson "encoding/json"
 	"errors"
 	"fmt"
-	"github.com/labstack/echo/v4"
-	"github.com/rs/zerolog/log"
-	"github.com/thomiceli/opengist/internal/config"
-	"github.com/thomiceli/opengist/internal/db"
-	"github.com/thomiceli/opengist/internal/git"
-	"github.com/thomiceli/opengist/internal/index"
-	"github.com/thomiceli/opengist/internal/web/context"
-	"github.com/thomiceli/opengist/internal/web/handlers"
-	"github.com/thomiceli/opengist/public"
-	"github.com/thomiceli/opengist/templates"
 	htmlpkg "html"
 	"html/template"
 	"io"
@@ -24,6 +14,16 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/labstack/echo/v4"
+	"github.com/rs/zerolog/log"
+	"github.com/thomiceli/opengist/internal/config"
+	"github.com/thomiceli/opengist/internal/db"
+	"github.com/thomiceli/opengist/internal/index"
+	"github.com/thomiceli/opengist/internal/web/context"
+	"github.com/thomiceli/opengist/internal/web/handlers"
+	"github.com/thomiceli/opengist/public"
+	"github.com/thomiceli/opengist/templates"
 )
 
 type Template struct {
@@ -58,24 +58,6 @@ func (s *Server) setFuncMap() {
 		"isMarkdown": func(i string) bool {
 			return strings.ToLower(filepath.Ext(i)) == ".md"
 		},
-		"isCsv": func(i string) bool {
-			return strings.ToLower(filepath.Ext(i)) == ".csv"
-		},
-		"isSvg": func(i string) bool {
-			return strings.ToLower(filepath.Ext(i)) == ".svg"
-		},
-		"csvFile": func(file *git.File) *git.CsvFile {
-			if strings.ToLower(filepath.Ext(file.Filename)) != ".csv" {
-				return nil
-			}
-
-			csvFile, err := git.ParseCsv(file)
-			if err != nil {
-				return nil
-			}
-
-			return csvFile
-		},
 		"httpStatusText": http.StatusText,
 		"loadedTime": func(startTime time.Time) string {
 			return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"