Changed network settings, using more efficient server

insidegui · Jun 20, 2016 · ec1ab81 · ec1ab81
1 parent 1963c2c
commit ec1ab81
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/WWDC/AppConfigAdapter.swift b/WWDC/AppConfigAdapter.swift
@@ -16,8 +16,14 @@ class AppConfigAdapter: JSONAdapter {
     static func adapt(json: JSON) -> ModelType {
         let config = AppConfig()
 
-        config.sessionsURL = json["sessions"].stringValue
-        config.videosURL = json["videos"].stringValue
+        if let baseURL = json["baseURL"].string {
+            config.sessionsURL = baseURL + json["sessions"].stringValue
+            config.videosURL = baseURL + json["videos"].stringValue
+        } else {
+            config.sessionsURL = json["sessions"].stringValue
+            config.videosURL = json["videos"].stringValue
+        }
+
         config.isWWDCWeek = json["wwdc_week"].intValue == 1
         config.scheduleEnabled = json["schedule"].intValue == 1
         config.shouldIgnoreCache = json["ignore_cache"].intValue == 1

diff --git a/WWDC/Preferences.swift b/WWDC/Preferences.swift
@@ -58,8 +58,8 @@ class Preferences {
         static let userKnowsLiveEventThing = false
         static let tvTechTalksAlerted = false
         static let automaticRefreshEnabled = true
-        static let automaticRefreshIntervalOnWWDCWeek = 300.0
-        static let automaticRefreshIntervalRegular = 1800.0
+        static let automaticRefreshIntervalOnWWDCWeek = 900.0
+        static let automaticRefreshIntervalRegular = 3600.0
         static let floatOnTopEnabled = false
         static let automaticRefreshSuggestionPresentedAt = NSDate.distantPast()
 

diff --git a/WWDC/WWDCEnvironment.swift b/WWDC/WWDCEnvironment.swift
@@ -30,22 +30,16 @@ struct WWDCEnvironment {
         #endif
     }
 
-    private static var cacheAvoidingToken: String {
-        return "?t=\(rand())&s=\(NSDate.timeIntervalSinceReferenceDate())"
-    }
-
     private static var server: String {
         if shouldUseTestServer {
             return "http://localhost"
         } else {
-            return "http://wwdc.guilhermerambo.me"
+            return "http://cdn.wwdc.guilhermerambo.me"
         }
     }
 
     private static func URL(path: String) -> String {
-        sranddev()
-
-        return server + path + cacheAvoidingToken
+        return server + path
     }
 
     // MARK: - Paths
@@ -54,7 +48,7 @@ struct WWDCEnvironment {
         if shouldUseFakeTestData {
             return URL("/fake_index.json")
         } else {
-            return URL("/index.json")
+            return URL("/index2.json")
         }
     }
 
@@ -69,7 +63,7 @@ struct WWDCEnvironment {
     }
 
     static var liveSessionsURL: String {
-        return URL("/videos_live.php")
+        return URL("/videos_live.json")
     }
 
     // MARK: - Transcript ignore