convert KeySource to RawFilePath

Command/AddUrl.hs

@@ -367,8 +367,8 @@ finishDownloadWith :: AddUnlockedMatcher -> FilePath -> UUID -> URLString -> Fil
 finishDownloadWith addunlockedmatcher tmp u url file = do
 	backend <- chooseBackend file
 	let source = KeySource
-		{ keyFilename = file
-		, contentLocation = tmp
+		{ keyFilename = toRawFilePath file
+		, contentLocation = toRawFilePath tmp
 		, inodeCache = Nothing
 		}
 	genKey source nullMeterUpdate backend >>= \case

Command/CalcKey.hs

@@ -20,8 +20,11 @@ cmd = noCommit $ noMessages $ dontCheck repoExists $
 		(batchable run (pure ()))
 
 run :: () -> String -> Annex Bool
-run _ file = genKey (KeySource file file Nothing) nullMeterUpdate Nothing >>= \case
+run _ file = genKey ks nullMeterUpdate Nothing >>= \case
 	Just (k, _) -> do
 		liftIO $ putStrLn $ serializeKey k
 		return True
 	Nothing -> return False
+  where
+	ks = KeySource file' file' Nothing
+	file' = toRawFilePath file

Command/Import.hs

@@ -118,11 +118,13 @@ seek o@(RemoteImportOptions {}) = startConcurrency commandStages $ do
 startLocal :: AddUnlockedMatcher -> GetFileMatcher -> DuplicateMode -> (FilePath, FilePath) -> CommandStart
 startLocal addunlockedmatcher largematcher mode (srcfile, destfile) =
 	ifM (liftIO $ isRegularFile <$> getSymbolicLinkStatus srcfile)
-		( starting "import" (ActionItemWorkTreeFile (toRawFilePath destfile))
+		( starting "import" (ActionItemWorkTreeFile destfile')
 			pickaction
 		, stop
 		)
   where
+	destfile' = toRawFilePath destfile
+
 	deletedup k = do
 		showNote $ "duplicate of " ++ serializeKey k
 		verifyExisting k destfile
@@ -182,7 +184,7 @@ startLocal addunlockedmatcher largematcher mode (srcfile, destfile) =
 		-- weakly the same as the origianlly locked down file's
 		-- inode cache. (Since the file may have been copied,
 		-- its inodes may not be the same.)
-		newcache <- withTSDelta $ liftIO . genInodeCache (toRawFilePath destfile)
+		newcache <- withTSDelta $ liftIO . genInodeCache destfile'
 		let unchanged = case (newcache, inodeCache (keySource ld)) of
 			(_, Nothing) -> True
 			(Just newc, Just c) | compareWeak c newc -> True
@@ -193,8 +195,8 @@ startLocal addunlockedmatcher largematcher mode (srcfile, destfile) =
 		-- is what will be ingested.
 		let ld' = ld
 			{ keySource = KeySource
-				{ keyFilename = destfile
-				, contentLocation = destfile
+				{ keyFilename = destfile'
+				, contentLocation = destfile'
 				, inodeCache = newcache
 				}
 			}
@@ -203,7 +205,7 @@ startLocal addunlockedmatcher largematcher mode (srcfile, destfile) =
 				>>= maybe
 					stop
 					(\addedk -> next $ Command.Add.cleanup addedk True)
-			, next $ Command.Add.addSmall $ toRawFilePath destfile 
+			, next $ Command.Add.addSmall destfile'
 			)
 	notoverwriting why = do
 		warning $ "not overwriting existing " ++ destfile ++ " " ++ why

Command/Migrate.hs

@@ -85,8 +85,8 @@ perform file oldkey oldbackend newbackend = go =<< genkey (fastMigrate oldbacken
 	genkey Nothing = do
 		content <- calcRepo $ gitAnnexLocation oldkey
 		let source = KeySource
-			{ keyFilename = fromRawFilePath file
-			, contentLocation = fromRawFilePath  content
+			{ keyFilename = file
+			, contentLocation = content
 			, inodeCache = Nothing
 			}
 		v <- genKey source nullMeterUpdate (Just newbackend)

Command/Reinject.hs

@@ -55,7 +55,7 @@ startSrcDest _ = giveup "specify a src file and a dest file"
 startKnown :: FilePath -> CommandStart
 startKnown src = notAnnexed src $
 	starting "reinject" (ActionItemOther (Just src)) $ do
-		mkb <- genKey (KeySource src src Nothing) nullMeterUpdate Nothing
+		mkb <- genKey ks nullMeterUpdate Nothing
 		case mkb of
 			Nothing -> error "Failed to generate key"
 			Just (key, _) -> ifM (isKnownKey key)
@@ -64,6 +64,9 @@ startKnown src = notAnnexed src $
 					warning "Not known content; skipping"
 					next $ return True
 				)
+  where
+	ks = KeySource src' src' Nothing
+	src' = toRawFilePath src
 
 notAnnexed :: FilePath -> CommandStart -> CommandStart
 notAnnexed src a = 

Command/TestRemote.hs

@@ -322,8 +322,8 @@ randKey sz = withTmpFile "randkey" $ \f h -> do
 		Right (rand, _) -> liftIO $ B.hPut h rand
 	liftIO $ hClose h
 	let ks = KeySource
-		{ keyFilename = f
-		, contentLocation = f
+		{ keyFilename = toRawFilePath f
+		, contentLocation = toRawFilePath f
 		, inodeCache = Nothing
 		}
 	k <- fromMaybe (error "failed to generate random key")