Provide type-safe indexing

appunite · May 23, 2018 · 4f30072 · 4f30072
1 parent 3cdaa1e
commit 4f30072
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/Cedric/Cedric.swift b/Cedric/Cedric.swift
@@ -155,7 +155,8 @@ public class Cedric {
     ///
     /// - Returns: Currently under operation tasks
     public func getActiveTasks() -> [URLSessionDownloadTask] {
-        return items.map{ $0.task }
+        return items
+            .map{ $0.task }
             .compactMap { $0 }
     }
 
@@ -168,15 +169,15 @@ public class Cedric {
         item.delegate = self
 
         let operation = BlockOperation(block: { [weak item] in
-            guard let strongItem = item else { return }
-
+            // prevent locking queue
+            guard item != nil else { return }
             let semaphore = DispatchSemaphore(value: 0)
 
-            strongItem.completionBlock = { [weak semaphore] in
+            item?.completionBlock = { [weak semaphore] in
                 semaphore?.signal()
             }
 
-            strongItem.resume()
+            item?.resume()
             semaphore.wait()
         })
 

diff --git a/Cedric/ConcurrentArray.swift b/Cedric/ConcurrentArray.swift
@@ -70,27 +70,24 @@ extension ConcurrentArray {
 
 // Mutable
 extension ConcurrentArray {
-    func append( _ element: T) {
+    internal func append( _ element: T) {
         queue.async(flags: .barrier) {
             self.array.append(element)
         }
     }
 
-    func remove(where predicate: @escaping (T) -> Bool) {
+    internal func remove(where predicate: @escaping (T) -> Bool) {
         queue.async(flags: .barrier) {
             guard let index = self.array.index(where: predicate) else { return }
             self.array.remove(at: index)
         }
     }
 
-    func removeAll() {
+    internal func removeAll() {
         queue.async(flags: .barrier) {
             self.array.removeAll()
         }
     }
-}
-
-extension ConcurrentArray {
 
     internal subscript(index: Int) -> T? {
         get {
@@ -120,10 +117,3 @@ extension ConcurrentArray where T: Equatable {
         return result
     }
 }
-
-extension ConcurrentArray {
-
-    internal static func +=(left: inout ConcurrentArray, right: T) {
-        left.append(right)
-    }
-}