opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-10-25 18:36:26 +08:00
Code Issues Projects Releases Wiki Activity

NewDagReader: return DagReader for more functions

Browse Source 
Since the DagReader has lots of useful information (like sizes etc)
it's good to be able to use it.
This commit is contained in:
Juan Batiz-Benet
2015-02-01 07:20:09 -08:00
parent 4539b977c4
commit fcd8ebcca5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unixfs/io/dagreader.go
View File

@ -54,7 +54,7 @@ type ReadSeekCloser interface {
// NewDagReader creates a new reader object that reads the data represented by the given // NewDagReader creates a new reader object that reads the data represented by the given
// node, using the passed in DAGService for data retreival // node, using the passed in DAGService for data retreival
func NewDagReader(ctx context.Context, n *mdag.Node, serv mdag.DAGService) (ReadSeekCloser, error) { func NewDagReader(ctx context.Context, n *mdag.Node, serv mdag.DAGService) (*DagReader, error) {
pb := new(ftpb.Data) pb := new(ftpb.Data)
err := proto.Unmarshal(n.Data, pb) err := proto.Unmarshal(n.Data, pb)
if err != nil { if err != nil {
@ -65,6 +65,8 @@ func NewDagReader(ctx context.Context, n *mdag.Node, serv mdag.DAGService) (Read
case ftpb.Data_Directory: case ftpb.Data_Directory:
// Dont allow reading directories // Dont allow reading directories
return nil, ErrIsDir return nil, ErrIsDir
case ftpb.Data_Raw:
fallthrough
case ftpb.Data_File: case ftpb.Data_File:
fctx, cancel := context.WithCancel(ctx) fctx, cancel := context.WithCancel(ctx)
promises := serv.GetDAG(fctx, n) promises := serv.GetDAG(fctx, n)
@ -77,9 +79,6 @@ func NewDagReader(ctx context.Context, n *mdag.Node, serv mdag.DAGService) (Read
cancel: cancel, cancel: cancel,
pbdata: pb, pbdata: pb,
}, nil }, nil
case ftpb.Data_Raw:
// Raw block will just be a single level, return a byte buffer
return NewRSNCFromBytes(pb.GetData()), nil
default: default:
return nil, ft.ErrUnrecognizedType return nil, ft.ErrUnrecognizedType
} }
@ -123,6 +122,11 @@ func (dr *DagReader) precalcNextBuf() error {
} }
} }
// Size return the total length of the data from the DAG structured file.
func (dr *DagReader) Size() int64 {
return int64(dr.pbdata.GetFilesize())
}
// Read reads data from the DAG structured file // Read reads data from the DAG structured file
func (dr *DagReader) Read(b []byte) (int, error) { func (dr *DagReader) Read(b []byte) (int, error) {
// If no cached buffer, load one // If no cached buffer, load one