Clean up, add s3Prefix to downloader

Author: shepazon

swift/example_code/s3-transfer-manager/download-streaming/Package.swift

@@ -2,19 +2,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 //
-// (swift-tools-version has two lines here because it needs to be the first
-// line in the file, but it should also appear in the snippet below)
-//
-// snippet-start:[swift.rds.scenario.package]
-// swift-tools-version: 5.9
-//
 // The swift-tools-version declares the minimum version of Swift required to
 // build this package.
 
 import PackageDescription
 
 let package = Package(
-    name: "getbucket",
+    name: "downloadbucket",
     // Let Xcode know the minimum Apple platforms supported.
     platforms: [
         .macOS(.v13),
@@ -38,7 +32,7 @@ let package = Package(
         // Targets can depend on other targets in this package and products
         // from dependencies.
         .executableTarget(
-            name: "getbucket",
+            name: "downloadbucket",
             dependencies: [
                 .product(name: "AWSS3", package: "aws-sdk-swift"),
                 .product(name: "S3TransferManager", package: "aws-sdk-swift-s3-transfer-manager"),
@@ -48,4 +42,3 @@ let package = Package(
 
     ]
 )
-// snippet-end:[swift.rds.scenario.package]

swift/example_code/s3-transfer-manager/download-streaming/Sources/Example.swift

@@ -13,10 +13,12 @@ import Foundation
 class Example {
     let region: String
     let bucketName: String
+    let s3Prefix: String?
 
-    init(region: String, bucket: String) {
+    init(region: String, bucket: String, s3Prefix: String?) {
         self.region = region
         self.bucketName = bucket
+        self.s3Prefix = s3Prefix
     }
 
     /// The body of the example.
@@ -81,6 +83,7 @@ class Example {
             input: DownloadBucketInput(
                 bucket: bucketName,
                 destination: targetDirectory,
+                s3Prefix: s3Prefix,
                 // The listener for the overall bucket download process.
                 directoryTransferListeners: [downloadBucketStreamingTransferListener],
                 // A factory that creates a listener for each file being downloaded.
@@ -92,15 +95,15 @@ class Example {
                             switch downloadObjectTransferEvent {
                             // The download of a file has begun.
                             case .initiated(let input, _):
-                                print("    Downloading file \(input.key)...")
+                                print("Downloading file \(input.key)...")
 
                             // The number of bytes received so far has been updated.
                             case .bytesTransferred(let input, let snapshot):
                                 print("    Transferred \(snapshot.transferredBytes) total bytes of file \(input.key)...")
 
                             // A file download has completed.
                             case .complete(let input, _, let snapshot):
-                                print("    Finished downloading file \(input.key) (\(snapshot.transferredBytes) bytes).")
+                                print("Finished downloading file \(input.key) (\(snapshot.transferredBytes) bytes).")
                                 objectListener.closeStream()
 
                             // The download of the file has failed.

swift/example_code/s3-transfer-manager/download-streaming/Sources/entry.swift

@@ -9,11 +9,13 @@ struct ExampleCommand: ParsableCommand {
     var region = "us-east-1"
     @Argument(help: "Name of the Amazon S3 bucket to download")
     var bucketName: String
+    @Argument(help: "Prefix to download (allows downloading a subset of the bucket)")
+    var s3Prefix: String?
 
     static var configuration = CommandConfiguration(
-        commandName: "getbucket",
+        commandName: "downloadbucket",
         abstract: """
-        Downloads a bucket from Amazon S3 using the S3 Transfer Manager.
+        Downloads a bucket from Amazon S3 using the S3 Transfer Manager, with progress updates.
         """,
         discussion: """
         """
@@ -22,7 +24,7 @@ struct ExampleCommand: ParsableCommand {
     /// Called by ``main()`` to do the actual running of the AWS
     /// example.
     func runAsync() async throws {
-        let example = Example(region: region, bucket: bucketName)
+        let example = Example(region: region, bucket: bucketName, s3Prefix: s3Prefix)
 
         try await example.run()
     }

swift/example_code/s3-transfer-manager/upload-file/Package.swift

@@ -5,7 +5,7 @@
 // (swift-tools-version has two lines here because it needs to be the first
 // line in the file, but it should also appear in the snippet below)
 //
-// snippet-start:[swift.rds.scenario.package]
+// snippet-start:[swift.s3tm.scenario.package]
 // swift-tools-version: 5.9
 //
 // The swift-tools-version declares the minimum version of Swift required to
@@ -48,4 +48,4 @@ let package = Package(
 
     ]
 )
-// snippet-end:[swift.rds.scenario.package]
+// snippet-end:[swift.s3tm.scenario.package]