3 files changed, 15 insertions, 14 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index b7074592e..eb5ab14fe 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -30,7 +30,7 @@ data Transfer = Transfer
 	, transferUUID :: UUID
 	, transferKey :: Key
 	}
-	deriving (Show, Eq, Ord)
+	deriving (Eq, Ord, Read, Show)
 
 {- Information about a Transfer, stored in the transfer information file.
  -
@@ -49,16 +49,16 @@ data TransferInfo = TransferInfo
 	deriving (Show, Eq, Ord)
 
 data Direction = Upload | Download
-	deriving (Eq, Ord)
+	deriving (Eq, Ord, Read, Show)
 
-instance Show Direction where
-	show Upload = "upload"
-	show Download = "download"
+showLcDirection :: Direction -> String
+showLcDirection Upload = "upload"
+showLcDirection Download = "download"
 
-readDirection :: String -> Maybe Direction
-readDirection "upload" = Just Upload
-readDirection "download" = Just Download
-readDirection _ = Nothing
+readLcDirection :: String -> Maybe Direction
+readLcDirection "upload" = Just Upload
+readLcDirection "download" = Just Download
+readLcDirection _ = Nothing
 
 percentComplete :: Transfer -> TransferInfo -> Maybe Percentage
 percentComplete (Transfer { transferKey = key }) (TransferInfo { bytesComplete = Just complete }) =
@@ -144,7 +144,7 @@ getTransfers = do
 {- The transfer information file to use for a given Transfer. -}
 transferFile :: Transfer -> Git.Repo -> FilePath
 transferFile (Transfer direction u key) r = gitAnnexTransferDir r
-	</> show direction 
+	</> showLcDirection direction 
 	</> fromUUID u
 	</> keyFile key
 
@@ -159,7 +159,7 @@ parseTransferFile file
 	| "lck." `isPrefixOf` (takeFileName file) = Nothing
 	| otherwise = case drop (length bits - 3) bits of
 		[direction, u, key] -> Transfer
-			<$> readDirection direction
+			<$> readLcDirection direction
 			<*> pure (toUUID u)
 			<*> fileKey key
 		_ -> Nothing
diff --git a/Logs/Unused.hs b/Logs/Unused.hs
index 7d240cfe3..522c523af 100644
--- a/Logs/Unused.hs
+++ b/Logs/Unused.hs
@@ -25,7 +25,7 @@ writeUnusedLog :: FilePath -> [(Int, Key)] -> Annex ()
 writeUnusedLog prefix l = do
 	logfile <- fromRepo $ gitAnnexUnusedLog prefix
 	liftIO $ viaTmp writeFile logfile $
-		unlines $ map (\(n, k) -> show n ++ " " ++ show k) l
+		unlines $ map (\(n, k) -> show n ++ " " ++ key2file k) l
 
 readUnusedLog :: FilePath -> Annex UnusedMap
 readUnusedLog prefix = do
@@ -37,7 +37,7 @@ readUnusedLog prefix = do
 		)
 	where
 		parse line =
-			case (readish tag, readKey rest) of
+			case (readish tag, file2key rest) of
 				(Just num, Just key) -> Just (num, key)
 				_ -> Nothing
 			where
diff --git a/Logs/Web.hs b/Logs/Web.hs
index 607c81c5b..534bd5345 100644
--- a/Logs/Web.hs
+++ b/Logs/Web.hs
@@ -16,6 +16,7 @@ module Logs.Web (
 import Common.Annex
 import Logs.Presence
 import Logs.Location
+import Types.Key
 
 type URLString = String
 
@@ -29,7 +30,7 @@ urlLog key = hashDirLower key </> keyFile key ++ ".log.web"
 {- Used to store the urls elsewhere. -}
 oldurlLogs :: Key -> [FilePath]
 oldurlLogs key = 
-	[ "remote/web" </> hashDirLower key </> show key ++ ".log"
+	[ "remote/web" </> hashDirLower key </> key2file key ++ ".log"
 	, "remote/web" </> hashDirLower key </> keyFile key ++ ".log"
 	]