Add audio only feeds for NHL games (#72)

* Add audio feeds for NHL * Update audio feed names
inickt · Mar 13, 2020 · 8fdd952 · 8fdd952
1 parent 5ebfaf3
commit 8fdd952
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/LazyManCore/Models/Feed.swift b/LazyManCore/Models/Feed.swift
@@ -43,12 +43,12 @@ public struct Feed: Hashable {
     }
 
     // TODO: - This is bad now, refactor
-    public init(highlightName: String, league: League, url: URL?) {
+    public init(feedType: String, callLetters: String, feedName: String, league: League, url: URL?) {
         self.playlistUrl = url
-        self.feedType = FeedType(feedType: highlightName)
+        self.feedType = FeedType(feedType: feedType)
         self.league = league
-        self.feedName = highlightName
-        self.callLetters = ""
+        self.feedName = feedName
+        self.callLetters = callLetters
         self.playbackID = 0
         self.date = Date()
     }

diff --git a/LazyManCore/Models/Schedules/MLBScheduleResponse+ScheduleResponse.swift b/LazyManCore/Models/Schedules/MLBScheduleResponse+ScheduleResponse.swift
@@ -51,7 +51,11 @@ private extension MLBScheduleResponse.EpgAlternateResponse {
                 let playbackUrl = URL(string: playbackUrlString) else {
                     return []
             }
-            return [Feed(highlightName: title, league: .MLB, url: playbackUrl)]
+            return [Feed(feedType: "",
+                         callLetters: "",
+                         feedName: title,
+                         league: .MLB,
+                         url: playbackUrl)]
         default:
             return []
         }

diff --git a/LazyManCore/Models/Schedules/NHLScheduleResponse+ScheduleResponse.swift b/LazyManCore/Models/Schedules/NHLScheduleResponse+ScheduleResponse.swift
@@ -33,16 +33,33 @@ private extension NHLScheduleResponse.EpgResponse {
                 Feed(feedType: $0.mediaFeedType ?? "",
                      callLetters: $0.callLetters ?? "",
                      feedName: $0.feedName ?? "",
-                     playbackID: Int($0.mediaPlaybackId) ?? -1,
+                     playbackID: Int($0.mediaPlaybackId ?? "") ?? -1,
                      league: .NHL,
                      date: date)
             }
+        case "Audio":
+            return items.compactMap {
+                guard let stringURL = $0.mediaPlaybackURL,
+                    let url = URL(string: stringURL) else {
+                    return nil
+                }
+                return Feed(feedType: $0.mediaFeedType ?? "",
+                            callLetters: "\($0.callLetters ?? "") - Audio",
+                            feedName: $0.feedName ?? "",
+                            league: .NHL,
+                            url: url)
+
+            }
         case "Extended Highlights", "Recap":
-            guard let playbackUrlString = items.first?.playbacks?.first(where: { $0.name == "HTTP_CLOUD_TABLET_60" })?.url,
-                let playbackUrl = URL(string: playbackUrlString) else {
-                    return []
+            guard let stringURL = items.first?.mediaPlaybackURL,
+                let url = URL(string: stringURL) else {
+                return []
             }
-            return [Feed(highlightName: title, league: .NHL, url: playbackUrl)]
+            return [Feed(feedType: "",
+                         callLetters: "",
+                         feedName: title,
+                         league: .NHL,
+                         url: url)]
         default:
             return []
         }

diff --git a/LazyManCore/Models/Schedules/NHLScheduleResponse.swift b/LazyManCore/Models/Schedules/NHLScheduleResponse.swift
@@ -48,8 +48,9 @@ struct NHLScheduleResponse: Codable {
     }
 
     struct EpgItemResponse: Codable {
-        let mediaPlaybackId: String
+        let mediaPlaybackId: String?
         let mediaFeedType: String?
+        let mediaPlaybackURL: String?
         let callLetters: String?
         let feedName: String?
         let playbacks: [PlaybackResponse]?

diff --git a/LazyManCore/Util/ScheduleLoader.swift b/LazyManCore/Util/ScheduleLoader.swift
@@ -45,6 +45,8 @@ public class ScheduleWebLoader: ScheduleLoader {
         let config = URLSessionConfiguration.default
         config.requestCachePolicy = .reloadIgnoringLocalCacheData
         config.urlCache = nil
+        config.httpAdditionalHeaders = config.httpAdditionalHeaders ?? [:]
+        config.httpAdditionalHeaders?["x-platform"] = "ios-phone"
         self.session = URLSession(configuration: config)
     }
 
@@ -58,7 +60,7 @@ public class ScheduleWebLoader: ScheduleLoader {
              return .failure(.urlError("\(startDateString)–\(endDateString) schedule"))
         }
 
-        let (data, _, error) = URLSession.shared.synchronousDataTask(with: url)
+        let (data, _, error) = self.session.synchronousDataTask(with: url)
 
         if let data = data {
             return .success(data)