return file url from a client

LiveUI · May 26, 2018 · d6dff77 · d6dff77
1 parent 1397800
commit d6dff77
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Sources/S3/Extensions/S3+Get.swift b/Sources/S3/Extensions/S3+Get.swift
@@ -12,6 +12,15 @@ import Vapor
 // Helper S3 extension for loading (getting) files by their URL/path
 public extension S3 {
 
+    // MARK: URL
+
+    /// File URL
+    public func url(fileInfo file: LocationConvertible, on container: Container) throws -> URL {
+        let builder = urlBuilder(for: container)
+        let url = try builder.url(file: file)
+        return url
+    }
+
     // MARK: Get
 
     /// Retrieve file data from S3

diff --git a/Sources/S3/Protocols/S3Client.swift b/Sources/S3/Protocols/S3Client.swift
@@ -66,6 +66,9 @@ public protocol S3Client: Service {
     /// Upload file to S3
     func put(string: String, mime: MediaType, destination: String, bucket: String?, access: AccessControlList, on: Container) throws -> Future<File.Response>
 
+    /// File URL
+    func url(fileInfo file: LocationConvertible, on container: Container) throws -> URL
+
     /// Retrieve file data from S3
     func get(fileInfo file: LocationConvertible, on container: Container) throws -> Future<File.Info>
 

diff --git a/Sources/S3/S3.swift b/Sources/S3/S3.swift
@@ -13,7 +13,7 @@ import HTTP
 
 
 /// Main S3 class
-public class S3: S3Client {    
+public class S3: S3Client {
 
     /// Error messages
     public enum Error: Swift.Error {