beta6 with tentative fix for poi crash when looking for a missing json

JohnCoates · Dec 3, 2018 · 9cd2114 · 9cd2114
1 parent 4ac7b60
commit 9cd2114
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Aerial/Source/Models/Cache/PoiStringProvider.swift b/Aerial/Source/Models/Cache/PoiStringProvider.swift
@@ -160,7 +160,7 @@ final class PoiStringProvider {
                 }
             }
             debugLog("Defaulting to bundle")
-            let cc = locale.countryCode!.lowercased()
+            let cc = "en" //locale.countryCode!.lowercased()
             if preferences.localizeDescriptions {
                 let path = Bundle(for: PoiStringProvider.self).path(forResource: cc, ofType: "json")
                 if path != nil {

diff --git a/Aerial/Source/Models/ManifestLoader.swift b/Aerial/Source/Models/ManifestLoader.swift
@@ -312,6 +312,7 @@ class ManifestLoader {
         dateFormatter.locale = Locale.init(identifier: "en_GB")
         let dateObj = dateFormatter.date(from: preferences.lastVideoCheck!)
 
+        debugLog(preferences.lastVideoCheck!)
         var dayCheck = 7
         if preferences.newVideosMode == Preferences.NewVideosMode.monthly.rawValue {
             dayCheck = 30
@@ -324,6 +325,7 @@ class ManifestLoader {
 
         if #available(OSX 10.11, *) {
             if !cacheUrl.hasDirectoryPath {
+                // If there's no backup directory, we force the first check
                 moveOldManifests()
                 return
             }
@@ -333,7 +335,7 @@ class ManifestLoader {
 
         debugLog("Interval : \(String(describing: dateObj?.timeIntervalSinceNow))")
         if Int((dateObj?.timeIntervalSinceNow)!) < -dayCheck * 86400 {
-            // We need to redownload
+            // We need to redownload then
             debugLog("Checking for new videos")
             moveOldManifests()
         } else {

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.6test6</string>
+	<string>1.4.6beta6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.6beta5</string>
+	<string>1.4.6beta6</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSMinimumSystemVersion</key>