Remove extraneous lines

Example/SwiftLinkPreviewExample/AlamofireSource.swift

@@ -11,14 +11,14 @@ import AlamofireImage
 import ImageSlideshow
 
 public class AlamofireSource: NSObject, InputSource {
-    
+
     var url: NSURL?
-    
+
     public init(url: NSURL) {
         self.url = url
         super.init()
     }
-    
+
     public init?(urlString: String) {
         if let validUrl = NSURL(string: urlString) {
             self.url = validUrl
@@ -28,20 +28,20 @@ public class AlamofireSource: NSObject, InputSource {
             return nil
         }
     }
-    
+
     public func load(to imageView: UIImageView, with callback: @escaping (UIImage?) -> Void) {
 
         guard let url = self.url as URL? else { return }
         imageView.af_setImage(withURL: url,
                               placeholderImage: nil,
                               filter: nil,
                               progress: nil) { (response) in
-            
+
             imageView.image = response.result.value
-            
+
             if let value = response.result.value { callback(value) }
-            
+
         }
     }
-    
+
 }

Example/SwiftLinkPreviewExample/Delegates/AppDelegate.swift

@@ -10,37 +10,34 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-    
+
     var window: UIWindow?
-
-
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
-    
+
     func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
     }
-    
+
     func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
-    
+
     func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
     }
-    
+
     func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
-    
+
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
-
-}
 
+}

Package.swift

@@ -10,4 +10,4 @@ import PackageDescription
 
 let package = Package(
     name: "SwiftLinkPreview"
-)
+)

Sources/Cache.swift

@@ -9,44 +9,43 @@
 import Foundation
 
 public protocol Cache {
-    
+
     func slp_getCachedResponse(url: String) -> SwiftLinkPreview.Response?
-    
+
     func slp_setCachedResponse(url: String, response: SwiftLinkPreview.Response?)
 }
 
 public class DisabledCache: Cache {
-    
+
     public static let instance = DisabledCache()
-    
+
     public func slp_getCachedResponse(url: String) -> SwiftLinkPreview.Response? { return nil; }
-    
+
     public func slp_setCachedResponse(url: String, response: SwiftLinkPreview.Response?) { }
 }
 
-
 open class InMemoryCache: Cache {
     private var cache = Dictionary<String, (response: SwiftLinkPreview.Response, date: Date)>()
     private let invalidationTimeout: TimeInterval
     private let cleanupTimer: DispatchSource?
-    
+
     //High priority queue for quick responses
     private static let cacheQueue = DispatchQueue(label: "SwiftLinkPreviewInMemoryCacheQueue", qos: .userInitiated, target: DispatchQueue.global(qos: .userInitiated))
-    
+
     public init(invalidationTimeout: TimeInterval = 300.0, cleanupInterval: TimeInterval = 10.0) {
         self.invalidationTimeout = invalidationTimeout
-        
-        self.cleanupTimer = DispatchSource.makeTimerSource(queue: type(of:self).cacheQueue) as? DispatchSource
+
+        self.cleanupTimer = DispatchSource.makeTimerSource(queue: type(of: self).cacheQueue) as? DispatchSource
         self.cleanupTimer?.schedule(deadline: .now() + cleanupInterval, repeating: cleanupInterval)
-        
+
         self.cleanupTimer?.setEventHandler { [weak self] in
             guard let sself = self else {return}
             sself.cleanup()
         }
-        
+
         self.cleanupTimer?.resume()
     }
-    
+
     open func cleanup() {
         type(of: self).cacheQueue.async {
             for (url, data) in self.cache {
@@ -56,19 +55,19 @@ open class InMemoryCache: Cache {
             }
         }
     }
-    
+
     open func slp_getCachedResponse(url: String) -> SwiftLinkPreview.Response? {
         return type(of: self).cacheQueue.sync {
             guard let response = cache[url] else { return nil }
-            
+
             if response.date.timeIntervalSinceNow >= invalidationTimeout {
                 slp_setCachedResponse(url: url, response: nil)
                 return nil
             }
             return response.response
         }
     }
-    
+
     open func slp_setCachedResponse(url: String, response: SwiftLinkPreview.Response?) {
         type(of: self).cacheQueue.sync {
             if let response = response {
@@ -78,7 +77,7 @@ open class InMemoryCache: Cache {
             }
         }
     }
-    
+
     deinit {
         self.cleanupTimer?.cancel()
     }

Sources/NSURLSessionExtension.swift

@@ -8,21 +8,21 @@
 import Foundation
 
 public extension URLSession {
-    
+
     public func synchronousDataTask(with url: URL) -> (Data?, URLResponse?, NSError?) {
-        
+
         var data: Data?, response: URLResponse?, error: NSError?
         let semaphore = DispatchSemaphore(value: 0)
-        
+
         dataTask(with: url, completionHandler: {
 
             data = $0; response = $1; error = $2 as NSError?
             semaphore.signal()
-            
+
             }) .resume()
-        
+
         _ = semaphore.wait(timeout: DispatchTime.distantFuture)
-        
+
         return (data, response, error)
 
     }

Sources/Regex.swift

@@ -9,7 +9,7 @@ import Foundation
 
 // MARK: - Regular expressions
 class Regex {
-    
+
     static let imagePattern = "(.+?)\\.(gif|jpg|jpeg|png|bmp)$"
     static let imageTagPattern = "<img(.+?)src=\"([^\"](.+?))\"(.+?)[/]?>"
     static let titlePattern = "<title(.*?)>(.*?)</title>"
@@ -23,45 +23,45 @@ class Regex {
     static let scriptPattern = "<script(.*?)>"
     static let commentPattern = "<!--(.*?)-->"
     static let hrefPattern = ".*href=\"(.*?)\".*"
-    
+
     // Test regular expression
     static func test(_ string: String, regex: String) -> Bool {
-        
+
         return Regex.pregMatchFirst(string, regex: regex) != nil
-        
+
     }
-    
+
     // Match first occurrency
     static func pregMatchFirst(_ string: String, regex: String, index: Int = 0) -> String? {
-        
-        do{
-            
+
+        do {
+
             let rx = try NSRegularExpression(pattern: regex, options: [.caseInsensitive])
-            
-            if let match = rx.firstMatch(in: string, options: [], range: NSMakeRange(0, string.count)) {
-                
+
+            if let match = rx.firstMatch(in: string, options: [], range: NSRange(location: 0, length: string.count)) {
+
                 var result: [String] = Regex.stringMatches([match], text: string, index: index)
                 return result.count == 0 ? nil : result[0]
-                
+
             } else {
-                
+
                 return nil
-                
+
             }
-            
+
         } catch {
-            
+
             return nil
-            
+
         }
-        
+
     }
-    
+
     // Match all occurrencies
     static func pregMatchAll(_ string: String, regex: String, index: Int = 0) -> [String] {
-        
-        do{
-            
+
+        do {
+
             let rx = try NSRegularExpression(pattern: regex, options: [.caseInsensitive])
 
             var matches: [NSTextCheckingResult] = []
@@ -70,22 +70,22 @@ class Regex {
 
             if string.count > limit {
                 string.split(by: limit).forEach {
-                    matches.append(contentsOf: rx.matches(in: string, options: [], range: NSMakeRange(0, $0.count)))
+                    matches.append(contentsOf: rx.matches(in: string, options: [], range: NSRange(location: 0, length: $0.count)))
                 }
             } else {
-                matches.append(contentsOf: rx.matches(in: string, options: [], range: NSMakeRange(0, string.count)))
+                matches.append(contentsOf: rx.matches(in: string, options: [], range: NSRange(location: 0, length: string.count)))
             }
-            
+
             return !matches.isEmpty ? Regex.stringMatches(matches, text: string, index: index) : []
-            
+
         } catch {
-            
+
             return []
-            
+
         }
-        
+
     }
-    
+
     // Extract matches from string
     static func stringMatches(_ results: [NSTextCheckingResult], text: String, index: Int = 0) -> [String] {
 
@@ -97,14 +97,14 @@ class Regex {
                 return ""
             }
         }
-        
+
     }
-    
+
     // Return tag pattern
     static func tagPattern(_ tag: String) -> String {
-        
+
         return "<" + tag + "(.*?)>(.*?)</" + tag + ">"
-        
+
     }
-    
+
 }