Skip to content

[WIP] Update progress tracking function for zipping and uploading #143

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

Closed
Copilot wants to merge 2 commits into from
Closed

[WIP] Update progress tracking function for zipping and uploading #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7f511
Initial plan
Copilot Jan 22, 2026
930e3b4
Refactor formatProgressLog to accept options object instead of tightl…
Copilot Jan 22, 2026
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
53 changes: 39 additions & 14 deletions src/utils/query/useShip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,23 @@ interface ShipOptions {
shipFlags?: ShipGameFlags // If provided, will override command flags
}

function formatProgressLog(
label: string,
data: {progress: number; elapsedSeconds: number; speedMBps: number; [key: string]: any},
bytesKey: 'writtenBytes' | 'loadedBytes',
totalKey: 'estimatedTotalBytes' | 'totalBytes',
isEstimated = false,
): string {
const elapsed = data.elapsedSeconds.toFixed(1)
const transferredMB = (data[bytesKey] / 1024 / 1024).toFixed(2)
const totalMB = (data[totalKey] / 1024 / 1024).toFixed(2)
const progressPercent = Math.round(data.progress * 100)
const speed = data.speedMBps.toFixed(2)
interface FormatProgressOptions {
elapsedSeconds: number
isEstimated?: boolean
label: string
progress: number
speedMBps: number
totalBytes: number
transferredBytes: number
}

function formatProgressLog(options: FormatProgressOptions): string {
const {elapsedSeconds, isEstimated = false, label, progress, speedMBps, totalBytes, transferredBytes} = options
const elapsed = elapsedSeconds.toFixed(1)
const transferredMB = (transferredBytes / 1024 / 1024).toFixed(2)
const totalMB = (totalBytes / 1024 / 1024).toFixed(2)
const progressPercent = Math.round(progress * 100)
const speed = speedMBps.toFixed(2)
const totalPrefix = isEstimated ? '~' : ''
return `${label}: ${progressPercent}% (${transferredMB}MB / ${totalPrefix}${totalMB}MB) - ${elapsed}s - ${speed}MB/s`
}
Expand Down Expand Up @@ -73,7 +78,17 @@ export async function ship({command, log = () => {}, shipFlags}: ShipOptions): P
files,
outputPath: tmpZipFile,
onProgress: (data) => {
log(formatProgressLog('Zipping', data, 'writtenBytes', 'estimatedTotalBytes', true))
log(
formatProgressLog({
elapsedSeconds: data.elapsedSeconds,
isEstimated: true,
label: 'Zipping',
progress: data.progress,
speedMBps: data.speedMBps,
totalBytes: data.estimatedTotalBytes,
transferredBytes: data.writtenBytes,
}),
)
},
})

Expand All @@ -90,7 +105,17 @@ export async function ship({command, log = () => {}, shipFlags}: ShipOptions): P
zipStream,
zipSize: size,
onProgress: (data) => {
log(formatProgressLog('Uploading', data, 'loadedBytes', 'totalBytes', false))
log(
formatProgressLog({
elapsedSeconds: data.elapsedSeconds,
isEstimated: false,
label: 'Uploading',
progress: data.progress,
speedMBps: data.speedMBps,
totalBytes: data.totalBytes,
transferredBytes: data.loadedBytes,
}),
)
},
})

Expand Down