keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent cfb2a720d7
commit 487bd06755
2 changed files with 100 additions and 91 deletions
Show Stats Download Patch File Download Diff File

3
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
Unescape Escape View File

@ -147,6 +147,9 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
private func createViews() { private func createViews() {
view.backgroundColor = UIColor.white view.backgroundColor = UIColor.white
// Block UIKit from adjust insets of collection view which screws up
// min/max scroll positions.
self.automaticallyAdjustsScrollViewInsets = false self.automaticallyAdjustsScrollViewInsets = false
// Search // Search

188
Signal/src/network/GiphyDownloader.swift
Unescape Escape View File

@ -23,14 +23,21 @@ class GiphyAssetSegment {
public let index: UInt public let index: UInt
public let segmentStart: UInt public let segmentStart: UInt
public let segmentLength: UInt public let segmentLength: UInt
// The amount of the segment that is overlap.
// The overlap lies in the _first_ n bytes of the segment data.
public let redundantLength: UInt public let redundantLength: UInt
// This state should only be accessed on the main thread.
public var state: GiphyAssetSegmentState = .waiting { public var state: GiphyAssetSegmentState = .waiting {
didSet { didSet {
AssertIsOnMainThread() AssertIsOnMainThread()
} }
} }
private var datas = [Data]() // This state is accessed off the main thread.
//
// * During downloads it will be accessed on the task delegate queue.
// * After downloads it will be accessed on a worker queue.
private var segmentData = NSMutableData()
init(index: UInt, init(index: UInt,
segmentStart: UInt, segmentStart: UInt,
@ -43,11 +50,7 @@ class GiphyAssetSegment {
} }
public func totalDataSize() -> UInt { public func totalDataSize() -> UInt {
var result: UInt = 0 return UInt(segmentData.length)
for data in datas {
result += UInt(data.count)
}
return result
} }
public func append(data: Data) { public func append(data: Data) {
@ -56,37 +59,31 @@ class GiphyAssetSegment {
return return
} }
datas.append(data) segmentData.append(data)
} }
public func mergeData(assetData: NSMutableData) { public func mergeData(assetData: NSMutableData) -> Bool {
guard state == .complete else { guard state == .complete else {
owsFail("\(TAG) merging data in invalid state: \(state)") owsFail("\(TAG) merging data in invalid state: \(state)")
return return false
}
guard UInt(segmentData.length) == segmentLength else {
owsFail("\(TAG) segment data length: \(segmentData.length) doesn't match expected length: \(segmentLength)")
return false
} }
// In some cases the last two segments will overlap. // In some cases the last two segments will overlap.
// In that case, we only want to append the non-overlapping // In that case, we only want to append the non-overlapping
// tail of the last segment. // tail of the segment data.
var bytesToIgnore = Int(redundantLength) let bytesToIgnore = Int(redundantLength)
var totalDataBytes: UInt = 0 if bytesToIgnore > 0 {
for data in datas { let range = NSMakeRange(bytesToIgnore, segmentData.length - bytesToIgnore)
totalDataBytes += UInt(data.count) let subdata = (segmentData as NSData).subdata(with: range)
if data.count <= bytesToIgnore { assetData.append(subdata)
bytesToIgnore -= data.count } else {
} else if bytesToIgnore > 0 { assetData.append(segmentData as Data)
let range = NSMakeRange(bytesToIgnore, data.count - bytesToIgnore)
let subdata = (data as NSData).subdata(with: range)
assetData.append(subdata)
bytesToIgnore = 0
} else {
assetData.append(data)
}
}
guard totalDataBytes == segmentLength else {
owsFail("\(TAG) segment data length: \(totalDataBytes) doesn't match expected length: \(segmentLength)")
return
} }
return true
} }
} }
@ -122,6 +119,7 @@ enum GiphyAssetRequestState: UInt {
// This property is an internal implementation detail of the download process. // This property is an internal implementation detail of the download process.
var assetFilePath: String? var assetFilePath: String?
// This state should only be accessed on the main thread.
private var segments = [GiphyAssetSegment]() private var segments = [GiphyAssetSegment]()
public var state: GiphyAssetRequestState = .waiting public var state: GiphyAssetRequestState = .waiting
public var contentLength: Int = 0 { public var contentLength: Int = 0 {
@ -260,7 +258,10 @@ enum GiphyAssetRequestState: UInt {
owsFail("\(TAG) could not merge empty segment.") owsFail("\(TAG) could not merge empty segment.")
return nil return nil
} }
segment.mergeData(assetData: assetData) guard segment.mergeData(assetData: assetData) else {
owsFail("\(TAG) failed to merge segment data.")
return nil
}
} }
guard assetData.length == contentLength else { guard assetData.length == contentLength else {
@ -496,7 +497,13 @@ extension URLSessionTask {
success:success, success:success,
failure:failure) failure:failure)
assetRequestQueue.append(assetRequest) assetRequestQueue.append(assetRequest)
processRequestQueue() // Process the queue (which may start this request)
// asynchronously so that the caller has time to store
// a reference to the asset request returned by this
// method before its success/failure handler is called.
DispatchQueue.main.async {
self.processRequestQueue()
}
return assetRequest return assetRequest
} }
@ -575,83 +582,82 @@ extension URLSessionTask {
processRequestQueue() processRequestQueue()
} }
// Start a request if necessary, complete asset requests if possible. // * Start a segment request or content length request if possible.
// * Complete/cancel asset requests if possible.
//
private func processRequestQueue() { private func processRequestQueue() {
AssertIsOnMainThread() AssertIsOnMainThread()
DispatchQueue.main.async { guard let assetRequest = self.popNextAssetRequest() else {
guard let assetRequest = self.popNextAssetRequest() else { return
return }
} guard !assetRequest.wasCancelled else {
guard !assetRequest.wasCancelled else { // Discard the cancelled asset request and try again.
// Discard the cancelled asset request and try again. self.removeAssetRequestFromQueue(assetRequest: assetRequest)
self.removeAssetRequestFromQueue(assetRequest: assetRequest) return
return }
} guard UIApplication.shared.applicationState == .active else {
guard UIApplication.shared.applicationState == .active else { // If app is not active, fail the asset request.
// If app is not active, fail the asset request. assetRequest.state = .failed
assetRequest.state = .failed self.assetRequestDidFail(assetRequest:assetRequest)
self.assetRequestDidFail(assetRequest:assetRequest) self.processRequestQueue()
self.processRequestQueue() return
return }
}
if let asset = self.assetMap.get(key:assetRequest.rendition.url) { if let asset = self.assetMap.get(key:assetRequest.rendition.url) {
// Deferred cache hit, avoids re-downloading assets that were // Deferred cache hit, avoids re-downloading assets that were
// downloaded while this request was queued. // downloaded while this request was queued.
assetRequest.state = .complete assetRequest.state = .complete
self.assetRequestDidSucceed(assetRequest : assetRequest, asset: asset) self.assetRequestDidSucceed(assetRequest : assetRequest, asset: asset)
return return
} }
guard let downloadSession = self.giphyDownloadSession() else { guard let downloadSession = self.giphyDownloadSession() else {
owsFail("\(self.TAG) Couldn't create session manager.") owsFail("\(self.TAG) Couldn't create session manager.")
assetRequest.state = .failed assetRequest.state = .failed
self.assetRequestDidFail(assetRequest:assetRequest) self.assetRequestDidFail(assetRequest:assetRequest)
return return
} }
if assetRequest.state == .waiting { if assetRequest.state == .waiting {
// If asset request hasn't yet determined the resource size, // If asset request hasn't yet determined the resource size,
// try to do so now. // try to do so now.
assetRequest.state = .requestingSize assetRequest.state = .requestingSize
var request = URLRequest(url: assetRequest.rendition.url as URL) var request = URLRequest(url: assetRequest.rendition.url as URL)
request.httpMethod = "HEAD" request.httpMethod = "HEAD"
let task = downloadSession.dataTask(with:request, completionHandler: { [weak self] data, response, error -> Void in let task = downloadSession.dataTask(with:request, completionHandler: { [weak self] data, response, error -> Void in
if let data = data { if let data = data {
if data.count > 0 { if data.count > 0 {
owsFail("\(self?.TAG) HEAD request has unexpected body: \(data.count).") owsFail("\(self?.TAG) HEAD request has unexpected body: \(data.count).")
}
} }
self?.handleAssetSizeResponse(assetRequest:assetRequest, response:response, error:error)
})
task.resume()
} else {
// Start a download task.
guard let assetSegment = assetRequest.firstWaitingSegment() else {
owsFail("\(self.TAG) queued asset request does not have a waiting segment.")
return
} }
assetSegment.state = .downloading self?.handleAssetSizeResponse(assetRequest:assetRequest, response:response, error:error)
})
task.resume()
} else {
// Start a download task.
var request = URLRequest(url: assetRequest.rendition.url as URL) guard let assetSegment = assetRequest.firstWaitingSegment() else {
let rangeHeaderValue = "bytes=\(assetSegment.segmentStart)-\(assetSegment.segmentStart + assetSegment.segmentLength - 1)" owsFail("\(self.TAG) queued asset request does not have a waiting segment.")
request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") return
let task = downloadSession.dataTask(with:request)
task.assetRequest = assetRequest
task.assetSegment = assetSegment
task.resume()
} }
assetSegment.state = .downloading
// Recurse; we may be able to start multiple downloads. var request = URLRequest(url: assetRequest.rendition.url as URL)
self.processRequestQueue() let rangeHeaderValue = "bytes=\(assetSegment.segmentStart)-\(assetSegment.segmentStart + assetSegment.segmentLength - 1)"
request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range")
let task = downloadSession.dataTask(with:request)
task.assetRequest = assetRequest
task.assetSegment = assetSegment
task.resume()
} }
// Recurse; we may be able to start multiple downloads.
self.processRequestQueue()
} }
private func handleAssetSizeResponse(assetRequest: GiphyAssetRequest, response: URLResponse?, error: Error?) { private func handleAssetSizeResponse(assetRequest: GiphyAssetRequest, response: URLResponse?, error: Error?) {

Write Preview
Loading…
Cancel
Save