Merge pull request #2 from hollanderbart/fix-build

Include NPOStream dependency

NPO Live/PlayerViewController.swift

@@ -25,14 +25,17 @@ class PlayerViewController: AVPlayerViewController {
 
         playerItem.externalMetadata.append(titleMetadataItem)
 
-        if let image = UIImage(named: channel.title) {
+        if
+            let image = UIImage(named: channel.title) {
             let logo: AVMetadataItem = {
                 let _logo = AVMutableMetadataItem()
                 _logo.locale = Locale.current
                 _logo.key = AVMetadataKey.commonKeyArtwork as NSCopying & NSObjectProtocol
                 _logo.keySpace = AVMetadataKeySpace.common
-                _logo.value = UIImagePNGRepresentation(image) as? NSCopying & NSObjectProtocol
-
+                if let imagePNG = UIImagePNGRepresentation(image) {
+                    _logo.value = imagePNG as NSCopying & NSObjectProtocol
+                }
+
                 return _logo
             }()
 

NPO Live/String+Extension.swift

@@ -9,61 +9,8 @@
 import Foundation
 
 extension String {
-
-	func sliceFrom(_ start: String, to: String) -> String? {
-		return (range(of: start)?.upperBound)
-            .flatMap { sInd in
-			(range(of: to, range: sInd ..< endIndex)?.lowerBound)
-                .map { eInd in
-				substring(with: sInd ..< eInd)
-			}
-		}
-	}
-
-    var encodeURIComponent: String? {
-		return self.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
-	}
 
     var decodeJSONUri: String {
 		return self.replacingOccurrences(of: "\\/", with: "/")
 	}
-
-	subscript (i: Int) -> Character {
-		get {
-			let index = characters.index(startIndex, offsetBy: i)
-			return self[index]
-		}
-	}
-
-	func setCharAt(_ index: Int, character: Character) -> String {
-		if index > self.characters.count - 1 {
-			return self
-		}
-
-		return self.subString(0, length: index) + String(character) + self.subString(index + 1, length: self.characters.count - index)
-	}
-
-	func subString(_ startIndex: Int, length: Int) -> String {
-		let start = self.characters.index(self.startIndex, offsetBy: startIndex)
-		let end = self.characters.index(self.startIndex, offsetBy: startIndex+length, limitedBy: self.characters.index(self.startIndex, offsetBy: self.characters.count))
-
-		return self.substring(with: (start ..< end!))
-	}
-
-	func htmlDecoded() -> String {
-		guard (self != "") else { return self }
-		var newStr = self
-		let entities = [
-			"&quot;"    : "\"",
-			"&amp;"     : "&",
-			"&apos;"    : "'",
-			"&lt;"      : "<",
-			"&gt;"      : ">",
-		]
-
-		for (name,value) in entities {
-			newStr = newStr.replacingOccurrences(of: name, with: value)
-		}
-		return newStr
-	}
 }

Podfile

@@ -8,5 +8,6 @@ target 'NPO Live' do
   use_frameworks!
 
   # Pods for NPO Live
-  pod "NPOStream", :path => "../NPOStream/"
+pod "NPOStream", "~> 0.0.6"
+
 end

Podfile.lock

@@ -2,15 +2,11 @@ PODS:
   - NPOStream (0.0.6)
 
 DEPENDENCIES:
-  - NPOStream (from `../NPOStream/`)
-
-EXTERNAL SOURCES:
-  NPOStream:
-    :path: ../NPOStream/
+  - NPOStream (~> 0.0.6)
 
 SPEC CHECKSUMS:
-  NPOStream: 2421d98cf68c89d2e22413023f3ba45bc20f3331
+  NPOStream: b22327c59cd8272e978cc961a4d343add4c80981
 
-PODFILE CHECKSUM: 6f5845b39f165f24029830281b2f97933a1714c0
+PODFILE CHECKSUM: e9d2ebf6f588c90d78d9f034ed311a29e4943ca2
 
 COCOAPODS: 1.2.1