diff options
author | Joey Hess <joey@kitenet.net> | 2012-08-08 16:06:01 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-08-08 16:20:24 -0400 |
commit | 94fcd0cf59f94dd29ab171f0875bd25af65fd527 (patch) | |
tree | c89328f776d3a305cc45355471ab8fa8409aa686 /Logs/Web.hs | |
parent | e0cd9776690c74aa1b346aa11615a75c862d7714 (diff) |
add routes to pause/start/cancel transfers
This commit includes a paydown on technical debt incurred two years ago,
when I didn't know that it was bad to make custom Read and Show instances
for types. As the routes need Read and Show for Transfer, which includes a
Key, and deriving my own Read instance of key was not practical,
I had to finally clean that up.
So the compact Key read and show functions are now file2key and key2file,
and Read and Show are now derived instances.
Changed all code that used the old instances, compiler checked.
(There were a few places, particularly in Command.Unused, and the test
suite where the Show instance continue to be used for legitimate
comparisons; ie show key_x == show key_y (though really in a bloom filter))
Diffstat (limited to 'Logs/Web.hs')
-rw-r--r-- | Logs/Web.hs | 3 |
1 files changed, 2 insertions, 1 deletions
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" ] |