From f333320af9d711c33b56dcd8dd1df9d9d1b270c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Sep 2016 10:45:42 -0400 Subject: cleanup --- Storage.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Storage.hs') diff --git a/Storage.hs b/Storage.hs index 3e2c418..ef042ba 100644 --- a/Storage.hs +++ b/Storage.hs @@ -26,10 +26,9 @@ import Control.Concurrent.Async import qualified Data.Set as S import Network.Wai.Handler.Warp (Port) -allStorageLocations :: Maybe LocalStorageDirectory -> IO StorageLocations -allStorageLocations d = do - servers <- networkServers - return $ StorageLocations $ map (networkStorage d) servers +networkStorageLocations :: Maybe LocalStorageDirectory -> StorageLocations +networkStorageLocations d = StorageLocations $ + map (networkStorage d) networkServers localStorageLocations :: Maybe LocalStorageDirectory -> StorageLocations localStorageLocations d = StorageLocations $ @@ -122,12 +121,12 @@ retrieveShares (StorageLocations locs) sis updateprogress = do -- | Returns descriptions of any failures. uploadQueued :: Maybe LocalStorageDirectory -> IO [String] uploadQueued d = do - StorageLocations locs <- allStorageLocations d results <- forM locs $ \loc -> case uploadQueue loc of Nothing -> return [] Just q -> moveShares q loc return $ processresults (concat results) [] where + StorageLocations locs = networkStorageLocations d processresults [] c = nub c processresults (StoreSuccess:rs) c = processresults rs c processresults (StoreFailure e:rs) c = processresults rs (e:c) -- cgit v1.2.3