From 418fbf3f2f31bde154b8e8c89450443faa30d313 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Aug 2024 09:19:12 -0400 Subject: [PATCH] NoLiveExport for export and import While these do check preferred content, it would not make sense to use balanced preferred content with them. --- Command/Export.hs | 8 ++++---- Command/Import.hs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Command/Export.hs b/Command/Export.hs index 3419dd1d81..ebbcb51ea8 100644 --- a/Command/Export.hs +++ b/Command/Export.hs @@ -385,7 +385,7 @@ cleanupExport :: Remote -> ExportHandle -> Key -> ExportLocation -> Bool -> Comm cleanupExport r db ek loc sent = do liftIO $ addExportedLocation db ek loc when (sent && not (isGitShaKey ek)) $ - logChange ek (uuid r) InfoPresent + logChange NoLiveUpdate ek (uuid r) InfoPresent return True startUnexport :: Remote -> ExportHandle -> TopFilePath -> [Git.Sha] -> CommandStart @@ -436,9 +436,9 @@ cleanupUnexport r db eks loc = do if annexObjects (Remote.config r) then tryNonAsync (checkPresent r ek) >>= \case Right False -> - logChange ek (uuid r) InfoMissing + logChange NoLiveUpdate ek (uuid r) InfoMissing _ -> noop - else logChange ek (uuid r) InfoMissing + else logChange NoLiveUpdate ek (uuid r) InfoMissing removeEmptyDirectories r db loc eks @@ -618,7 +618,7 @@ filterExport r tree = logExportExcluded (uuid r) $ \logwriter -> do , providedMimeEncoding = Nothing , providedLinkType = Nothing } - ifM (checkMatcher' matcher mi mempty) + ifM (checkMatcher' matcher mi NoLiveUpdate mempty) ( return (Just ti) , excluded ) diff --git a/Command/Import.hs b/Command/Import.hs index 05dd07105b..c7496aeebf 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -256,7 +256,7 @@ startLocal o addunlockedmatcher largematcher mode (srcfile, destfile) = , inodeCache = newcache } } - ifM (checkFileMatcher largematcher destfile) + ifM (checkFileMatcher NoLiveUpdate largematcher destfile) ( ingestAdd' nullMeterUpdate (Just ld') (Just k) >>= maybe stop