Skip to content

Commit

Permalink
#297 Eliminate many false positives in through brew update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mangerlahn
mangerlahn committed Dec 3, 2023
1 parent 3377b73 commit 20bf131
Show file tree
Hide file tree
Showing 12 changed files with 691 additions and 320 deletions.
32 changes: 28 additions & 4 deletions Latest.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
50D6EF5F281461A3002D7006 /* Sparkle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50D6EF5E281461A3002D7006 /* Sparkle.swift */; };
50DAEF4021047E5100B32E8A /* UpdateTableView+TouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DAEF3F21047E5100B32E8A /* UpdateTableView+TouchBar.swift */; };
50DAEF4421047FA900B32E8A /* UpdateItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DAEF4321047FA900B32E8A /* UpdateItemView.swift */; };
50E4EB072B17DACB00A70A7D /* VersionParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E4EB062B17DACB00A70A7D /* VersionParser.swift */; };
50E4EB092B17DFCE00A70A7D /* VersionParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E4EB082B17DFCE00A70A7D /* VersionParserTest.swift */; };
50FEB87D2B1BE630006FB75D /* OSVersionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FEB87C2B1BE630006FB75D /* OSVersionTest.swift */; };
50FEB87F2B1BE67F006FB75D /* VersionSanitizationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FEB87E2B1BE67E006FB75D /* VersionSanitizationTest.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -244,6 +248,8 @@
50D6EF5E281461A3002D7006 /* Sparkle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sparkle.swift; sourceTree = "<group>"; };
50DAEF3F21047E5100B32E8A /* UpdateTableView+TouchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UpdateTableView+TouchBar.swift"; sourceTree = "<group>"; };
50DAEF4321047FA900B32E8A /* UpdateItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateItemView.swift; sourceTree = "<group>"; };
50E4EB062B17DACB00A70A7D /* VersionParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionParser.swift; sourceTree = "<group>"; };
50E4EB082B17DFCE00A70A7D /* VersionParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionParserTest.swift; sourceTree = "<group>"; };
50E65CDD247A84BC00DFEB47 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Main.strings; sourceTree = "<group>"; };
50E65CDE247A84E700DFEB47 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fr; path = fr.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
50E65CE0247A84F300DFEB47 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -275,6 +281,8 @@
50F542FA22D9C41D004B3F8D /* ISAuthenticationContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISAuthenticationContext.h; sourceTree = "<group>"; };
50F542FB22D9C41D004B3F8D /* SSPurchase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSPurchase.h; sourceTree = "<group>"; };
50F542FC22D9C41D004B3F8D /* ISStoreClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISStoreClient.h; sourceTree = "<group>"; };
50FEB87C2B1BE630006FB75D /* OSVersionTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSVersionTest.swift; sourceTree = "<group>"; };
50FEB87E2B1BE67E006FB75D /* VersionSanitizationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionSanitizationTest.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -410,7 +418,6 @@
509C4ABB2AD1FFCC00E9C2E1 /* FailableDecodable.swift */,
5097354F2798D17E00FFE809 /* Observable.swift */,
5039DE8A22CA39ED0088B39B /* StatefulOperation.swift */,
509512101FF362A1003D2D7F /* Version.swift */,
);
path = Utilities;
sourceTree = "<group>";
Expand Down Expand Up @@ -468,6 +475,7 @@
509512251FF3631D003D2D7F /* UpdateCheckCoordinator.swift */,
50BEF14D2AC972B40052C417 /* UpdateRepository.swift */,
50366E5127DFD14100D4E247 /* Source.swift */,
50E4EB052B17DAB900A70A7D /* Version */,
5039DE8322CA39630088B39B /* Updater */,
509512231FF36306003D2D7F /* Update Checker Extensions */,
50D6EF5D2814618C002D7006 /* Sparkle */,
Expand Down Expand Up @@ -524,7 +532,10 @@
isa = PBXGroup;
children = (
50C81D6D1FBADC5900324C2E /* Info.plist */,
50FEB87C2B1BE630006FB75D /* OSVersionTest.swift */,
50C81D731FBADC9100324C2E /* VersionTest.swift */,
50E4EB082B17DFCE00A70A7D /* VersionParserTest.swift */,
50FEB87E2B1BE67E006FB75D /* VersionSanitizationTest.swift */,
);
path = Tests;
sourceTree = "<group>";
Expand Down Expand Up @@ -568,6 +579,15 @@
path = Views;
sourceTree = "<group>";
};
50E4EB052B17DAB900A70A7D /* Version */ = {
isa = PBXGroup;
children = (
509512101FF362A1003D2D7F /* Version.swift */,
50E4EB062B17DACB00A70A7D /* VersionParser.swift */,
);
path = Version;
sourceTree = "<group>";
};
50F542DF22D9C41C004B3F8D /* CommerceKit */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -657,7 +677,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = "";
LastSwiftUpdateCheck = 0920;
LastSwiftUpdateCheck = 1510;
LastUpgradeCheck = 1410;
ORGANIZATIONNAME = "Max Langer";
TargetAttributes = {
Expand Down Expand Up @@ -798,6 +818,7 @@
5040D45C28DBB753009BF379 /* HomebrewCheckerOperation.swift in Sources */,
509512341FF36380003D2D7F /* UpdateTableViewController.swift in Sources */,
50C9F10C234641E000FD1802 /* SparkleCheckerOperation.swift in Sources */,
50E4EB072B17DACB00A70A7D /* VersionParser.swift in Sources */,
50290E751E53EB6A00133E3D /* AppDelegate.swift in Sources */,
5039DE8D22CAA2790088B39B /* MacAppStoreUpdateOperation.swift in Sources */,
507375572789AB0300F371D8 /* AppListSnapshot.swift in Sources */,
Expand Down Expand Up @@ -836,6 +857,9 @@
buildActionMask = 2147483647;
files = (
50C81D741FBADC9100324C2E /* VersionTest.swift in Sources */,
50FEB87D2B1BE630006FB75D /* OSVersionTest.swift in Sources */,
50FEB87F2B1BE67F006FB75D /* VersionSanitizationTest.swift in Sources */,
50E4EB092B17DFCE00A70A7D /* VersionParserTest.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1204,7 +1228,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.max-langer.Latest-Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Latest.app/Contents/MacOS/Latest";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Latest.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Latest";
};
name = Debug;
};
Expand All @@ -1231,7 +1255,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.max-langer.Latest-Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Latest.app/Contents/MacOS/Latest";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Latest.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Latest";
};
name = Release;
};
Expand Down
16 changes: 15 additions & 1 deletion Latest/Model/App.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class App {
/// Initializes the app with the given parameters.
init(bundle: App.Bundle, update: Result<Update, Error>?, isIgnored: Bool) {
self.bundle = bundle
self.updateResult = update
self.updateResult = Self.sanitize(update: update, for: bundle)
self.isIgnored = isIgnored
}

Expand All @@ -40,6 +40,20 @@ class App {
return App(bundle: self.bundle, update: self.updateResult, isIgnored: ignoredState)
}


// MARK: - Sanitization

/// Sanitizes the update result for the given app bundle.
///
/// Used to clean up version information based on information provided by the app bundle.
private static func sanitize(update: Result<Update, Error>?, for bundle: App.Bundle) -> Result<Update, Error>? {
guard let update = try? update?.get() else {
return update
}

return .success(update.sanitized(for: bundle))
}

}

/// Convenience access to underlying properties.
Expand Down
2 changes: 1 addition & 1 deletion Latest/Model/AppLibrary.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class AppLibrary {
}

// Create bundle
let version = Version(versionNumber: versionNumber, buildNumber: buildNumber)
let version = Version(versionNumber: VersionParser.parse(versionNumber: versionNumber), buildNumber: VersionParser.parse(buildNumber: buildNumber))
return App.Bundle(version: version, name: name, bundleIdentifier: identifier, fileURL: url, source: source)
}

Expand Down
14 changes: 13 additions & 1 deletion Latest/Model/Update.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extension App {

/// Whether an update is available for the given app.
var updateAvailable: Bool {
var updateAvailable = (remoteVersion > app.version)
var updateAvailable = app.version < remoteVersion

if updateAvailable, let minimumOSVersion {
updateAvailable = ProcessInfo.processInfo.isOperatingSystemAtLeast(minimumOSVersion)
Expand Down Expand Up @@ -95,6 +95,18 @@ extension App {
}


// MARK: - Sanitization

/// Returns a sanitized update for the given app bundle.
func sanitized(for bundle: App.Bundle) -> Update {
let version = remoteVersion.sanitize(with: bundle.version)
guard version != remoteVersion else { return self }

// Modify just the remote version
return Update(app: app, remoteVersion: version, minimumOSVersion: minimumOSVersion, source: source, date: date, releaseNotes: releaseNotes, updateAction: updateAction)
}


// MARK: - Equatable

/// Compares the equality of UpdateInfo objects
Expand Down
9 changes: 1 addition & 8 deletions Latest/Model/UpdateRepository.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,7 @@ extension UpdateRepository {

/// The current version of the app.
var version: Version {
// Split raw version into components to separate out the version and build number
let versionComponents = rawVersion.split(separator: ",")

var components = versionComponents.map { String($0) }
let version = !components.isEmpty ? components.removeFirst() : nil
let buildNumber = !components.isEmpty ? components.removeFirst() : nil

return Version(versionNumber: version, buildNumber: buildNumber)
return VersionParser.parse(combinedVersionNumber: rawVersion)
}

}
Expand Down
Loading

0 comments on commit 20bf131

Please sign in to comment.