Update for patch 20.4.2

Attempt to fix bug where replay doesn’t upload
HearthSim · Jun 20, 2021 · 20a83e5 · 20a83e5
1 parent b35100f
commit 20a83e5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.9.8
+## New
+- Add support for patch 20.4.2
+## Fixes
+- Attempt to fix bug where replay sometimes doesn't upload
+
 # 1.9.7
 ## New
 - Added missing card set icons

diff --git a/HSTracker.xcodeproj/project.pbxproj b/HSTracker.xcodeproj/project.pbxproj
@@ -3212,7 +3212,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = /Library/Frameworks/Mono.framework/Libraries;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.9.7;
+				MARKETING_VERSION = 1.9.8;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
@@ -3256,7 +3256,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = /Library/Frameworks/Mono.framework/Libraries;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.9.7;
+				MARKETING_VERSION = 1.9.8;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = net.hearthsim.hstracker;

diff --git a/HSTracker/Core/Extensions/Date.swift b/HSTracker/Core/Extensions/Date.swift
@@ -27,4 +27,11 @@ extension Date {
     public var second: Int {
         return LogReaderManager.calendar.component(.second, from: self)
     }
+
+    public var removeTimeStamp : Date? {
+        guard let date = LogReaderManager.calendar.date(from: Calendar.current.dateComponents([.year, .month, .day], from: self)) else {
+        return nil
+       }
+       return date
+   }
 }
diff --git a/HSTracker/Logging/Game.swift b/HSTracker/Logging/Game.swift
@@ -1125,7 +1125,6 @@ class Game: NSObject, PowerEventHandler {
         opponent.reset()
         updateSecretTracker(cards: [])
         windowManager.hideGameTrackers()
-        powerLog.removeAll()
 
 		_spectator = nil
         _availableRaces = nil
@@ -1309,7 +1308,7 @@ class Game: NSObject, PowerEventHandler {
             self.powerLog = self.powerLog.reversed()[...index].reversed() as [LogLine]
         } else {
             self.powerLog = []
-        }   
+        }
 
 		gameEnded = false
         isInMenu = false

diff --git a/HSTracker/Logging/LogLine.swift b/HSTracker/Logging/LogLine.swift
@@ -130,12 +130,11 @@ struct LogLine {
     static var trackedFailure = false
 
 	static func DateNoTime(date: Date) -> Date {
-		let str = LogLine.trimFormatter.string(from: date) // 12/15/16
-        if let result = LogLine.trimFormatter.date(from: str) {
+        if let result = date.removeTimeStamp {
             return result
         }
         if !trackedFailure {
-            Analytics.trackEvent("DateNoTime", withProperties: ["str": str, "date": date.debugDescription])
+            Analytics.trackEvent("DateNoTime", withProperties: ["date": date.debugDescription])
             trackedFailure = true
         }
         return Date()