Skip to content

Fix analytics stats by using Homebrew API #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wickenico wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix analytics stats by using Homebrew API #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions Pearcleaner/Logic/Brew/HomebrewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,16 +988,19 @@ class HomebrewController: ObservableObject {

let data: Data

// Check local cache first (Homebrew's cache)
if FileManager.default.fileExists(atPath: cacheFile.path) {
data = try Data(contentsOf: cacheFile)
} else {
// Fetch from API (Homebrew will cache it automatically)
// Prefer official API for up-to-date analytics; fall back to cache only if needed.
do {
let url = cask ?
URL(string: "https://formulae.brew.sh/api/cask/\(name).json")! :
URL(string: "https://formulae.brew.sh/api/formula/\(name).json")!

(data, _) = try await URLSession.shared.data(from: url)
} catch {
if FileManager.default.fileExists(atPath: cacheFile.path) {
data = try Data(contentsOf: cacheFile)
} else {
throw error
}
}

guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any],
Expand All @@ -1008,9 +1011,9 @@ class HomebrewController: ObservableObject {
if cask {
// Cask: simpler structure {"install": {"30d": {"name": 123}}}
let install = analytics["install"] as? [String: Any]
let install30d = (install?["30d"] as? [String: Int])?.values.first
let install90d = (install?["90d"] as? [String: Int])?.values.first
let install365d = (install?["365d"] as? [String: Int])?.values.first
let install30d = (install?["30d"] as? [String: Int])?[name] ?? (install?["30d"] as? [String: Int])?.values.first
let install90d = (install?["90d"] as? [String: Int])?[name] ?? (install?["90d"] as? [String: Int])?.values.first
let install365d = (install?["365d"] as? [String: Int])?[name] ?? (install?["365d"] as? [String: Int])?.values.first

return HomebrewAnalytics(
install30d: install30d,
Expand All @@ -1020,9 +1023,9 @@ class HomebrewController: ObservableObject {
} else {
// Formula: only fetch install counts (not install_on_request or build_error)
let install = analytics["install"] as? [String: Any]
let install30d = (install?["30d"] as? [String: Int])?.values.reduce(0, +)
let install90d = (install?["90d"] as? [String: Int])?.values.reduce(0, +)
let install365d = (install?["365d"] as? [String: Int])?.values.reduce(0, +)
let install30d = (install?["30d"] as? [String: Int])?[name] ?? (install?["30d"] as? [String: Int])?.values.reduce(0, +)
let install90d = (install?["90d"] as? [String: Int])?[name] ?? (install?["90d"] as? [String: Int])?.values.reduce(0, +)
let install365d = (install?["365d"] as? [String: Int])?[name] ?? (install?["365d"] as? [String: Int])?.values.reduce(0, +)

return HomebrewAnalytics(
install30d: install30d,
Expand Down
4 changes: 3 additions & 1 deletion Pearcleaner/Views/Brew/SearchInstallSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,8 +1167,10 @@ struct PackageDetailsDrawer: View {
Task {
isLoadingAnalytics = true
do {
// Use short name for API endpoints (strip tap prefix if present)
let shortName = package.name.components(separatedBy: "/").last ?? package.name
analytics = try await HomebrewController.shared.getAnalytics(
name: package.name,
name: shortName,
cask: isCask
)
} catch {
Expand Down