Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrading class to swift 3 #6

Merged
merged 1 commit into from Nov 14, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 25 additions & 22 deletions ImageLoader.swift
Expand Up @@ -11,7 +11,7 @@ import Foundation

class ImageLoader {

let cache = NSCache()
let cache = NSCache<NSString, AnyObject>()

class var sharedLoader : ImageLoader {
struct Static {
Expand All @@ -20,36 +20,39 @@ class ImageLoader {
return Static.instance
}

func imageForUrl(urlString: String, completionHandler:(image: UIImage?, url: String) -> ()) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), {()in
let data: NSData? = self.cache.objectForKey(urlString) as? NSData
func imageForUrl(urlString: String, completionHandler: @escaping (_ image: UIImage?, _ url: String) -> ()) {

DispatchQueue.global(qos: .background).async {

let data: NSData? = self.cache.object(forKey: urlString as NSString) as? NSData

if let goodData = data {
let image = UIImage(data: goodData)
dispatch_async(dispatch_get_main_queue(), {() in
completionHandler(image: image, url: urlString)
})
let image = UIImage(data: goodData as Data)
DispatchQueue.main.async {
completionHandler(image, urlString)
}
return
}

let downloadTask: NSURLSessionDataTask = NSURLSession.sharedSession().dataTaskWithURL(NSURL(string: urlString)!, completionHandler: {(data: NSData?, response: NSURLResponse?, error: NSError?) -> Void in
let session = URLSession.shared
let request = URLRequest(url: URL(string: urlString)!);

session.dataTask(with: request) { data, response, error in

if (error != nil) {
completionHandler(image: nil, url: urlString)
completionHandler(nil, urlString)
return
}

if let data = data {
if let data = data{
let image = UIImage(data: data)
self.cache.setObject(data, forKey: urlString)
dispatch_async(dispatch_get_main_queue(), {() in
completionHandler(image: image, url: urlString)
})
return
self.cache.setObject(data as AnyObject, forKey: urlString as NSString)
DispatchQueue.main.async {
completionHandler(image, urlString)
}
}

})
downloadTask.resume()
})

}.resume()

}
}
}
}