Skip to content

Commit b858849

Browse files
committed
Merge branch 'main.installed-as-dependency-error-fix'
2 parents ad5b8fa + b6f8f60 commit b858849

1 file changed

Lines changed: 21 additions & 4 deletions

File tree

Modules/Packages/PackagesModels/Logic/Packages/Load Up Package Info.swift

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77

88
import CorkShared
9-
import Foundation
109
import CorkTerminalFunctions
10+
import Foundation
1111

1212
enum BrewPackageInfoLoadingError: LocalizedError
1313
{
@@ -56,7 +56,24 @@ extension BrewPackage
5656

5757
struct Installed: Codable
5858
{
59-
let installedAsDependency: Bool
59+
/// Backwards compatibility before `installedOnRequest` was added
60+
let installedAsDependency: Bool?
61+
62+
/// ``true`` when **NOT** a dependency, ``false`` **WHEN** a dependency
63+
let installedOnRequest: Bool?
64+
65+
var isDependencyOfAnotherPackage: Bool
66+
{
67+
if let installedOnRequest = installedOnRequest
68+
{
69+
return !installedOnRequest
70+
}
71+
if let installedAsDependency = installedAsDependency
72+
{
73+
return installedAsDependency
74+
}
75+
return false
76+
}
6077

6178
struct RuntimeDependencies: Codable
6279
{
@@ -177,7 +194,7 @@ extension BrewPackage
177194

178195
/// Whether the cask was installed as dependency
179196
/// Always false, since Casks can't have dependencies or be dependants
180-
let installedAsDependency: Bool = false
197+
let isDependencyOfAnotherPackage: Bool = false
181198

182199
/// Whether the cas is outdated
183200
let outdated: Bool
@@ -335,7 +352,7 @@ extension BrewPackage
335352
description: formulaInfo.desc,
336353
homepage: formulaInfo.homepage,
337354
tap: .init(name: formulaInfo.tap),
338-
installedAsDependency: formulaInfo.installed.first?.installedAsDependency ?? false,
355+
installedAsDependency: formulaInfo.installed.first?.isDependencyOfAnotherPackage ?? false,
339356
dependencies: formulaInfo.extractDependencies(),
340357
outdated: formulaInfo.outdated,
341358
caveats: formulaInfo.caveats,

0 commit comments

Comments
 (0)