voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip, file deleting works?

This commit is contained in:
Dmitry Zuikov 2024-08-06 09:59:20 +03:00
parent 3299361b9f
commit 93289b6e58
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbs2-sync/src/HBS2/Sync/Prelude.hs
View File

@ -482,7 +482,7 @@ runDirectory = do
D (p,e) n -> do D (p,e) n -> do
notice $ "locally deleted file" <+> pretty p notice $ "locally deleted file" <+> pretty p
when (n < Just 1) do when (n < Just 2) do
tombs <- getTombs tombs <- getTombs
postEntryTx refchan path e postEntryTx refchan path e
Compact.put tombs (fromString p) (LBS.toStrict $ serialise $ maybe 0 succ n) Compact.put tombs (fromString p) (LBS.toStrict $ serialise $ maybe 0 succ n)
@ -679,7 +679,7 @@ mergeState :: MonadUnliftIO m
mergeState seed orig = do mergeState seed orig = do
let deleted = [ (p,d) | d@(D (p,e) Nothing) <- seed, isTomb e ] & Map.fromList let deleted = [ (p,d) | d@(D (p,e) c) <- seed, isTomb e, c < Just 1 ] & Map.fromList
let dirs = [ (p,e) | (p,e) <- orig, isDir e ] & Map.fromListWith merge let dirs = [ (p,e) | (p,e) <- orig, isDir e ] & Map.fromListWith merge