#35: Add a check for update solution

- Use the tag name instead of name to detect updates
Timac · Apr 11, 2024 · ebe82aa · ebe82aa
1 parent 3db8d2a
commit ebe82aa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/VPNAppTests/GitHubReleaseTests.swift b/VPNAppTests/GitHubReleaseTests.swift
@@ -3,16 +3,16 @@ import XCTest
 final class GitHubReleaseTests: XCTestCase {
 
     func testGitHubReleaseComparison() throws {
-		let release_1_0 = GitHubRelease(name: "1.0", prerelease: false, draft: false, body: nil)
-		let release_1_1 = GitHubRelease(name: "1.1", prerelease: false, draft: false, body: nil)
-		let release_1_2 = GitHubRelease(name: "1.2", prerelease: false, draft: false, body: nil)
-		let release_1_10 = GitHubRelease(name: "1.10", prerelease: false, draft: false, body: nil)
-		let release_1_0_0 = GitHubRelease(name: "1.0.0", prerelease: false, draft: false, body: nil)
-		let release_1_0_1 = GitHubRelease(name: "1.0.1", prerelease: false, draft: false, body: nil)
-		let release_1_1_1 = GitHubRelease(name: "1.1.1", prerelease: false, draft: false, body: nil)
-		let release_1_10_1 = GitHubRelease(name: "1.10.1", prerelease: false, draft: false, body: nil)
-		let release_2_0 = GitHubRelease(name: "2.0", prerelease: false, draft: false, body: nil)
-		let release_3_0 = GitHubRelease(name: "3.0", prerelease: false, draft: false, body: nil)
+		let release_1_0 = GitHubRelease(tag_name: "1.0", prerelease: false, draft: false, body: nil)
+		let release_1_1 = GitHubRelease(tag_name: "1.1", prerelease: false, draft: false, body: nil)
+		let release_1_2 = GitHubRelease(tag_name: "1.2", prerelease: false, draft: false, body: nil)
+		let release_1_10 = GitHubRelease(tag_name: "1.10", prerelease: false, draft: false, body: nil)
+		let release_1_0_0 = GitHubRelease(tag_name: "1.0.0", prerelease: false, draft: false, body: nil)
+		let release_1_0_1 = GitHubRelease(tag_name: "1.0.1", prerelease: false, draft: false, body: nil)
+		let release_1_1_1 = GitHubRelease(tag_name: "1.1.1", prerelease: false, draft: false, body: nil)
+		let release_1_10_1 = GitHubRelease(tag_name: "1.10.1", prerelease: false, draft: false, body: nil)
+		let release_2_0 = GitHubRelease(tag_name: "2.0", prerelease: false, draft: false, body: nil)
+		let release_3_0 = GitHubRelease(tag_name: "3.0", prerelease: false, draft: false, body: nil)
 
 
 		XCTAssertTrue(release_1_0 < release_1_1)
@@ -60,9 +60,9 @@ final class GitHubReleaseTests: XCTestCase {
 	}
 
 	func testGitHubReleasePrereleaseDraft() throws {
-		let release_1_0 = GitHubRelease(name: "1.0", prerelease: false, draft: false, body: nil)
-		let release_1_1 = GitHubRelease(name: "1.1", prerelease: true, draft: false, body: nil)
-		let release_1_2 = GitHubRelease(name: "1.2", prerelease: true, draft: false, body: nil)
+		let release_1_0 = GitHubRelease(tag_name: "1.0", prerelease: false, draft: false, body: nil)
+		let release_1_1 = GitHubRelease(tag_name: "1.1", prerelease: true, draft: false, body: nil)
+		let release_1_2 = GitHubRelease(tag_name: "1.2", prerelease: true, draft: false, body: nil)
 
 		XCTAssertTrue(release_1_0 < release_1_1)
 		XCTAssertTrue(release_1_1 < release_1_2)

diff --git a/VPNStatus/CheckForUpdate/GitHubRelease.swift b/VPNStatus/CheckForUpdate/GitHubRelease.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 public struct GitHubRelease: Decodable, Comparable {
-	let name: String
+	let tag_name: String // "1.0", "1.0.1", "1.2", "2.0"
 	let prerelease: Bool
 	let draft: Bool
 	let body: String?
@@ -43,7 +43,7 @@ public struct GitHubRelease: Decodable, Comparable {
 	}
 
 	public func components() -> (major: Int, minor: Int, patch: Int) {
-		var components = self.name.split(separator: ".").compactMap { Int($0) }
+		var components = self.tag_name.split(separator: ".").compactMap { Int($0) }
 		while components.count != 3 {
 			components.append(0)
 		}

diff --git a/VPNStatus/CheckForUpdate/UpdateManager.swift b/VPNStatus/CheckForUpdate/UpdateManager.swift
@@ -15,12 +15,12 @@ import Foundation
 	let currentRelease: GitHubRelease
 
 	override private init() {
-		let appShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
-		if let appShortVersion = appShortVersion {
-			currentRelease = GitHubRelease(name: appShortVersion, prerelease: false, draft: false, body: nil)
-		} else {
-			currentRelease = GitHubRelease(name: "1.0", prerelease: false, draft: false, body: nil)
+		var version = "1.0"
+		if let appShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
+			version = appShortVersion
 		}
+
+		currentRelease = GitHubRelease(tag_name: version, prerelease: false, draft: false, body: nil)
 	}
 
 	@objc public func checkForUpdate(skippedVersion: String?, completion: @escaping (String?, String?, String?) -> Void) {
@@ -56,7 +56,7 @@ import Foundation
 						debugPrint("A new version is available")
 
 						if let skippedVersion = skippedVersion {
-							let skippedRelease = GitHubRelease(name: skippedVersion, prerelease: false, draft: false, body: nil)
+							let skippedRelease = GitHubRelease(tag_name: skippedVersion, prerelease: false, draft: false, body: nil)
 							if lastRelease <= skippedRelease {
 								debugPrint("Skip the new version")
 								DispatchQueue.main.async {
@@ -68,7 +68,7 @@ import Foundation
 						}
 
 						DispatchQueue.main.async {
-							completion(self.currentRelease.name, lastRelease.name, lastRelease.body)
+							completion(self.currentRelease.tag_name, lastRelease.tag_name, lastRelease.body)
 						}
 						return
 					} else {