mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve info display of OtherStorageClass

Browse source
This commit is contained in:
Joey Hess 2016-05-05 11:54:59 -04:00
parent 26f9d1b217
commit dce4b1a189
Failed to extract signature
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/S3.hs
View file

@ -604,7 +604,7 @@ s3Info c info = catMaybes
[ Just ("bucket", fromMaybe "unknown" (getBucketName c)) [ Just ("bucket", fromMaybe "unknown" (getBucketName c))
, Just ("endpoint", w82s (S.unpack (S3.s3Endpoint s3c))) , Just ("endpoint", w82s (S.unpack (S3.s3Endpoint s3c)))
, Just ("port", show (S3.s3Port s3c)) , Just ("port", show (S3.s3Port s3c))
, Just ("storage class", show (getStorageClass c)) , Just ("storage class", showstorageclass (getStorageClass c))
, if configIA c , if configIA c
then Just ("internet archive item", iaItemUrl $ fromMaybe "unknown" $ getBucketName c) then Just ("internet archive item", iaItemUrl $ fromMaybe "unknown" $ getBucketName c)
else Nothing else Nothing
@ -613,6 +613,10 @@ s3Info c info = catMaybes
] ]
where where
s3c = s3Configuration c s3c = s3Configuration c
#if MIN_VERSION_aws(0,13,0)
showstorageclass (S3.OtherStorageClass t) = T.unpack t
#endif
showstorageclass sc = show sc
getWebUrls :: S3Info -> Key -> Annex [URLString] getWebUrls :: S3Info -> Key -> Annex [URLString]
getWebUrls info k = case (public info, getpublicurl info) of getWebUrls info k = case (public info, getpublicurl info) of