aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuard/UI/TunnelImporter.swift
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2019-02-25 16:22:52 +0530
committerRoopesh Chander <roop@roopc.net>2019-02-25 18:43:20 +0530
commita389bd93cb6dd068c06ada10905d8fcf3ac65a84 (patch)
tree77050c44f2e4c319083bcd162cd3d64e4f9bf22e /WireGuard/WireGuard/UI/TunnelImporter.swift
parentImporting: Use case-insensitive comparison for zip extension (diff)
downloadwireguard-apple-a389bd93cb6dd068c06ada10905d8fcf3ac65a84.tar.xz
wireguard-apple-a389bd93cb6dd068c06ada10905d8fcf3ac65a84.zip
Importing: macOS: Support importing of multiple files at a time
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to 'WireGuard/WireGuard/UI/TunnelImporter.swift')
-rw-r--r--WireGuard/WireGuard/UI/TunnelImporter.swift40
1 files changed, 39 insertions, 1 deletions
diff --git a/WireGuard/WireGuard/UI/TunnelImporter.swift b/WireGuard/WireGuard/UI/TunnelImporter.swift
index 7625761a..e51c70d6 100644
--- a/WireGuard/WireGuard/UI/TunnelImporter.swift
+++ b/WireGuard/WireGuard/UI/TunnelImporter.swift
@@ -4,7 +4,45 @@
import Foundation
class TunnelImporter {
- static func importFromFile(url: URL, into tunnelsManager: TunnelsManager, sourceVC: AnyObject?, errorPresenterType: ErrorPresenterProtocol.Type, completionHandler: (() -> Void)? = nil) {
+ static func importFromFile(urls: [URL], into tunnelsManager: TunnelsManager, sourceVC: AnyObject?, errorPresenterType: ErrorPresenterProtocol.Type, completionHandler: (() -> Void)? = nil) {
+ guard !urls.isEmpty else {
+ completionHandler?()
+ return
+ }
+ if urls.count > 1 {
+ let dispatchGroup = DispatchGroup()
+ var configs = [TunnelConfiguration?]()
+ for url in urls {
+ if url.pathExtension.lowercased() == "zip" {
+ dispatchGroup.enter()
+ ZipImporter.importConfigFiles(from: url) { result in
+ if let configsInZip = result.value {
+ configs.append(contentsOf: configsInZip)
+ }
+ dispatchGroup.leave()
+ }
+ } else {
+ let fileBaseName = url.deletingPathExtension().lastPathComponent.trimmingCharacters(in: .whitespacesAndNewlines)
+ let fileContents = try? String(contentsOf: url)
+ let tunnelConfiguration = try? TunnelConfiguration(fromWgQuickConfig: fileContents ?? "", called: fileBaseName)
+ configs.append(tunnelConfiguration)
+ }
+ }
+ dispatchGroup.notify(queue: .main) {
+ tunnelsManager.addMultiple(tunnelConfigurations: configs.compactMap { $0 }) { numberSuccessful in
+ if numberSuccessful == configs.count {
+ completionHandler?()
+ return
+ }
+ let title = tr(format: "alertImportedFromMultipleFilesTitle (%d)", numberSuccessful)
+ let message = tr(format: "alertImportedFromMultipleFilesMessage (%1$d of %2$d)", numberSuccessful, configs.count)
+ errorPresenterType.showErrorAlert(title: title, message: message, from: sourceVC, onPresented: completionHandler)
+ }
+ }
+ return
+ }
+ assert(urls.count == 1)
+ let url = urls.first!
if url.pathExtension.lowercased() == "zip" {
ZipImporter.importConfigFiles(from: url) { result in
if let error = result.error {