From a5439fd30f79eff9624cb4356dddf15ec0361211 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 15:54:57 -0800 Subject: [PATCH 01/11] remove 'Windows' duplicate --- Duplicati/Library/Utility/FilterGroups.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index 62be51008..aefb25c36 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -351,7 +351,6 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"?:/autoexec.bat"); yield return FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.System); yield return FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.SystemX86); - yield return FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.Windows); yield return FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.Recent); var windir = FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.Windows); From dd7cc60e46e639b24464658529d3c08e9df854b1 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 15:57:14 -0800 Subject: [PATCH 02/11] move '$Recycle.bin' to SystemFiles filter for consistency --- Duplicati/Library/Utility/FilterGroups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index aefb25c36..dcdbf8b4b 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -324,6 +324,7 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"*/Microsoft*/Windows/Cookies*"); yield return FilterGroups.CreateWildcardFilter(@"*/MSOCache*"); yield return FilterGroups.CreateWildcardFilter(@"*/NTUSER*"); + yield return FilterGroups.CreateWildcardFilter(@"*/$RECYCLE.BIN/"); yield return FilterGroups.CreateWildcardFilter(@"*/RECYCLER/"); yield return FilterGroups.CreateWildcardFilter(@"*UsrClass.dat*"); yield return FilterGroups.CreateWildcardFilter(@"?:/hiberfil.sys"); @@ -396,7 +397,6 @@ namespace Duplicati.Library.Utility if (group.HasFlag(FilterGroup.TemporaryFiles)) { - yield return FilterGroups.CreateWildcardFilter(@"*/$RECYCLE.BIN/"); yield return FilterGroups.CreateWildcardFilter(@"*.tmp"); yield return FilterGroups.CreateWildcardFilter(@"*.tmp/"); yield return FilterGroups.CreateWildcardFilter(@"*/AppData/Local/Temp*"); From 9b51773e6f72b0272321a6d4bdf69d53859fd87f Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 15:59:43 -0800 Subject: [PATCH 03/11] add recycle bin, change all to be off root of drive --- Duplicati/Library/Utility/FilterGroups.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index dcdbf8b4b..97089b840 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -324,12 +324,13 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"*/Microsoft*/Windows/Cookies*"); yield return FilterGroups.CreateWildcardFilter(@"*/MSOCache*"); yield return FilterGroups.CreateWildcardFilter(@"*/NTUSER*"); - yield return FilterGroups.CreateWildcardFilter(@"*/$RECYCLE.BIN/"); - yield return FilterGroups.CreateWildcardFilter(@"*/RECYCLER/"); yield return FilterGroups.CreateWildcardFilter(@"*UsrClass.dat*"); yield return FilterGroups.CreateWildcardFilter(@"?:/hiberfil.sys"); yield return FilterGroups.CreateWildcardFilter(@"?:/pagefile.sys"); yield return FilterGroups.CreateWildcardFilter(@"?:/swapfile.sys"); + yield return FilterGroups.CreateWildcardFilter(@"?:/$RECYCLE.BIN/"); + yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLED/"); + yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLER/"); yield return FilterGroups.CreateWildcardFilter(@"?:/System Volume Information/"); yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Installer*"); yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Temp*"); From 54820bc1927c3c554dd7088f7fe9de564cac49a4 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:02:57 -0800 Subject: [PATCH 04/11] remove duplicate 'ntuser' line --- Duplicati/Library/Utility/FilterGroups.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index 97089b840..9299e4a38 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -334,7 +334,6 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"?:/System Volume Information/"); yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Installer*"); yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Temp*"); - yield return FilterGroups.CreateWildcardFilter(@"*/ntuser.dat*"); foreach (var s in GetWindowsRegistryFilters() ?? new string[0]) { From e15b3a927891b257e3bcf7955ed26057ceff614b Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:05:53 -0800 Subject: [PATCH 05/11] add slash to 'usrclass' --- Duplicati/Library/Utility/FilterGroups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index 9299e4a38..fe5bada8c 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -324,7 +324,7 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"*/Microsoft*/Windows/Cookies*"); yield return FilterGroups.CreateWildcardFilter(@"*/MSOCache*"); yield return FilterGroups.CreateWildcardFilter(@"*/NTUSER*"); - yield return FilterGroups.CreateWildcardFilter(@"*UsrClass.dat*"); + yield return FilterGroups.CreateWildcardFilter(@"*/UsrClass.dat"); yield return FilterGroups.CreateWildcardFilter(@"?:/hiberfil.sys"); yield return FilterGroups.CreateWildcardFilter(@"?:/pagefile.sys"); yield return FilterGroups.CreateWildcardFilter(@"?:/swapfile.sys"); From 7e9eb58cdda7ef90a7c63904d2f29619caa96b2a Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:18:42 -0800 Subject: [PATCH 06/11] remove Temp from SystemFiles --- Duplicati/Library/Utility/FilterGroups.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index fe5bada8c..5cbfcd4ec 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -333,7 +333,6 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLER/"); yield return FilterGroups.CreateWildcardFilter(@"?:/System Volume Information/"); yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Installer*"); - yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Temp*"); foreach (var s in GetWindowsRegistryFilters() ?? new string[0]) { From 9cabdc51d068de042273598d430ff2862b87a122 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:25:22 -0800 Subject: [PATCH 07/11] Improve Windows Install filter --- Duplicati/Library/Utility/FilterGroups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index 5cbfcd4ec..52ef9f3cb 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -332,7 +332,7 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLED/"); yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLER/"); yield return FilterGroups.CreateWildcardFilter(@"?:/System Volume Information/"); - yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Installer*"); + yield return FilterGroups.CreateWildcardFilter(FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.Windows) + "Installer/"); foreach (var s in GetWindowsRegistryFilters() ?? new string[0]) { From 559ab450a4f39e81b3c9f092c5600eb280d7c5c3 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:40:10 -0800 Subject: [PATCH 08/11] Improve Windows Temp filter --- Duplicati/Library/Utility/FilterGroups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index 52ef9f3cb..f1e2dd96d 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -401,7 +401,7 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"*/AppData/Local/Temp*"); yield return FilterGroups.CreateWildcardFilter(@"*/AppData/Temp*"); yield return FilterGroups.CreateWildcardFilter(@"*/Local Settings/Temp*"); - yield return FilterGroups.CreateWildcardFilter(@"?:/Windows/Temp*"); + yield return FilterGroups.CreateWildcardFilter(FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.Windows) + "Temp/"); } if (group.HasFlag(FilterGroup.Applications)) From e55d555558412ceecef12f90f674aa916826e383 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:43:04 -0800 Subject: [PATCH 09/11] Change case of recycle bins --- Duplicati/Library/Utility/FilterGroups.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index f1e2dd96d..554c16ef9 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -328,9 +328,9 @@ namespace Duplicati.Library.Utility yield return FilterGroups.CreateWildcardFilter(@"?:/hiberfil.sys"); yield return FilterGroups.CreateWildcardFilter(@"?:/pagefile.sys"); yield return FilterGroups.CreateWildcardFilter(@"?:/swapfile.sys"); - yield return FilterGroups.CreateWildcardFilter(@"?:/$RECYCLE.BIN/"); - yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLED/"); - yield return FilterGroups.CreateWildcardFilter(@"?:/RECYCLER/"); + yield return FilterGroups.CreateWildcardFilter(@"?:/$Recycle.Bin/"); + yield return FilterGroups.CreateWildcardFilter(@"?:/Recycled/"); + yield return FilterGroups.CreateWildcardFilter(@"?:/Recycler/"); yield return FilterGroups.CreateWildcardFilter(@"?:/System Volume Information/"); yield return FilterGroups.CreateWildcardFilter(FilterGroups.CreateSpecialFolderFilter(Environment.SpecialFolder.Windows) + "Installer/"); From c50d07ec401a1b00aaa415d5b9f042337153dc47 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:49:40 -0800 Subject: [PATCH 10/11] fix typo --- Duplicati/Library/Utility/FilterGroups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index 554c16ef9..c8c67dc25 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -582,7 +582,7 @@ namespace Duplicati.Library.Utility // Duplicati matches filters against folder paths exactly. // Meaning a filter for 'C:\Windows' won't match 'C:\Windows\'. - // So this makes sure special folder's filter's have a trailing directory separator. + // So this makes sure special folder's filters have a trailing directory separator. // (Alternatively, this could append '*' to all folder filters.) return Common.IO.Util.AppendDirSeparator(filter); } From f4321ea11512352d4e0e18cf25d710b4f507f444 Mon Sep 17 00:00:00 2001 From: drwtsn32x Date: Wed, 1 Jan 2020 16:50:34 -0800 Subject: [PATCH 11/11] fix typo --- Duplicati/Library/Utility/FilterGroups.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index c8c67dc25..a188b1af4 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -582,7 +582,7 @@ namespace Duplicati.Library.Utility // Duplicati matches filters against folder paths exactly. // Meaning a filter for 'C:\Windows' won't match 'C:\Windows\'. - // So this makes sure special folder's filters have a trailing directory separator. + // So this makes sure special folder filters have a trailing directory separator. // (Alternatively, this could append '*' to all folder filters.) return Common.IO.Util.AppendDirSeparator(filter); }