combine metafile and filters packages in a pointer package
This commit is contained in:
parent
59db431062
commit
1235797615
@ -1,9 +1,8 @@
|
||||
package commands
|
||||
|
||||
import (
|
||||
"github.com/github/git-media/filters"
|
||||
"github.com/github/git-media/gitmedia"
|
||||
"github.com/github/git-media/metafile"
|
||||
"github.com/github/git-media/pointer"
|
||||
"github.com/spf13/cobra"
|
||||
"os"
|
||||
)
|
||||
@ -26,7 +25,7 @@ func cleanCommand(cmd *cobra.Command, args []string) {
|
||||
filename = ""
|
||||
}
|
||||
|
||||
cleaned, err := filters.Clean(os.Stdin)
|
||||
cleaned, err := pointer.Clean(os.Stdin)
|
||||
if err != nil {
|
||||
Panic(err, "Error cleaning asset")
|
||||
}
|
||||
@ -54,7 +53,7 @@ func cleanCommand(cmd *cobra.Command, args []string) {
|
||||
Debug("Writing %s", mediafile)
|
||||
}
|
||||
|
||||
metafile.Encode(os.Stdout, cleaned.Pointer)
|
||||
pointer.Encode(os.Stdout, cleaned.Pointer)
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
@ -1,9 +1,8 @@
|
||||
package commands
|
||||
|
||||
import (
|
||||
"github.com/github/git-media/filters"
|
||||
"github.com/github/git-media/gitmedia"
|
||||
"github.com/github/git-media/metafile"
|
||||
"github.com/github/git-media/pointer"
|
||||
"github.com/spf13/cobra"
|
||||
"os"
|
||||
)
|
||||
@ -20,29 +19,29 @@ var (
|
||||
func smudgeCommand(cmd *cobra.Command, args []string) {
|
||||
gitmedia.InstallHooks()
|
||||
|
||||
pointer, err := metafile.Decode(os.Stdin)
|
||||
ptr, err := pointer.Decode(os.Stdin)
|
||||
if err != nil {
|
||||
Panic(err, "Error reading git-media meta data from stdin:")
|
||||
}
|
||||
|
||||
if smudgeInfo {
|
||||
localPath, err := gitmedia.LocalMediaPath(pointer.Oid)
|
||||
localPath, err := gitmedia.LocalMediaPath(ptr.Oid)
|
||||
if err != nil {
|
||||
Exit(err.Error())
|
||||
}
|
||||
|
||||
stat, err := os.Stat(localPath)
|
||||
if err != nil {
|
||||
Print("%d --", pointer.Size)
|
||||
Print("%d --", ptr.Size)
|
||||
} else {
|
||||
Print("%d %s", stat.Size(), localPath)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
err = filters.Smudge(os.Stdout, pointer.Oid)
|
||||
err = pointer.Smudge(os.Stdout, ptr.Oid)
|
||||
if err != nil {
|
||||
smudgerr := err.(*filters.SmudgeError)
|
||||
smudgerr := err.(*pointer.SmudgeError)
|
||||
Panic(err, "Error reading file from local media dir: %s", smudgerr.Filename)
|
||||
}
|
||||
}
|
||||
|
@ -1,10 +1,9 @@
|
||||
package filters
|
||||
package pointer
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"github.com/github/git-media/gitmedia"
|
||||
"github.com/github/git-media/metafile"
|
||||
"io"
|
||||
"os"
|
||||
)
|
||||
@ -12,7 +11,7 @@ import (
|
||||
type CleanedAsset struct {
|
||||
File *os.File
|
||||
mediafilepath string
|
||||
*metafile.Pointer
|
||||
*Pointer
|
||||
}
|
||||
|
||||
func Clean(reader io.Reader) (*CleanedAsset, error) {
|
||||
@ -25,7 +24,7 @@ func Clean(reader io.Reader) (*CleanedAsset, error) {
|
||||
writer := io.MultiWriter(oidHash, tmp)
|
||||
written, err := io.Copy(writer, reader)
|
||||
|
||||
pointer := metafile.NewPointer(hex.EncodeToString(oidHash.Sum(nil)), written)
|
||||
pointer := NewPointer(hex.EncodeToString(oidHash.Sum(nil)), written)
|
||||
return &CleanedAsset{tmp, "", pointer}, err
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
package metafile
|
||||
package pointer
|
||||
|
||||
import (
|
||||
"bufio"
|
@ -1,4 +1,4 @@
|
||||
package metafile
|
||||
package pointer
|
||||
|
||||
import (
|
||||
"bufio"
|
@ -1,4 +1,4 @@
|
||||
package filters
|
||||
package pointer
|
||||
|
||||
import (
|
||||
"github.com/github/git-media/gitmedia"
|
Loading…
Reference in New Issue
Block a user