From a4138526277f4e1dbed5603673cd00fb8017685d Mon Sep 17 00:00:00 2001 From: JanHoefelmeyer Date: Mon, 20 Nov 2023 11:05:57 +0100 Subject: [PATCH 1/2] Downloader: Only add tlp label to path if no custom directory is configured. Refactor accordingly --- cmd/csaf_downloader/downloader.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/csaf_downloader/downloader.go b/cmd/csaf_downloader/downloader.go index d40f31b..933f2a2 100644 --- a/cmd/csaf_downloader/downloader.go +++ b/cmd/csaf_downloader/downloader.go @@ -631,16 +631,16 @@ nextAdvisory: // Advisories that failed validation are store in a special folder. var newDir string if valStatus != validValidationStatus { - newDir = path.Join(d.cfg.Directory, failedValidationDir, lower) + newDir = path.Join(d.cfg.Directory, failedValidationDir) } else { - newDir = path.Join(d.cfg.Directory, lower) + newDir = d.cfg.Directory } // Do we have a configured destination folder? if d.cfg.Folder != "" { newDir = path.Join(newDir, d.cfg.Folder) } else { - newDir = path.Join(newDir, strconv.Itoa(initialReleaseDate.Year())) + newDir = path.Join(newDir, lower, strconv.Itoa(initialReleaseDate.Year())) } if newDir != lastDir { From 6f8870154c38e00e261d1e8441156f92e0e247e2 Mon Sep 17 00:00:00 2001 From: "Sascha L. Teichmann" Date: Mon, 20 Nov 2023 21:13:24 +0100 Subject: [PATCH 2/2] Break overly long line. Fix typo in comment. --- cmd/csaf_downloader/downloader.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/csaf_downloader/downloader.go b/cmd/csaf_downloader/downloader.go index 933f2a2..1799a84 100644 --- a/cmd/csaf_downloader/downloader.go +++ b/cmd/csaf_downloader/downloader.go @@ -621,14 +621,16 @@ nextAdvisory: continue } - if err := d.eval.Extract(`$.document.tracking.initial_release_date`, dateExtract, false, doc); err != nil { + if err := d.eval.Extract( + `$.document.tracking.initial_release_date`, dateExtract, false, doc, + ); err != nil { slog.Warn("Cannot extract initial_release_date from advisory", "url", file.URL()) initialReleaseDate = time.Now() } initialReleaseDate = initialReleaseDate.UTC() - // Advisories that failed validation are store in a special folder. + // Advisories that failed validation are stored in a special folder. var newDir string if valStatus != validValidationStatus { newDir = path.Join(d.cfg.Directory, failedValidationDir)