From 9dd6f848bdcd3550606158a33d6aa98de6ea0cdc Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Thu, 9 Jul 2015 22:38:21 +0100 Subject: [PATCH] Name the folder in error messages --- nativemodel_windows.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nativemodel_windows.go b/nativemodel_windows.go index 072e1278..f1a24898 100644 --- a/nativemodel_windows.go +++ b/nativemodel_windows.go @@ -25,12 +25,12 @@ type nativeModel struct { } func (m nativeModel) Index(deviceID DeviceID, folder string, files []FileInfo, flags uint32, options []Option) { - fixupFiles(files) + fixupFiles(folder, files) m.next.Index(deviceID, folder, files, flags, options) } func (m nativeModel) IndexUpdate(deviceID DeviceID, folder string, files []FileInfo, flags uint32, options []Option) { - fixupFiles(files) + fixupFiles(folder, files) m.next.IndexUpdate(deviceID, folder, files, flags, options) } @@ -47,7 +47,7 @@ func (m nativeModel) Close(deviceID DeviceID, err error) { m.next.Close(deviceID, err) } -func fixupFiles(files []FileInfo) { +func fixupFiles(folder string, files []FileInfo) { for i, f := range files { if strings.ContainsAny(f.Name, disallowedCharacters) { if f.IsDeleted() { @@ -56,7 +56,7 @@ func fixupFiles(files []FileInfo) { continue } files[i].Flags |= FlagInvalid - l.Warnf("File name %q contains invalid characters; marked as invalid.", f.Name) + l.Warnf("File name %q (folder %q) contains invalid characters; marked as invalid.", f.Name, folder) } files[i].Name = filepath.FromSlash(files[i].Name) }