Commit1950779

committed

remove max size

1 parent97b461f commit1950779Copy full SHA for 1950779

File tree

2 files changed

-18

lines changed

Coder-Desktop
- Coder-Desktop/Views/FileSync
  - FileSyncConfig.swift
- VPNLib/FileSync
  - FileSyncSession.swift

2 files changed

-18

lines changed

`‎Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ struct FileSyncConfig<VPN: VPNService, FS: FileSyncDaemon>: View {`
`24`	`24`	`.width(min:100, ideal:120)`
`25`	`25`	`TableColumn("Status"){ $0.status.column.help($0.statusAndErrors)}`
`26`	`26`	`.width(min:80, ideal:100)`
`27`		`-TableColumn("Size"){Text($0.maxSize.humanSizeBytes).help($0.sizeDescription)}`
	`27`	`+TableColumn("Size"){Text($0.localSize.humanSizeBytes).help($0.sizeDescription)}`
`28`	`28`	`.width(min:60, ideal:80)`
`29`	`29`	`}`
`30`	`30`	`.contextMenu(forSelectionType:FileSyncSession.ID.self, menu:{ _in},`

`‎Coder-Desktop/VPNLib/FileSync/FileSyncSession.swift`

Lines changed: 3 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ public struct FileSyncSession: Identifiable {`
`9`	`9`	`publicletbetaPath:String`
`10`	`10`	`publicletstatus:FileSyncStatus`
`11`	`11`
`12`		`-publicletmaxSize:FileSyncSessionEndpointSize`
`13`	`12`	`publicletlocalSize:FileSyncSessionEndpointSize`
`14`	`13`	`publicletremoteSize:FileSyncSessionEndpointSize`
`15`	`14`
`@@ -25,14 +24,14 @@ public struct FileSyncSession: Identifiable {`
`25`	`24`	`}else{`
`26`	`25`	`"Unknown"`
`27`	`26`	`}`
`28`		`-if state.session.beta.protocol==Url_Protocol.ssh, !state.session.beta.host.isEmpty{`
	`27`	`+agentHost=if state.session.beta.protocol==Url_Protocol.ssh, !state.session.beta.host.isEmpty{`
`29`	`28`	`// TOOD: We need to either:`
`30`	`29`	`// - make this compatible with custom suffixes`
`31`	`30`	`// - always strip the tld`
`32`	`31`	`// - always keep the tld`
`33`		`-agentHost=state.session.beta.host`
	`32`	`+ state.session.beta.host`
`34`	`33`	`}else{`
`35`		`-agentHost="Unknown"`
	`34`	`+"Unknown"`
`36`	`35`	`}`
`37`	`36`	`betaPath=if !state.session.beta.path.isEmpty{`
`38`	`37`	`state.session.beta.path`
`@@ -64,7 +63,6 @@ public struct FileSyncSession: Identifiable {`
`64`	`63`	`dirCount: state.betaState.directories,`
`65`	`64`	`symLinkCount: state.betaState.symbolicLinks`
`66`	`65`	`)`
`67`		`- maxSize= localSize.maxOf(other: remoteSize)`
`68`	`66`
`69`	`67`	`errors=accumulateErrors(from: state)`
`70`	`68`	`}`
`@@ -77,9 +75,6 @@ public struct FileSyncSession: Identifiable {`
`77`	`75`
`78`	`76`	`publicvarsizeDescription:String{`
`79`	`77`	`varout=""`
`80`		`-if localSize!= remoteSize{`
`81`		`- out+="Maximum:\n\(maxSize.description(linePrefix:""))\n\n"`
`82`		`-}`
`83`	`78`	`out+="Local:\n\(localSize.description(linePrefix:""))\n\n"`
`84`	`79`	`out+="Remote:\n\(remoteSize.description(linePrefix:""))"`
`85`	`80`	`return out`
`@@ -99,15 +94,6 @@ public struct FileSyncSessionEndpointSize: Equatable {`
`99`	`94`	`self.symLinkCount= symLinkCount`
`100`	`95`	`}`
`101`	`96`
`102`		`-func maxOf(other:FileSyncSessionEndpointSize)->FileSyncSessionEndpointSize{`
`103`		`-FileSyncSessionEndpointSize(`
`104`		`- sizeBytes:max(sizeBytes, other.sizeBytes),`
`105`		`- fileCount:max(fileCount, other.fileCount),`
`106`		`- dirCount:max(dirCount, other.dirCount),`
`107`		`- symLinkCount:max(symLinkCount, other.symLinkCount)`
`108`		`-)`
`109`		`-}`
`110`		`-`
`111`	`97`	`publicvarhumanSizeBytes:String{`
`112`	`98`	`humanReadableBytes(sizeBytes)`
`113`	`99`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1950779

File tree

2 files changed

2 files changed

`‎Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift`

`‎Coder-Desktop/VPNLib/FileSync/FileSyncSession.swift`

0 commit comments