unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-05 06:07:21 +03:00
Code Issues Projects Releases Wiki Activity

Report correct number of downloaded entities

Browse Source
This commit is contained in:
Travis Staton 2022-06-21 16:38:04 -04:00
parent f461e73f49
commit 364799386e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unison-cli/src/Unison/Share/Sync.hs
View File

@ -346,23 +346,23 @@ pull httpClient unisonShareUrl conn repoPath downloadProgressCallback = catchSyn
Right Nothing -> pure (Left (PullErrorNoHistoryAtPath repoPath))
Right (Just hashJwt) -> do
let hash = Share.hashJWTHash hashJwt
(maybeTempEntities, downloadedSoFar) <-
(maybeTempEntities, downloaded1) <-
Sqlite.runTransaction conn (Q.entityLocation hash) >>= \case
Just Q.EntityInMainStorage -> pure (Nothing, 0)
Just Q.EntityInTempStorage -> pure (Just (NESet.singleton hash), 0)
Nothing -> do
tempEntities <- doDownload (NESet.singleton hashJwt)
pure (tempEntities, 1)
downloadedTotal <-
downloaded2 <-
case maybeTempEntities of
Nothing -> pure downloadedSoFar
Nothing -> pure 0
Just tempEntities -> do
completeTempEntities
doDownload
conn
(\downloaded enqueued -> downloadProgressCallback (downloaded + downloadedSoFar) enqueued)
(\downloaded enqueued -> downloadProgressCallback (downloaded + downloaded1) enqueued)
tempEntities
downloadProgressCallback downloadedTotal 0
downloadProgressCallback (downloaded1 + downloaded2) 0
pure (Right (hash32ToCausalHash hash))
where
repoName = Share.pathRepoName repoPath