implement URL to VURL migration
This needs the content to be present in order to hash it. But it's not possible for a module used by Backend.URL to call inAnnex because that would entail a dependency loop. So instead, rely on the fact that Command.Migrate calls inAnnex before performing a migration. But, Command.ExamineKey calls fastMigrate and the key may or may not exist, and it's not wanting to actually perform a migration in any case. To handle that, had to add an additional value to fastMigrate to indicate whether the content is inAnnex. Factored generateEquivilantKey out of Remote.Web. Note that migrateFromURLToVURL hardcodes use of the SHA256E backend. It would have been difficult not to, given all the dependency loop issues. But --backend and annex.backend are used to tell git-annex migrate to use VURL in any case, so there's no config knob that the user could expect to configure that. Sponsored-by: Brock Spratlen on Patreon
This commit is contained in:
parent
2b5ba03c01
commit
e7652b0997
14 changed files with 82 additions and 34 deletions
|
@ -12,7 +12,6 @@ import Types.Remote
|
|||
import Types.ProposedAccepted
|
||||
import Types.Creds
|
||||
import Types.Key
|
||||
import Types.KeySource
|
||||
import Remote.Helper.Special
|
||||
import Remote.Helper.ExportImport
|
||||
import qualified Git
|
||||
|
@ -31,7 +30,7 @@ import Annex.SpecialRemote.Config
|
|||
import Logs.Remote
|
||||
import Logs.EquivilantKeys
|
||||
import Backend
|
||||
import Backend.Hash (descChecksum)
|
||||
import Backend.VURL.Utilities (generateEquivilantKey)
|
||||
|
||||
import qualified Data.Map as M
|
||||
|
||||
|
@ -175,17 +174,12 @@ downloadKey urlincludeexclude key _af dest p vc =
|
|||
let b = if isCryptographicallySecure db
|
||||
then db
|
||||
else defaultHashBackend
|
||||
showSideAction (UnquotedString descChecksum)
|
||||
(hashk, _) <- genKey ks nullMeterUpdate b
|
||||
unless (hashk `elem` eks) $
|
||||
setEquivilantKey key hashk
|
||||
return (Just Verified)
|
||||
where
|
||||
ks = KeySource
|
||||
{ keyFilename = mempty -- avoid adding any extension
|
||||
, contentLocation = toRawFilePath dest
|
||||
, inodeCache = Nothing
|
||||
}
|
||||
generateEquivilantKey b (toRawFilePath dest) >>= \case
|
||||
Nothing -> return Nothing
|
||||
Just ek -> do
|
||||
unless (ek `elem` eks) $
|
||||
setEquivilantKey key ek
|
||||
return (Just Verified)
|
||||
|
||||
uploadKey :: Key -> AssociatedFile -> MeterUpdate -> Annex ()
|
||||
uploadKey _ _ _ = giveup "upload to web not supported"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue