From f8231ade9124faa3e7b517d2a7e76085ac84b562 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 Sep 2016 14:29:58 -0400 Subject: Warn when --uploadqueued fails to upload to servers. --- Storage.hs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'Storage.hs') diff --git a/Storage.hs b/Storage.hs index b8aace7..2e35972 100644 --- a/Storage.hs +++ b/Storage.hs @@ -12,6 +12,7 @@ import Storage.Local import Storage.Network import Servers import Data.Maybe +import Data.List import System.FilePath import Control.Monad import qualified Data.Set as S @@ -109,9 +110,18 @@ retrieveShares (StorageLocations locs) sis updateprogress = do -- all of them. go (unusedlocs++[loc]) usedlocs' rest shares' -uploadQueued :: Maybe LocalStorageDirectory -> IO () +-- | Returns descriptions of any failures. +uploadQueued :: Maybe LocalStorageDirectory -> IO [String] uploadQueued d = do StorageLocations locs <- allStorageLocations d - forM_ locs $ \loc -> case uploadQueue loc of - Nothing -> return () + results <- forM locs $ \loc -> case uploadQueue loc of + Nothing -> return [] Just q -> moveShares q loc + return $ processresults (concat results) [] + where + processresults [] c = nub c + processresults (StoreSuccess:rs) c = processresults rs c + processresults (StoreFailure e:rs) c = processresults rs (e:c) + processresults (StoreAlreadyExists:rs) c = + processresults rs ("Unable to upload a share to a server due to a name conflict.":c) + -- cgit v1.2.3