Update #3

[davecheney]

• Remove FileSystem.Join
• Add Filesystem.PathSeparator
• Add fs.Join package level func
• Walker now uses Join(fs, ...)

Sorry about the diff, I have no idea how to rebase or any of that stuff

[davecheney]

Gentle ping.

[kr]

Nice, looking now.

Don't worry about the diff. I can clean it up.

[kr]

The behavior of filepath.Clean depends on the value of PathSeparator.
So I guess we have to copy Clean (and FromSlash, etc) into this package.

[davecheney]

Didn't I do that with Clean(, sep) ?

On Fri, Nov 15, 2013 at 9:32 AM, Keith Rarick notifications@github.comwrote:

In filesystem.go:

@@ -33,4 +30,17 @@ func (f *fs) ReadDir(dirname string) ([]os.FileInfo, error) { return ioutil.Read

func (f *fs) Lstat(name string) (os.FileInfo, error) { return os.Lstat(name) }

-func (f *fs) Join(elem ...string) string { return filepath.Join(elem...) }
+func (f *fs) PathSeparator() byte { return os.PathSeparator }
+
+// Join joins any number of path elements into a single path, adding
+// a Separator if necessary. The result is Cleaned, in particular
+// all empty strings are ignored.
+func Join(fs FileSystem, elem ...string) string {

• sep := string(fs.PathSeparator())
• for i, e := range elem {

•   if e != "" {
  

•       return filepath.Clean(strings.Join(elem[i:], sep))
  

The behavior of filepath.Clean depends on the value of PathSeparator.
So I guess we have to copy Clean (and FromSlash, etc) into this package.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/5/files#r7675907
.

[kr]

Didn't I do that with Clean(, sep) ?

Not sure what you mean. This line calls filepath.Clean,
but it needs to call a local copy of Clean, which isn't
in this package or this pull request.

[davecheney]

I pass the separator that we want to clean with into filepath.Clean.

I'll check again, I think it's doing the right thing, but I could very well
be wrong as I don't have a win32 machine to test on.

On Fri, Nov 15, 2013 at 9:57 AM, Keith Rarick notifications@github.comwrote:

In filesystem.go:

@@ -33,4 +30,17 @@ func (f *fs) ReadDir(dirname string) ([]os.FileInfo, error) { return ioutil.Read

func (f *fs) Lstat(name string) (os.FileInfo, error) { return os.Lstat(name) }

-func (f *fs) Join(elem ...string) string { return filepath.Join(elem...) }
+func (f *fs) PathSeparator() byte { return os.PathSeparator }
+
+// Join joins any number of path elements into a single path, adding
+// a Separator if necessary. The result is Cleaned, in particular
+// all empty strings are ignored.
+func Join(fs FileSystem, elem ...string) string {

• sep := string(fs.PathSeparator())
• for i, e := range elem {

•   if e != "" {
  

•       return filepath.Clean(strings.Join(elem[i:], sep))
  

Didn't I do that with Clean(, sep) ?

Not sure what you mean. This line calls filepath.Clean,
but it needs to call a local copy of Clean, which isn't
in this package or this pull request.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/5/files#r7676624
.

[kr]

filepath.Clean doesn't take a separator.
It uses os.PathSeparator directly.

The separator here is for strings.Join.

[davecheney]

Damn. I messed that up

On Fri, Nov 15, 2013 at 10:34 AM, Keith Rarick notifications@github.comwrote:

In filesystem.go:

@@ -33,4 +30,17 @@ func (f *fs) ReadDir(dirname string) ([]os.FileInfo, error) { return ioutil.Read

func (f *fs) Lstat(name string) (os.FileInfo, error) { return os.Lstat(name) }

-func (f *fs) Join(elem ...string) string { return filepath.Join(elem...) }
+func (f *fs) PathSeparator() byte { return os.PathSeparator }
+
+// Join joins any number of path elements into a single path, adding
+// a Separator if necessary. The result is Cleaned, in particular
+// all empty strings are ignored.
+func Join(fs FileSystem, elem ...string) string {

• sep := string(fs.PathSeparator())
• for i, e := range elem {

•   if e != "" {
  

•       return filepath.Clean(strings.Join(elem[i:], sep))
  

filepath.Clean doesn't take a separator.
It uses os.PathSeparator directly.

The separator here is for strings.Join.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/5/files#r7677532
.

[davecheney]

I'd like to drop this.