From e1fa39008dc95dea42ce40d7b6170c4e7ee1f66b Mon Sep 17 00:00:00 2001 From: a-s-z-home Date: Mon, 5 Nov 2018 00:59:39 +0100 Subject: [PATCH] Use new filter processing function for restore command. - You can now include a filter file by using "@". --- duplicacy/duplicacy_main.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/duplicacy/duplicacy_main.go b/duplicacy/duplicacy_main.go index ca0c4a4..8c0cb0e 100644 --- a/duplicacy/duplicacy_main.go +++ b/duplicacy/duplicacy_main.go @@ -784,27 +784,17 @@ func restoreRepository(context *cli.Context) { pattern = pattern[1:] } - if duplicacy.IsUnspecifiedFilter(pattern) { - pattern = "+" + pattern - } - - if duplicacy.IsEmptyFilter(pattern) { - continue - } - - if strings.HasPrefix(pattern, "i:") || strings.HasPrefix(pattern, "e:") { - valid, err := duplicacy.IsValidRegex(pattern[2:]) - if !valid || err != nil { - duplicacy.LOG_ERROR("SNAPSHOT_FILTER", "Invalid regular expression encountered for filter: \"%s\", error: %v", pattern, err) - } - } - patterns = append(patterns, pattern) + + } + patterns = duplicacy.ProcessFilterLines(patterns, make([]string, 0)) duplicacy.LOG_DEBUG("REGEX_DEBUG", "There are %d compiled regular expressions stored", len(duplicacy.RegexMap)) + duplicacy.LOG_INFO("SNAPSHOT_FILTER", "Loaded %d include/exclude pattern(s)", len(patterns)) + storage.SetRateLimits(context.Int("limit-rate"), 0) backupManager := duplicacy.CreateBackupManager(preference.SnapshotID, storage, repository, password, preference.NobackupFile) duplicacy.SavePassword(*preference, "password", password)