Live events migrated to new model

swinghu · Oct 4, 2015 · ba5ee61 · ba5ee61
1 parent 43a78fb
commit ba5ee61
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 17 deletions.
diff --git a/WWDC/LiveEventBannerViewController.swift b/WWDC/LiveEventBannerViewController.swift
@@ -27,7 +27,7 @@ class LiveEventBannerViewController: NSViewController {
         }
     }
 
-    var event: LiveEvent? {
+    var event: LiveSession? {
         didSet {
             updateUI()
         }
@@ -69,7 +69,7 @@ class LiveEventBannerViewController: NSViewController {
             } else {
                 titleLabel.stringValue = "\(event.title)"
             }
-            descriptionLabel.stringValue = event.description
+            descriptionLabel.stringValue = event.summary
         } else {
             view.hidden = true
             NSNotificationCenter.defaultCenter().postNotificationName(LiveEventBannerVisibilityChangedNotification, object: nil)

diff --git a/WWDC/LiveEventObserver.swift b/WWDC/LiveEventObserver.swift
@@ -15,12 +15,12 @@ private let _sharedInstance = LiveEventObserver()
 
 class LiveEventObserver: NSObject, NSUserNotificationCenterDelegate {
 
-    var nextEvent: LiveEvent? {
+    var nextEvent: LiveSession? {
         didSet {
             NSNotificationCenter.defaultCenter().postNotificationName(LiveEventNextInfoChangedNotification, object: nil)
         }
     }
-    private var lastEventFound: LiveEvent?
+    private var lastEventFound: LiveSession?
     private var timer: NSTimer?
     private var liveEventPlayerController: VideoWindowController?
 
@@ -36,10 +36,10 @@ class LiveEventObserver: NSObject, NSUserNotificationCenterDelegate {
     }
 
     func checkNow() {
-        DataStore.SharedStore.checkForLiveEvent { available, event in
+        checkForLiveEvent { available, event in
             dispatch_async(dispatch_get_main_queue()) {
                 if !available && self.liveEventPlayerController != nil {
-//                    self.liveEventPlayerController?.close()
+                    self.liveEventPlayerController?.close()
                     return
                 }
 
@@ -51,22 +51,22 @@ class LiveEventObserver: NSObject, NSUserNotificationCenterDelegate {
             }
         }
 
-        DataStore.SharedStore.fetchNextLiveEvent { available, event in
+        fetchNextLiveEvent { available, event in
             dispatch_async(dispatch_get_main_queue()) {
                 self.nextEvent = event
             }
         }
     }
 
-    func playEvent(event: LiveEvent) {
+    func playEvent(event: LiveSession) {
         if Preferences.SharedPreferences().autoplayLiveEvents || overrideAutoplayPreference {
             doPlayEvent(event)
         }
 
-//        showNotification(event)
+        showNotification(event)
     }
 
-    private func doPlayEvent(event: LiveEvent) {
+    private func doPlayEvent(event: LiveSession) {
         // we already have a live event playing, just return
         if liveEventPlayerController != nil {
             NSNotificationCenter.defaultCenter().postNotificationName(LiveEventTitleAvailableNotification, object: event.title)
@@ -75,7 +75,7 @@ class LiveEventObserver: NSObject, NSUserNotificationCenterDelegate {
 
         NSNotificationCenter.defaultCenter().postNotificationName(LiveEventWillStartPlayingNotification, object: nil)
 
-        liveEventPlayerController = VideoWindowController(event: event, videoURL: event.stream!.absoluteString)
+        liveEventPlayerController = VideoWindowController(event: event, videoURL: event.streamURL!.absoluteString)
         liveEventPlayerController?.showWindow(nil)
     }
 
@@ -94,7 +94,7 @@ class LiveEventObserver: NSObject, NSUserNotificationCenterDelegate {
         }
     }
 
-    func showNotification(event: LiveEvent) {
+    func showNotification(event: LiveSession) {
         let notification = NSUserNotification()
         notification.title = "\(event.title) is live!"
         notification.informativeText = "Watch \(event.title) right now!"
@@ -111,4 +111,63 @@ class LiveEventObserver: NSObject, NSUserNotificationCenterDelegate {
         }
     }
 
+    private let _liveServiceURL = "http://wwdc.guilhermerambo.me/live.json"
+    private let _liveNextServiceURL = "http://wwdc.guilhermerambo.me/next.json"
+
+    private var liveURL: NSURL {
+        get {
+            sranddev()
+            // adds a random number as a parameter to completely prevent any caching
+            return NSURL(string: "\(_liveServiceURL)?t=\(rand())&s=\(NSDate.timeIntervalSinceReferenceDate())")!
+        }
+    }
+
+    private var liveNextURL: NSURL {
+        get {
+            sranddev()
+            // adds a random number as a parameter to completely prevent any caching
+            return NSURL(string: "\(_liveNextServiceURL)?t=\(rand())&s=\(NSDate.timeIntervalSinceReferenceDate())")!
+        }
+    }
+
+    let URLSession2 = NSURLSession(configuration: NSURLSessionConfiguration.ephemeralSessionConfiguration())
+
+    func checkForLiveEvent(completionHandler: (Bool, LiveSession?) -> ()) {
+        let task = URLSession2.dataTaskWithURL(liveURL) { data, response, error in
+            if data == nil {
+                completionHandler(false, nil)
+                return
+            }
+
+            let jsonData = JSON(data: data!)
+            let event = LiveSession(jsonObject: jsonData)
+
+            if event.isLiveRightNow {
+                completionHandler(true, event)
+            } else {
+                completionHandler(false, nil)
+            }
+        }
+        task.resume()
+    }
+
+    func fetchNextLiveEvent(completionHandler: (Bool, LiveSession?) -> ()) {
+        let task = URLSession2.dataTaskWithURL(liveNextURL) { data, response, error in
+            if data == nil {
+                completionHandler(false, nil)
+                return
+            }
+
+            let jsonData = JSON(data: data!)
+            let event = LiveSession(jsonObject: jsonData)
+
+            if event.title != "" {
+                completionHandler(true, event)
+            } else {
+                completionHandler(false, nil)
+            }
+        }
+        task.resume()
+    }
+
 }
diff --git a/WWDC/Models.swift b/WWDC/Models.swift
@@ -140,7 +140,49 @@ class LiveSession {
     var title = ""
     var summary = ""
     var startsAt: NSDate?
-    var streamURL = ""
+    var streamURL: NSURL?
     var alternateStreamURL = ""
-    var current = false
+    var isLiveRightNow = false
+
+    private struct Keys {
+        static let id = "id"
+        static let title = "title"
+        static let description = "description"
+        static let stream = "stream"
+        static let stream2 = "stream_elcapitan"
+        static let startsAt = "starts_at"
+        static let isLiveRightNow = "isLiveRightNow"
+    }
+
+    private let _dateTimezone = "GMT"
+    private let _dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'ZZZZ"
+
+    init(jsonObject: JSON) {
+        id = jsonObject[Keys.id].intValue
+
+        if let title = jsonObject[Keys.title].string {
+            self.title = title
+        } else {
+            self.title = ""
+        }
+
+        if let description = jsonObject[Keys.description].string {
+            self.summary = description
+        } else {
+            self.summary = ""
+        }
+
+        if let streamURL = jsonObject[Keys.stream].string {
+            self.streamURL = NSURL(string: streamURL)
+        }
+
+        isLiveRightNow = jsonObject[Keys.isLiveRightNow].boolValue
+
+        let formatter = NSDateFormatter()
+        formatter.dateFormat = _dateFormat
+        if let startsAtString = jsonObject[Keys.startsAt].string {
+            let startsAtWithZone = startsAtString+_dateTimezone
+            startsAt = formatter.dateFromString(startsAtWithZone)
+        }
+    }
 }
diff --git a/WWDC/VideoWindowController.swift b/WWDC/VideoWindowController.swift
@@ -137,7 +137,7 @@ class VideoWindowController: NSWindowController {
     }
 
     private func loadEventVideo() {
-        if let url = NSURL(string: event!.streamURL) {
+        if let url = event?.streamURL {
             asset = AVURLAsset(URL: url, options: nil)
             asset.loadValuesAsynchronouslyForKeys(["playable"]) {
                 dispatch_async(dispatch_get_main_queue()) {

diff --git a/WWDC/WWDCDatabase.swift b/WWDC/WWDCDatabase.swift
@@ -25,8 +25,6 @@ typealias SessionsUpdatedCallback = () -> Void
 
     private struct Constants {
         static let internalServiceURL = "http://wwdc.guilhermerambo.me/index.json"
-        static let liveServiceURL = "http://wwdc.guilhermerambo.me/live.json"
-        static let liveNextServiceURL = "http://wwdc.guilhermerambo.me/next.json"
         static let asciiServiceBaseURL = "http://asciiwwdc.com/"
     }