From bb29a234f4583ee7d67700562d19dcac815ecefe Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Thu, 15 Jun 2023 11:19:33 +0800 Subject: [PATCH] chore: update dfget recursive log (#2459) Signed-off-by: Jim Ma --- client/dfget/dfget.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/client/dfget/dfget.go b/client/dfget/dfget.go index 1bcf5346f..4236c96ac 100644 --- a/client/dfget/dfget.go +++ b/client/dfget/dfget.go @@ -356,22 +356,24 @@ func recursiveDownload(ctx context.Context, client dfdaemonclient.V1, cfg *confi continue } - logger.Infof("download %s to %s", childCfg.URL, childCfg.Output) - if !urlEntry.IsDir { - if childCfg.RecursiveList { - continue - } - childCfg.Recursive = false - // validate new dfget config - if err = childCfg.Validate(); err != nil { - logger.Errorf("validate failed: %s", err) - return err - } - if err := singleDownload(ctx, client, &childCfg, logger.With("url", childCfg.URL)); err != nil { - return err - } - } else { + if urlEntry.IsDir { + logger.Infof("download directory %s to %s", childCfg.URL, childCfg.Output) queue.PushBack(&childCfg) + continue + } + + if childCfg.RecursiveList { + continue + } + childCfg.Recursive = false + // validate new dfget config + if err = childCfg.Validate(); err != nil { + logger.Errorf("validate failed: %s", err) + return err + } + logger.Infof("download file %s to %s", childCfg.URL, childCfg.Output) + if err = singleDownload(ctx, client, &childCfg, logger.With("url", childCfg.URL)); err != nil { + return err } } }