removed unnecessary flags from ddl cmd, renamed cmd

Author: reshmifrog

artifactory/cli/cli.go

@@ -104,9 +104,9 @@ func GetCommands() []components.Command {
 			Category:    filesCategory,
 		},
 		{
-			Name:        "native-download",
-			Flags:       flagkit.GetCommandFlags(flagkit.NativeDownload),
-			Aliases:     []string{"ndl"},
+			Name:        "direct-download",
+			Flags:       flagkit.GetCommandFlags(flagkit.DirectDownload),
+			Aliases:     []string{"ddl"},
 			Description: directdownload.GetDescription(),
 			Arguments:   directdownload.GetArguments(),
 			Action:      directDownloadCmd,
@@ -738,28 +738,7 @@ func createDirectDownloadSpec(c *components.Context) (*spec.SpecFiles, error) {
 		BuildSpec(), nil
 }
 
-func validateDirectDownloadFlags(c *components.Context) error {
-	incompatibleFlags := []string{
-		"sort-by", "sort-order", "limit", "offset",
-		"props", "exclude-props", "archive-entries",
-		"bundle", "gpg-key", "include-dirs",
-		"bypass-archive-inspection", "validate-symlinks",
-	}
-
-	for _, flag := range incompatibleFlags {
-		if c.IsFlagSet(flag) {
-			return errorutils.CheckErrorf("The --%s flag is not supported with native download", flag)
-		}
-	}
-
-	return nil
-}
-
 func directDownloadCmd(c *components.Context) error {
-	if err := validateDirectDownloadFlags(c); err != nil {
-		return err
-	}
-
 	downloadSpec, err := prepareDirectDownloadCommand(c)
 	if err != nil {
 		return err

artifactory/commands/generic/directdownload.go

@@ -46,7 +46,13 @@ func (ddc *DirectDownloadCommand) Run() error {
 }
 
 func (ddc *DirectDownloadCommand) directDownload() error {
-	servicesManager, err := utils.CreateServiceManager(ddc.serverDetails, -1, 0, ddc.DryRun())
+	// Use the threads configuration from the download command
+	threads := 3 // Default threads
+	if ddc.configuration != nil && ddc.configuration.Threads > 0 {
+		threads = ddc.configuration.Threads
+	}
+
+	servicesManager, err := utils.CreateServiceManager(ddc.serverDetails, threads, 0, ddc.DryRun())
 	if err != nil {
 		return err
 	}
@@ -77,16 +83,23 @@ func (ddc *DirectDownloadCommand) directDownload() error {
 		downloadParams.SetSyncDeletesPath(ddc.SyncDeletesPath())
 		downloadParams.SetQuiet(ddc.quiet)
 
+		// Set split download parameters from configuration
+		if ddc.configuration != nil {
+			downloadParams.MinSplitSizeMB = ddc.configuration.MinSplitSize / 1024 // Convert KB to MB
+			downloadParams.SplitCount = ddc.configuration.SplitCount
+		}
+
 		downloadParamsArray = append(downloadParamsArray, *downloadParams)
 	}
 
 	var summary *serviceutils.OperationSummary
 	// We need the detailed summary when either showing detailed output or performing sync-deletes
+	// (sync-deletes needs the file list to know what to keep)
 	if ddc.DetailedSummary() || ddc.SyncDeletesPath() != "" {
-		summary, err = servicesManager.DownloadFilesWithoutAQLWithSummary(downloadParamsArray...)
+		summary, err = servicesManager.DirectDownloadFilesWithSummary(downloadParamsArray...)
 	} else {
 		var totalDownloaded, totalFailed int
-		totalDownloaded, totalFailed, err = servicesManager.DownloadFilesWithoutAQL(downloadParamsArray...)
+		totalDownloaded, totalFailed, err = servicesManager.DirectDownloadFiles(downloadParamsArray...)
 		summary = &serviceutils.OperationSummary{
 			TotalSucceeded: totalDownloaded,
 			TotalFailed:    totalFailed,
@@ -114,6 +127,8 @@ func (ddc *DirectDownloadCommand) directDownload() error {
 }
 
 // handleSyncDeletes removes local files that weren't part of the current download operation.
+// It creates a temporary directory structure mirroring downloaded files, then walks the target
+// directory to identify and delete files that don't exist in the download set.
 func (ddc *DirectDownloadCommand) handleSyncDeletes(reader *content.ContentReader) error {
 	reader.Reset()
 

cliutils/flagkit/flags.go

@@ -29,7 +29,7 @@ const (
 	// Artifactory's Commands Keys
 	Upload                 = "upload"
 	Download               = "download"
-	NativeDownload         = "native-download"
+	DirectDownload         = "direct-download"
 	Move                   = "move"
 	Copy                   = "copy"
 	Delete                 = "delete"
@@ -553,13 +553,13 @@ var commandFlags = map[string][]string{
 		downloadProps, downloadExcludeProps, failNoOp, threads, archiveEntries, downloadSyncDeletes, syncDeletesQuiet, InsecureTls, detailedSummary, Project,
 		skipChecksum,
 	},
-	NativeDownload: {
+	DirectDownload: {
 		url, user, password, accessToken, sshPassphrase, sshKeyPath, serverId, ClientCertPath,
 		ClientCertKeyPath, specFlag, specVars, BuildName, BuildNumber, module, exclusions,
 		downloadRecursive, downloadFlat, build, includeDeps, excludeArtifacts, downloadMinSplit, downloadSplitCount,
 		retries, retryWaitTime, dryRun, downloadExplode, threads, downloadSyncDeletes, syncDeletesQuiet, skipChecksum, failNoOp, detailedSummary, Project,
-		sortBy, sortOrder, limit, offset, downloadProps, downloadExcludeProps, archiveEntries,
-		bundle, publicGpgKey, includeDirs, bypassArchiveInspection, validateSymlinks,
+		downloadProps, downloadExcludeProps, archiveEntries, bundle, publicGpgKey, includeDirs, bypassArchiveInspection, validateSymlinks,
+		InsecureTls,
 	},
 	Move: {
 		url, user, password, accessToken, sshPassphrase, sshKeyPath, serverId, ClientCertPath,