Rename util to path, and move all path funcs there

node.go

@@ -14,7 +14,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"sort"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -401,28 +400,3 @@ func lookupNodeURL(url string) string {
 		"",
 	)
 }
-
-// Finds an order number embedded into given path/URL segment and
-// returns it. If none is found, returns 0.
-func orderNumber(segment string) uint64 {
-	s := NodePathTitleRegexp.FindStringSubmatch(segment)
-
-	if len(s) > 2 {
-		parsed, _ := strconv.ParseUint(s[0], 10, 64)
-		return parsed
-	}
-	return 0
-}
-
-// Removes order numbers from path/URL segment, if present.
-func removeOrderNumber(segment string) string {
-	s := NodePathTitleRegexp.FindStringSubmatch(segment)
-
-	if len(s) == 0 {
-		return segment
-	}
-	if len(s) > 2 {
-		return s[2]
-	}
-	return s[1]
-}

util.go → path.go

@@ -10,6 +10,7 @@ import (
 	"log"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 )
 
@@ -83,3 +84,28 @@ func anyPathSegmentMatches(path string, r *regexp.Regexp) bool {
 	}
 	return false
 }
+
+// Finds an order number embedded into given path segment and
+// returns it. If none is found, returns 0.
+func orderNumber(segment string) uint64 {
+	s := NodePathTitleRegexp.FindStringSubmatch(segment)
+
+	if len(s) > 2 {
+		parsed, _ := strconv.ParseUint(s[0], 10, 64)
+		return parsed
+	}
+	return 0
+}
+
+// Removes order numbers from path segment, if present.
+func removeOrderNumber(segment string) string {
+	s := NodePathTitleRegexp.FindStringSubmatch(segment)
+
+	if len(s) == 0 {
+		return segment
+	}
+	if len(s) > 2 {
+		return s[2]
+	}
+	return s[1]
+}