Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gbs-downloader
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
PrivateStorage
gbs-downloader
Commits
5e8bb277
Commit
5e8bb277
authored
May 4, 2023
by
Jean-Paul Calderone
Browse files
Options
Downloads
Patches
Plain Diff
adapt to minor tahoe-great-black-swamp API change
parent
1b247101
Branches
1.ci
Branches containing commit
Tags
Tags containing commit
1 merge request
!2
Incorporate tahoe-great-black-swamp to do share downloads using GBS
Pipeline
#4520
failed
May 4, 2023
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Tahoe/Download.hs
+2
-2
2 additions, 2 deletions
src/Tahoe/Download.hs
with
2 additions
and
2 deletions
src/Tahoe/Download.hs
+
2
−
2
View file @
5e8bb277
...
@@ -40,7 +40,7 @@ import qualified Tahoe.CHK.Encrypt
...
@@ -40,7 +40,7 @@ import qualified Tahoe.CHK.Encrypt
import
Tahoe.CHK.Server
(
StorageServer
(
..
),
StorageServerID
)
import
Tahoe.CHK.Server
(
StorageServer
(
..
),
StorageServerID
)
import
Tahoe.CHK.Types
(
ShareNum
,
StorageIndex
)
import
Tahoe.CHK.Types
(
ShareNum
,
StorageIndex
)
import
TahoeLAFS.Storage.API
(
CBORSet
(
..
),
ShareNumber
(
ShareNumber
))
import
TahoeLAFS.Storage.API
(
CBORSet
(
..
),
ShareNumber
(
ShareNumber
))
import
TahoeLAFS.Storage.Client
(
getImmutableShareNumbers
,
readImmutableShare
s
)
import
TahoeLAFS.Storage.Client
(
getImmutableShareNumbers
,
readImmutableShare
)
import
Text.Read
(
readMaybe
)
import
Text.Read
(
readMaybe
)
{- | An unrecoverable problem arose while attempting to download and/or read
{- | An unrecoverable problem arose while attempting to download and/or read
...
@@ -269,7 +269,7 @@ makeServer
...
@@ -269,7 +269,7 @@ makeServer
storageServerWrite
=
undefined
storageServerWrite
=
undefined
storageServerRead
storageIndex
shareNum
=
do
storageServerRead
storageIndex
shareNum
=
do
let
clientm
=
readImmutableShare
s
(
toBase32
storageIndex
)
(
ShareNumber
$
fromIntegral
shareNum
)
Nothing
let
clientm
=
readImmutableShare
(
toBase32
storageIndex
)
(
ShareNumber
$
fromIntegral
shareNum
)
Nothing
res
<-
runClientM
clientm
env
res
<-
runClientM
clientm
env
case
res
of
case
res
of
Left
err
->
throwIO
err
Left
err
->
throwIO
err
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment