sjs/gh-XcodesOrg-XcodesApp
1
0
Fork 0
mirror of https://github.com/XcodesOrg/XcodesApp.git synced 2026-03-25 08:55:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adds a DownloadFileSize when using Apple Data Source

Browse source
This commit is contained in:
Matt Kiazyk 2021-02-01 21:18:49 -06:00
parent aa9c73a82c
commit b53c480764
No known key found for this signature in database
GPG key ID: 967DBC53389132D7
8 changed files with 67 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Xcodes.xcodeproj/project.pbxproj
View file

@ -100,6 +100,7 @@
CAFE4ABC25B7D54B0064FE51 /* UpdatesPreferencePane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */; };
CAFFFED8259CDA5000903F81 /* XcodeListViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */; };
E8977EA325C11E1500835F80 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8977EA225C11E1500835F80 /* PreferencesView.swift */; };
E8C891DA25C8DC6D00F1D3C4 /* Double+formatBytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8C891D925C8DC6D00F1D3C4 /* Double+formatBytes.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -261,6 +262,7 @@
CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeListViewRow.swift; sourceTree = "<group>"; };
CAFFFEEE259CEAC400903F81 /* RingProgressViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RingProgressViewStyle.swift; sourceTree = "<group>"; };
E8977EA225C11E1500835F80 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
E8C891D925C8DC6D00F1D3C4 /* Double+formatBytes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Double+formatBytes.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -411,6 +413,7 @@
CABFAA482593162500380FEE /* Bundle+InfoPlistValues.swift */,
CA9FF87A2595293E00E47BAF /* DataSource.swift */,
CABFA9BA2592EEEA00380FEE /* DateFormatter+.swift */,
E8C891D925C8DC6D00F1D3C4 /* Double+formatBytes.swift */,
CABFA9B92592EEEA00380FEE /* Downloads.swift */,
CAA858C325A2BE4E00ACF8C0 /* Downloader.swift */,
CABFA9B22592EEEA00380FEE /* Entry+.swift */,
@ -792,6 +795,7 @@
CABFA9C72592EEEA00380FEE /* Entry+.swift in Sources */,
CAE424B4259A764700B8B246 /* AppState+Install.swift in Sources */,
CAE42487259A68A300B8B246 /* XcodeListCategory.swift in Sources */,
E8C891DA25C8DC6D00F1D3C4 /* Double+formatBytes.swift in Sources */,
CAA858C425A2BE4E00ACF8C0 /* Downloader.swift in Sources */,
E8977EA325C11E1500835F80 /* PreferencesView.swift in Sources */,
CA9FF87B2595293E00E47BAF /* DataSource.swift in Sources */,

2
Xcodes/Backend/AppState+Update.swift
View file

@ -133,7 +133,7 @@ extension AppState {
else { return nil }
let url = urlPrefix.appendingPathComponent(xcodeFile.remotePath)
return AvailableXcode(version: version, url: url, filename: String(xcodeFile.remotePath.suffix(fromLast: "/")), releaseDate: download.dateModified)
return AvailableXcode(version: version, url: url, filename: String(xcodeFile.remotePath.suffix(fromLast: "/")), releaseDate: download.dateModified, fileSize: xcodeFile.fileSize)
}
return xcodes
}

3
Xcodes/Backend/AppState.swift
View file

@ -459,7 +459,8 @@ class AppState: ObservableObject {
requiredMacOSVersion: availableXcode.requiredMacOSVersion,
releaseNotesURL: availableXcode.releaseNotesURL,
sdks: availableXcode.sdks,
compilers: availableXcode.compilers
compilers: availableXcode.compilers,
downloadFileSize: availableXcode.fileSize
)
}

5
Xcodes/Backend/AvailableXcode.swift
View file

@ -13,6 +13,7 @@ public struct AvailableXcode: Codable {
public let releaseNotesURL: URL?
public let sdks: SDKs?
public let compilers: Compilers?
public let fileSize: Double?
public init(
version: Version,
@ -22,7 +23,8 @@ public struct AvailableXcode: Codable {
requiredMacOSVersion: String? = nil,
releaseNotesURL: URL? = nil,
sdks: SDKs? = nil,
compilers: Compilers? = nil
compilers: Compilers? = nil,
fileSize: Double? = nil
) {
self.version = version
self.url = url
@ -32,5 +34,6 @@ public struct AvailableXcode: Codable {
self.releaseNotesURL = releaseNotesURL
self.sdks = sdks
self.compilers = compilers
self.fileSize = fileSize
}
}

24
Xcodes/Backend/Double+formatBytes.swift Normal file
View file

@ -0,0 +1,24 @@
import Foundation
extension Double {
func formatAsString() -> String {
guard self > 0 else {
return "0 bytes"
}
// Adapted from http://stackoverflow.com/a/18650828
let suffixes = ["bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
let k: Double = 1000
let i = floor(log(self) / log(k))
// Format number with thousands separator and everything below 1 GB with no decimal places.
let numberFormatter = NumberFormatter()
numberFormatter.maximumFractionDigits = i < 3 ? 0 : 1
numberFormatter.numberStyle = .decimal
let numberString = numberFormatter.string(from: NSNumber(value: self / pow(k, i))) ?? "Unknown"
let suffix = suffixes[Int(i)]
return "\(numberString) \(suffix)"
}
}

1
Xcodes/Backend/Downloads.swift
View file

@ -13,5 +13,6 @@ public struct Download: Codable {
public struct File: Codable {
public let remotePath: String
public let fileSize: Double
}
}

9
Xcodes/Backend/Xcode.swift
View file

@ -13,6 +13,7 @@ struct Xcode: Identifiable, CustomStringConvertible {
let releaseNotesURL: URL?
let sdks: SDKs?
let compilers: Compilers?
let downloadFileSize: Double?
init(
version: Version,
@ -22,7 +23,8 @@ struct Xcode: Identifiable, CustomStringConvertible {
requiredMacOSVersion: String? = nil,
releaseNotesURL: URL? = nil,
sdks: SDKs? = nil,
compilers: Compilers? = nil
compilers: Compilers? = nil,
downloadFileSize: Double? = nil
) {
self.version = version
self.installState = installState
@ -32,6 +34,7 @@ struct Xcode: Identifiable, CustomStringConvertible {
self.releaseNotesURL = releaseNotesURL
self.sdks = sdks
self.compilers = compilers
self.downloadFileSize = downloadFileSize
}
var id: Version { version }
@ -39,4 +42,8 @@ struct Xcode: Identifiable, CustomStringConvertible {
var description: String {
version.appleDescription
}
var downloadFileSizeString: String? {
return downloadFileSize?.formatAsString()
}
}

25
Xcodes/Frontend/XcodeList/InfoPane.swift
View file

@ -56,7 +56,8 @@ struct InfoPane: View {
compatibility(for: xcode)
sdks(for: xcode)
compilers(for: xcode)
downloadFileSize(for: xcode)
Spacer()
}
} else {
@ -162,6 +163,24 @@ struct InfoPane: View {
}
}
@ViewBuilder
private func downloadFileSize(for xcode: Xcode) -> some View {
// if we've downloaded it no need to show the download size
if let downloadFileSize = xcode.downloadFileSizeString, case .notInstalled = xcode.installState {
VStack(alignment: .leading) {
Text("Download Size")
.font(.headline)
.frame(maxWidth: .infinity, alignment: .leading)
Text("\(downloadFileSize)")
.font(.subheadline)
.frame(maxWidth: .infinity, alignment: .leading)
}
} else {
EmptyView()
}
}
@ViewBuilder
private var empty: some View {
VStack {
@ -199,7 +218,9 @@ struct InfoPane_Previews: PreviewProvider {
llvm: .init(number: "2.3"),
clang: .init(number: "7.3"),
swift: .init(number: "5.3.2")
))
),
downloadFileSize: 242342424
)
]
})
.previewDisplayName("Populated, Installed, Selected")