From 57fb0516f1fd958ad87ee4fa3bb1addd3afe9ab8 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Wed, 7 Aug 2024 12:56:25 +0300 Subject: [PATCH] wip, fixed back DELETING --- hbs2-sync/src/HBS2/Sync/Prelude.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hbs2-sync/src/HBS2/Sync/Prelude.hs b/hbs2-sync/src/HBS2/Sync/Prelude.hs index 4144e229..d13dfe4a 100644 --- a/hbs2-sync/src/HBS2/Sync/Prelude.hs +++ b/hbs2-sync/src/HBS2/Sync/Prelude.hs @@ -488,7 +488,7 @@ runDirectory = do N (p,TombEntry e) -> do notice $ green "removed entry" <+> pretty p - D (p,e) _ | isTomb e -> do + D (p,e) _ -> do notice $ "locally deleted file" <+> pretty p tombs <- getTombs @@ -562,7 +562,8 @@ findDeleted = do -- TODO: check-if-non-latin-filenames-work -- resolved: ok seen <- Compact.keys tombs - <&> fmap BS8.unpack + <&> fmap (deserialiseOrFail @FilePath . LBS.fromStrict) + <&> rights S.toList_ do for_ seen $ \f0 -> do @@ -576,7 +577,7 @@ findDeleted = do when (not here && isJust n) do S.yield (D (f0, makeTomb now f0 Nothing) n) - debug $ "found deleted" <+> pretty n <+> pretty f0 + trace $ "found deleted" <+> pretty n <+> pretty f0 postEntryTx :: ( MonadUnliftIO m