fixup

Author: tomerd

Sources/Workspace/Workspace.swift

@@ -1575,76 +1575,73 @@ extension Workspace {
         let result = ThreadSafeArrayStore<ManagedArtifact>()
 
         var authProvider: AuthorizationProviding? = nil
-        var didDownloadAnyArtifact = false
+        // Netrc feature currently only supported on macOS
         #if os(macOS)
-        // Netrc feature currently only supported on macOS 10.13+ due to dependency
-        // on NSTextCheckingResult.range(with:)
-        if #available(macOS 10.13, *) {
-            authProvider = try? Netrc.load(fromFileAtPath: netrcFilePath).get()
-        }
+        authProvider = try? Netrc.load(fromFileAtPath: netrcFilePath).get()
         #endif
 
         // zip files to download
         // stored in a thread-safe way as we may fetch more from "ari" files
         let zipArtifacts = ThreadSafeArrayStore<RemoteArtifact>(artifacts.filter { $0.url.pathExtension.lowercased() == "zip" })
 
         // fetch and parse "ari" files, if any
-        let hostToolchain = try UserToolchain(destination: .hostDestination())
-        let jsonDecoder = JSONDecoder.makeWithDefaults()
         let indexFiles = artifacts.filter { $0.url.pathExtension.lowercased() == "ari" }
-        for indexFile in indexFiles {
-            group.enter()
-            var request = HTTPClient.Request(method: .get, url: indexFile.url)
-            request.options.validResponseCodes = [200]
-            request.options.authorizationProvider = authProvider?.authorization(for:)
-            self.httpClient.execute(request) { result in
-                defer { group.leave() }
+        if !indexFiles.isEmpty {
+            let hostToolchain = try UserToolchain(destination: .hostDestination())
+            let jsonDecoder = JSONDecoder.makeWithDefaults()
+            for indexFile in indexFiles {
+                group.enter()
+                var request = HTTPClient.Request(method: .get, url: indexFile.url)
+                request.options.validResponseCodes = [200]
+                request.options.authorizationProvider = authProvider?.authorization(for:)
+                self.httpClient.execute(request) { result in
+                    defer { group.leave() }
 
-                do {
-                    switch result {
-                    case .failure(let error):
-                        throw error
-                    case .success(let response):
-                        guard let body = response.body else {
-                            throw StringError("Body is empty")
-                        }
-                        // FIXME: would be nice if checksumAlgorithm.hash took Data directly
-                        let bodyChecksum = self.checksumAlgorithm.hash(ByteString(body)).hexadecimalRepresentation
-                        guard bodyChecksum == indexFile.checksum else {
-                            throw StringError("checksum of downloaded artifact of binary target '\(indexFile.targetName)' (\(bodyChecksum)) does not match checksum specified by the manifest (\(indexFile.checksum ))")
-                        }
-                        let metadata = try jsonDecoder.decode(ArchiveIndexFile.self, from: body)
-                        // FIXME: this filter needs to become more sophisticated
-                        guard let supportedArchive = metadata.archives.first(where: { $0.fileName.lowercased().hasSuffix(".zip") && $0.supportedTriples.contains(hostToolchain.triple) }) else {
-                            throw StringError("No supported archive was found for '\(hostToolchain.triple.tripleString)'")
+                    do {
+                        switch result {
+                        case .failure(let error):
+                            throw error
+                        case .success(let response):
+                            guard let body = response.body else {
+                                throw StringError("Body is empty")
+                            }
+                            // FIXME: would be nice if checksumAlgorithm.hash took Data directly
+                            let bodyChecksum = self.checksumAlgorithm.hash(ByteString(body)).hexadecimalRepresentation
+                            guard bodyChecksum == indexFile.checksum else {
+                                throw StringError("checksum of downloaded artifact of binary target '\(indexFile.targetName)' (\(bodyChecksum)) does not match checksum specified by the manifest (\(indexFile.checksum ))")
+                            }
+                            let metadata = try jsonDecoder.decode(ArchiveIndexFile.self, from: body)
+                            // FIXME: this filter needs to become more sophisticated
+                            guard let supportedArchive = metadata.archives.first(where: { $0.fileName.lowercased().hasSuffix(".zip") && $0.supportedTriples.contains(hostToolchain.triple) }) else {
+                                throw StringError("No supported archive was found for '\(hostToolchain.triple.tripleString)'")
+                            }
+                            // add relevant archive
+                            zipArtifacts.append(
+                                RemoteArtifact(
+                                    packageRef: indexFile.packageRef,
+                                    targetName: indexFile.targetName,
+                                    url: indexFile.url.deletingLastPathComponent().appendingPathComponent(supportedArchive.fileName),
+                                    checksum: supportedArchive.checksum)
+                            )
                         }
-                        // add relevant archive
-                        zipArtifacts.append(
-                            RemoteArtifact(
-                                packageRef: indexFile.packageRef,
-                                targetName: indexFile.targetName,
-                                url: indexFile.url.deletingLastPathComponent().appendingPathComponent(supportedArchive.fileName),
-                                checksum: supportedArchive.checksum)
-                        )
+                    } catch {
+                        tempDiagnostics.emit(.error("failed retrieving '\(indexFile.url)': \(error)"))
                     }
-                } catch {
-                    tempDiagnostics.emit(.error("failed retrieving '\(indexFile.url)': \(error)"))
                 }
             }
-        }
 
-        // wait for all "ari" files to be processed
-        group.wait()
+            // wait for all "ari" files to be processed
+            group.wait()
 
-        // no reason to continue if we already ran into issues
-        if tempDiagnostics.hasErrors {
-            // collect all diagnostics
-            diagnostics.append(contentsOf: tempDiagnostics)
-            throw Diagnostics.fatalError
+            // no reason to continue if we already ran into issues
+            if tempDiagnostics.hasErrors {
+                // collect all diagnostics
+                diagnostics.append(contentsOf: tempDiagnostics)
+                throw Diagnostics.fatalError
+            }
         }
 
         // finally download zip files, if any
-        didDownloadAnyArtifact = zipArtifacts.count > 0
         for artifact in (zipArtifacts.map{ $0 }) {
             group.enter()
             defer { group.leave() }
@@ -1724,7 +1721,7 @@ extension Workspace {
 
         group.wait()
 
-        if didDownloadAnyArtifact {
+        if zipArtifacts.count > 0 {
             delegate?.didDownloadBinaryArtifacts()
         }