Merge pull request #21 from TianTianBigWang/me-main

fix embed file path for windows

README.md

@@ -392,7 +392,7 @@ func main() {
 		currentPath := strings.TrimPrefix(string(ctx.Path()), "/swagger/ui")
 
 		if currentPath == "/" || currentPath == "index.html" {
-			fullName := filepath.Join(asserts.DistDir, "index.html")
+			fullName := path.Join(asserts.DistDir, "index.html")
 			fileData, err := asserts.Dist.ReadFile(fullName)
 			if err != nil {
 				ctx.Error("index.html read exception", http.StatusInternalServerError)

README_zh.md

@@ -388,7 +388,7 @@ func main() {
 		currentPath := strings.TrimPrefix(string(ctx.Path()), "/swagger/ui")
 
 		if currentPath == "/" || currentPath == "index.html" {
-			fullName := filepath.Join(asserts.DistDir, "index.html")
+			fullName := path.Join(asserts.DistDir, "index.html")
 			fileData, err := asserts.Dist.ReadFile(fullName)
 			if err != nil {
 				ctx.Error("index.html read exception", http.StatusInternalServerError)

api.go

@@ -20,7 +20,6 @@ import (
 	"io"
 	"net/http"
 	"path"
-	"path/filepath"
 	"reflect"
 	"strings"
 
@@ -403,7 +402,7 @@ func UIHandler(prefix, uri string, autoDomain bool) http.Handler {
 			return
 		}
 		if r.URL.Path == "/" || r.URL.Path == "index.html" {
-			fullName := filepath.Join(asserts.DistDir, "index.html")
+			fullName := path.Join(asserts.DistDir, "index.html")
 			fileData, err := asserts.Dist.ReadFile(fullName)
 			if err != nil {
 				w.WriteHeader(http.StatusInternalServerError)

fs.go

@@ -17,7 +17,7 @@ package swag
 import (
 	"io/fs"
 	"net/http"
-	"path/filepath"
+	"path"
 )
 
 // DirFS returns a http.FileSystem by the specified directory path and FS
@@ -34,5 +34,5 @@ type dirFS struct {
 }
 
 func (f dirFS) Open(name string) (http.File, error) {
-	return f.fs.Open(filepath.Join(f.dir, name))
+	return f.fs.Open(path.Join(f.dir, name))
 }

fs_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io/fs"
 	"net/http"
-	"path/filepath"
+	"path"
 	"testing"
 
 	"github.com/zc2638/swag/asserts"
@@ -44,7 +44,7 @@ func TestDirFS(t *testing.T) {
 }
 
 func Test_dirFS_Open(t *testing.T) {
-	file, err := http.FS(asserts.Dist).Open(filepath.Join(asserts.DistDir, "index.html"))
+	file, err := http.FS(asserts.Dist).Open(path.Join(asserts.DistDir, "index.html"))
 	if err != nil {
 		t.Errorf("open asserts failed: %v", err)
 	}