WIP

server-new/internal/adapters/errors.go

@@ -0,0 +1,5 @@
+package adapters
+
+import "errors"
+
+var ErrNotFound = errors.New("not found")

server-new/internal/adapters/fs.go

@@ -0,0 +1,97 @@
+package adapters
+
+import (
+	"os"
+	"path/filepath"
+)
+
+type LocalFsAdapter struct {
+	root string
+}
+
+func (l LocalFsAdapter) readDir(path string) (FsResponse, error) {
+	dirInfo, _ := os.Stat(path)
+
+	entries, err := os.ReadDir(path)
+	if err != nil {
+		return FsResponse{}, err
+	}
+
+	out := make([]FsDirEntry, 0, len(entries))
+	for _, e := range entries {
+		info, _ := e.Info()
+
+		entryType := "dir"
+		if !e.IsDir() {
+			entryType = contentTypeFor(e.Name())
+		}
+
+		out = append(out, FsDirEntry{
+			Name:    e.Name(),
+			Type:    entryType,
+			ModTime: info.ModTime(),
+		})
+	}
+
+	return FsResponse{
+		Dir: &FsDir{
+			Files:   out,
+			Name:    ResponsePath(l.root, path),
+			ModTime: dirInfo.ModTime(),
+		},
+	}, nil
+}
+
+func (l LocalFsAdapter) readFile(path string) (FsResponse, error) {
+	fi, err := os.Stat(path)
+	if err != nil {
+		return FsResponse{}, err
+	}
+
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return FsResponse{}, err
+	}
+
+	return FsResponse{
+		File: &FsFile{
+			Name:    ResponsePath(l.root, path),
+			Type:    contentTypeFor(path),
+			ModTime: fi.ModTime(),
+			Content: data,
+		},
+	}, nil
+}
+
+func (l LocalFsAdapter) Read(path string) (FsResponse, error) {
+	cleanRel, err := SafeRel(l.root, path)
+	if err != nil {
+		return FsResponse{}, err
+	}
+	target := filepath.Join(l.root, filepath.FromSlash(cleanRel))
+
+	fi, err := os.Stat(target)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return FsResponse{}, ErrNotFound
+		}
+
+		return FsResponse{}, err
+	}
+
+	if fi.IsDir() {
+		return l.readDir(target)
+	}
+
+	return l.readFile(target)
+}
+
+func (LocalFsAdapter) Write(path string, content []byte) error {
+	return nil
+}
+
+func NewLocalFsAdapter(root string) (FileAdapter, error) {
+	return LocalFsAdapter{
+		root: root,
+	}, nil
+}

server-new/internal/adapters/fs_utils.go

@@ -0,0 +1,78 @@
+package adapters
+
+import (
+	"errors"
+	"mime"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+func SafeRel(root, requested string) (string, error) {
+	s := requested
+	if after, ok := strings.CutPrefix(s, "/"); ok {
+		s = after
+	}
+	full := filepath.Join(root, filepath.FromSlash(s))
+	rel, err := filepath.Rel(root, full)
+	if err != nil {
+		return "", err
+	}
+	if rel == "." {
+		return "/", nil
+	}
+	sep := string(filepath.Separator)
+	if strings.HasPrefix(rel, "..") || strings.Contains(rel, ".."+sep) {
+		return "", errors.New("path escapes root")
+	}
+	return "/" + filepath.ToSlash(rel), nil
+}
+
+func ResponsePath(root, full string) string {
+	rel, err := filepath.Rel(root, full)
+	if err != nil || rel == "." {
+		return "/"
+	}
+	return "/" + filepath.ToSlash(rel)
+}
+
+func sizeOrZero(fi os.FileInfo) int64 {
+	if fi == nil {
+		return 0
+	}
+	return fi.Size()
+}
+
+func modTimeOrZero(fi os.FileInfo) time.Time {
+	if fi == nil {
+		return time.Time{}
+	}
+	return fi.ModTime()
+}
+
+var textPlainExtensions = map[string]bool{
+	".txt":  true,
+	".log":  true,
+	".json": true,
+	".yaml": true,
+	".yml":  true,
+	".toml": true,
+	".xml":  true,
+	".csv":  true,
+}
+
+func contentTypeFor(name string) string {
+	ext := strings.ToLower(filepath.Ext(name))
+	switch ext {
+	case ".md", ".markdown", ".mdown":
+		return "application/markdown"
+	}
+	if ct := mime.TypeByExtension(ext); ct != "" {
+		return ct
+	}
+	if textPlainExtensions[ext] {
+		return "text/plain; charset=utf-8"
+	}
+	return "application/octet-stream"
+}

server-new/internal/adapters/interface.go

@@ -0,0 +1,34 @@
+// Package adapters are the backend to that connects the marka server to a storage
+package adapters
+
+import "time"
+
+type FileAdapter interface {
+	Read(path string) (FsResponse, error)
+	Write(path string, content []byte) error
+}
+
+type FsFile struct {
+	Name    string    `json:"name"`
+	Type    string    `json:"type"`
+	Content []byte    `json:"content"`
+	ModTime time.Time `json:"modTime"`
+}
+
+type FsDirEntry struct {
+	Name    string    `json:"name"`
+	Type    string    `json:"type"`
+	IsDir   bool      `json:"isDir,omitempty"`
+	ModTime time.Time `json:"modTime"`
+}
+
+type FsDir struct {
+	Files   []FsDirEntry `json:"files"`
+	Name    string       `json:"name"`
+	ModTime time.Time    `json:"modTime"`
+}
+
+type FsResponse struct {
+	Dir  *FsDir  `json:"dir,omitempty"`
+	File *FsFile `json:"file,omitempty"`
+}