Normalize paths to fix EFS support on Windows

xio/fs/embedded/efs.go

@@ -20,9 +20,13 @@ func (f *efs) IsLive() bool {
 	return false
 }
 
+func (f *efs) actualPath(path string) string {
+	fmt.Println(filepath.ToSlash(filepath.Clean("/" + path)))
+	return filepath.ToSlash(filepath.Clean("/" + path))
+}
+
 func (f *efs) Open(path string) (http.File, error) {
-	path = filepath.Clean("/" + path)
-	one, ok := f.files[path]
+	one, ok := f.files[f.actualPath(path)]
 	if !ok {
 		return nil, os.ErrNotExist
 	}
@@ -42,7 +46,7 @@ func (f *efs) Open(path string) (http.File, error) {
 }
 
 func (f *efs) ContentAsBytes(path string) ([]byte, bool) {
-	if one, ok := f.files[filepath.Clean("/"+path)]; ok {
+	if one, ok := f.files[f.actualPath(path)]; ok {
 		if err := one.uncompressData(); err != nil {
 			return nil, false
 		}

xio/fs/embedded/fs.go

@@ -42,17 +42,17 @@ func NewEFS(files map[string]*File) *EFS {
 	for k, v := range files {
 		dir, _ := filepath.Split(k)
 		dir = filepath.Clean(dir)
-		di, ok := dirs[dir]
+		di, ok := dirs[filepath.ToSlash(dir)]
 		if !ok {
 			di = &dinfo{
 				f: &File{
-					name:    filepath.Base(dir),
+					name:    filepath.ToSlash(filepath.Base(dir)),
 					modTime: now,
 					isDir:   true,
 				},
 				m: collection.NewStringSet(),
 			}
-			dirs[dir] = di
+			dirs[filepath.ToSlash(dir)] = di
 		}
 		di.f.files = append(di.f.files, v)
 		// Ensure parents are present
@@ -62,17 +62,17 @@ func NewEFS(files map[string]*File) *EFS {
 				break
 			}
 			dir = filepath.Clean(dir)
-			p, ok := dirs[dir]
+			p, ok := dirs[filepath.ToSlash(dir)]
 			if !ok {
 				p = &dinfo{
 					f: &File{
-						name:    filepath.Base(dir),
+						name:    filepath.ToSlash(filepath.Base(dir)),
 						modTime: now,
 						isDir:   true,
 					},
 					m: collection.NewStringSet(),
 				}
-				dirs[dir] = p
+				dirs[filepath.ToSlash(dir)] = p
 			}
 			if p.m.Contains(path) {
 				break