lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply goimports

Browse Source
This commit is contained in:
Christian Buehlmann 2018-06-13 16:56:46 +02:00
parent 00de87a544
commit 29991a37b2
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fs/fs.go
View File

@ -1,15 +1,15 @@
package fs
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"regexp"
"strconv"
"strings"
"sync"
"bytes"
"strconv"
"github.com/git-lfs/git-lfs/tools"
)
@ -65,37 +65,38 @@ func (f *Filesystem) ObjectPathname(oid string) string {
return filepath.Join(f.localObjectDir(oid), oid)
}
func (f *Filesystem) DecodePathname(path string) string {
return string(DecodePathBytes([]byte(path)))
func (f *Filesystem) DecodePathname(path string) string {
return string(DecodePathBytes([]byte(path)))
}
/**
* Revert non ascii chracters escaped by git or windows (as octal sequences \000) back to bytes.
*/
func DecodePathBytes(path []byte) ([]byte) {
func DecodePathBytes(path []byte) []byte {
var expression = regexp.MustCompile(`\\[0-9]{3}`)
var buffer bytes.Buffer
// strip quotes if any
if (len(path) > 2 && path[0] == '"' && path[len(path) - 1] == '"') {
path = path[1:len(path)-1]
if len(path) > 2 && path[0] == '"' && path[len(path)-1] == '"' {
path = path[1 : len(path)-1]
}
base := 0
for _, submatches := range expression.FindAllSubmatchIndex(path, -1) {
buffer.Write(path[ base : submatches[0]])
match := string(path[ submatches[0] + 1 : submatches[0] + 4 ])
for _, submatches := range expression.FindAllSubmatchIndex(path, -1) {
buffer.Write(path[base:submatches[0]])
match := string(path[submatches[0]+1 : submatches[0]+4])
k, err := strconv.ParseUint(match, 8, 64)
if err != nil { return path } // abort on error
if err != nil {
return path
} // abort on error
buffer.Write([]byte{ byte(k)})
buffer.Write([]byte{byte(k)})
base = submatches[1]
}
buffer.Write(path[ base : len(path) ])
}
buffer.Write(path[base:len(path)])
return buffer.Bytes()
}

20
fs/fs_test.go
View File

@ -3,24 +3,24 @@ package fs
import "testing"
func TestDecodeNone(t *testing.T) {
evaluate(t, "A:\\some\\regular\\windows\\path", "A:\\some\\regular\\windows\\path")
evaluate(t, "A:\\some\\regular\\windows\\path", "A:\\some\\regular\\windows\\path")
}
func TestDecodeSingle(t *testing.T) {
evaluate(t, "A:\\bl\\303\\204\\file.txt", "A:\\blÄ\\file.txt")
evaluate(t, "A:\\bl\\303\\204\\file.txt", "A:\\blÄ\\file.txt")
}
func TestDecodeMultiple(t *testing.T) {
evaluate(t, "A:\\fo\\130\\file\\303\\261.txt", "A:\\fo\130\\file\303\261.txt")
evaluate(t, "A:\\fo\\130\\file\\303\\261.txt", "A:\\fo\130\\file\303\261.txt")
}
func evaluate(t *testing.T, input string, expected string) {
fs := Filesystem {}
fs := Filesystem{}
output := fs.DecodePathname(input)
if output != expected {
t.Errorf("Expecting same path, got: %s, want: %s.", output, expected)
}
}
t.Errorf("Expecting same path, got: %s, want: %s.", output, expected)
}
}