uid: escape paths

Author: rsteube

action.go

@@ -485,8 +485,8 @@ func (a Action) Uid(scheme, host string, opts ...string) Action {
 		for index, v := range invoked.action.rawValues {
 			uid := url.URL{
 				Scheme: scheme,
-				Host:   host,
-				Path:   v.Value,
+				Host:   url.PathEscape(host),
+				Path:   uid.PathEscape(v.Value),
 			}
 			if len(opts) > 0 {
 				values := uid.Query()

defaultActions.go

@@ -143,7 +143,7 @@ func ActionDirectories() Action {
 				if err != nil {
 					return nil, err
 				}
-				return url.Parse("file://" + abs)
+				return url.Parse("file://" + uid.PathEscape(abs))
 			})
 	}).Tag("directories")
 }
@@ -159,7 +159,7 @@ func ActionFiles(suffix ...string) Action {
 				if err != nil {
 					return nil, err
 				}
-				return url.Parse("file://" + abs)
+				return url.Parse("file://" + uid.PathEscape(abs))
 			})
 	}).Tag("files")
 }
@@ -458,7 +458,7 @@ func ActionExecutables(dirs ...string) Action {
 		}
 		return batch.ToA().
 			UidF(func(s string, uc uid.Context) (*url.URL, error) {
-				return &url.URL{Scheme: "cmd", Host: s}, nil
+				return &url.URL{Scheme: "cmd", Host: uid.PathEscape(s)}, nil
 			})
 	}).Tag("executables")
 }
@@ -480,7 +480,7 @@ func actionDirectoryExecutables(dir string, prefix string, manDescriptions map[s
 				}
 			}
 			return ActionStyledValuesDescribed(vals...).UidF(func(s string, uc uid.Context) (*url.URL, error) {
-				return url.Parse(fmt.Sprintf("file://%v/%v", dir, s)) // TODO trim slash suffix from dir | backslash path possible? (windows)
+				return url.Parse(fmt.Sprintf("file://%v/%v", uid.PathEscape(dir), uid.PathEscape(s))) // TODO trim slash suffix from dir | backslash path possible? (windows)
 			})
 		}
 		return ActionValues()
@@ -555,9 +555,9 @@ func ActionCommands(cmd *cobra.Command) Action {
 
 			switch uid.Path {
 			case "":
-				uid.Path = s
+				uid.Path = url.PathEscape(s)
 			default:
-				uid.Path = uid.Path + "/" + s
+				uid.Path = uid.Path + "/" + url.PathEscape(s)
 			}
 			return uid, nil
 		})

pkg/uid/path.go

@@ -0,0 +1,14 @@
+package uid
+
+import (
+	"net/url"
+	"strings"
+)
+
+func PathEscape(s string) string {
+	segments := strings.Split(s, "/")
+	for index, segment := range segments {
+		segments[index] = url.PathEscape(segment)
+	}
+	return strings.Join(segments, "/")
+}

pkg/uid/uid.go

@@ -21,7 +21,7 @@ type Context interface {
 func Command(cmd *cobra.Command) *url.URL {
 	path := []string{cmd.Name()}
 	for parent := cmd.Parent(); parent != nil; parent = parent.Parent() {
-		path = append(path, parent.Name())
+		path = append(path, url.PathEscape(parent.Name()))
 	}
 	reverse(path) // TODO slices.Reverse
 	return &url.URL{