Skip to content

Commit

Permalink
give ipfs get symlink support
Browse files Browse the repository at this point in the history
License: MIT
Signed-off-by: Jeromy <[email protected]>
  • Loading branch information
whyrusleeping committed Aug 31, 2015
1 parent d993bc0 commit 173d84b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
23 changes: 17 additions & 6 deletions thirdparty/tar/extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package tar

import (
"archive/tar"
"fmt"
"io"
"os"
gopath "path"
Expand Down Expand Up @@ -39,15 +40,21 @@ func (te *Extractor) Extract(reader io.Reader) error {
break
}

if header.Typeflag == tar.TypeDir {
switch header.Typeflag {
case tar.TypeDir:
if err := te.extractDir(header, i); err != nil {
return err
}
continue
}

if err := te.extractFile(header, tarReader, i, rootExists, rootIsDir); err != nil {
return err
case tar.TypeReg:
if err := te.extractFile(header, tarReader, i, rootExists, rootIsDir); err != nil {
return err
}
case tar.TypeSymlink:
if err := te.extractSymlink(header); err != nil {
return err
}
default:
return fmt.Errorf("unrecognized tar header type: %d", header.Typeflag)
}
}
return nil
Expand Down Expand Up @@ -79,6 +86,10 @@ func (te *Extractor) extractDir(h *tar.Header, depth int) error {
return nil
}

func (te *Extractor) extractSymlink(h *tar.Header) error {
return os.Symlink(h.Linkname, te.outputPath(h.Name))
}

func (te *Extractor) extractFile(h *tar.Header, r *tar.Reader, depth int, rootExists bool, rootIsDir bool) error {
path := te.outputPath(h.Name)

Expand Down
11 changes: 11 additions & 0 deletions unixfs/archive/tar/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ func (w *Writer) WriteNode(nd *mdag.Node, fpath string) error {
fallthrough
case upb.Data_File:
return w.writeFile(nd, pb, fpath)
case upb.Data_Symlink:
return writeSymlinkHeader(w.TarW, string(pb.GetData()), fpath)
default:
return ft.ErrUnrecognizedType
}
Expand Down Expand Up @@ -108,3 +110,12 @@ func writeFileHeader(w *tar.Writer, fpath string, size uint64) error {
// TODO: set mode, dates, etc. when added to unixFS
})
}

func writeSymlinkHeader(w *tar.Writer, target, fpath string) error {
return w.WriteHeader(&tar.Header{
Name: fpath,
Linkname: target,
Mode: 0777,
Typeflag: tar.TypeSymlink,
})
}

0 comments on commit 173d84b

Please sign in to comment.