Skip to content

Commit 4a26a63

Browse files
committed
use normalized path when comparing
1 parent 9bc035c commit 4a26a63

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ require (
1212
go.etcd.io/bbolt v1.3.5
1313
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
1414
golang.org/x/sys v0.0.0-20200727154430-2d971f7391a4 // indirect
15+
golang.org/x/text v0.3.3
1516
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
268268
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
269269
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
270270
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
271+
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
272+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
271273
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
272274
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
273275
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

syncfile.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/putdotio/go-putio"
88
"github.com/putdotio/putio-sync/v2/internal/walker"
9+
"golang.org/x/text/unicode/norm"
910
)
1011

1112
type iLocalFile interface {
@@ -54,6 +55,7 @@ func (f *syncFile) String() string {
5455
func groupFiles(states []stateType, localFiles []*walker.LocalFile, remoteFiles []*walker.RemoteFile) map[string]*syncFile {
5556
m := make(map[string]*syncFile)
5657
initSyncFile := func(relpath string) *syncFile {
58+
relpath = norm.NFC.String(relpath)
5759
sf, ok := m[relpath]
5860
if ok {
5961
return sf

0 commit comments

Comments
 (0)