From f6dd34ca817bdf38d7b8d79be3ed626a266e3232 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Jun 2023 18:52:19 -0400 Subject: [PATCH] sync content with import remotes This didn't used to be needed because importKeys would import all content and so doing another pass was redundant. But since 40017089f268391f79226592850b58855cdbf808 it uses importChanges, so only new files are imported. If a file that was already imported before was dropped, that would prevent sync --content from gettng its content again. Sponsored-by: Jack Hill on Patreon --- Command/Sync.hs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index 0b7a3a63ef..443092cb90 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -295,13 +295,16 @@ seek' o = do seekExportContent (Just o) (filter isExport contentremotes) - -- Sync content with remotes, but not with - -- export or import remotes, which handle content - -- syncing as part of export and import. + -- Sync content with remotes, including + -- with import remotes (since importing + -- only downloads new files not old files), + -- but not with export only remotes. + let shouldsynccontent r + | isExport r && not (isImport r) = False + | otherwise = True syncedcontent <- withbranch $ - seekSyncContent o $ filter - (\r -> not (isExport r || isImport r)) - contentremotes + seekSyncContent o + (filter shouldsynccontent contentremotes) -- Transferring content can take a while, -- and other changes can be pushed to the