mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

punt on LiveUpdate plumbing through assistant for now

Browse source
This commit is contained in:
Joey Hess 2024-08-24 09:37:24 -04:00
parent 1d51f18dd0
commit 18cd8bf43a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/Committer.hs
View file

@ -322,7 +322,7 @@ handleAdds lockdowndir havelsof largefilematcher annexdotfiles delayadd cs = ret
| not annexdotfiles && dotfile f =
return (Right change)
| otherwise =
ifM (liftAnnex $ checkFileMatcher largefilematcher f)
ifM (liftAnnex $ checkFileMatcher NoLiveUpdate largefilematcher f)
( return (Left change)
, return (Right change)
)
@ -395,7 +395,7 @@ handleAdds lockdowndir havelsof largefilematcher annexdotfiles delayadd cs = ret
return Nothing
done change file key = liftAnnex $ do
logStatus key InfoPresent
logStatus NoLiveUpdate key InfoPresent
mode <- liftIO $ catchMaybeIO $ fileMode <$> R.getFileStatus (toRawFilePath file)
stagePointerFile (toRawFilePath file) mode =<< hashPointerFile key
showEndOk

4
Assistant/Threads/TransferScanner.hs
View file

@ -171,9 +171,9 @@ expensiveScan urlrenderer rs = batch <~> do
"expensive scan found too many copies of object"
present key af (SeekInput []) [] callCommandAction
ts <- if present
then liftAnnex . filterM (wantGetBy True (Just key) af . Remote.uuid . fst)
then liftAnnex . filterM (wantGetBy NoLiveUpdate True (Just key) af . Remote.uuid . fst)
=<< use syncDataRemotes (genTransfer Upload False)
else ifM (liftAnnex $ wantGet True (Just key) af)
else ifM (liftAnnex $ wantGet NoLiveUpdate True (Just key) af)
( use downloadRemotes (genTransfer Download True) , return [] )
let unwanted' = S.difference unwanted slocs
return (unwanted', ts)