diff --git a/pkg/handler/do_import.go b/pkg/handler/do_import.go index 14f3f52..7c1725d 100644 --- a/pkg/handler/do_import.go +++ b/pkg/handler/do_import.go @@ -137,7 +137,7 @@ func DoImport(w http.ResponseWriter, r *http.Request) { tarhash := "sha256-" + strings.ToLower(util.HashStream("SHA256", tarf)) dirr := etc.DataRoot() + "/packages/" + user.UUID.String() + "/" + details.ID c.AssertNilErr(os.MkdirAll(dirr, os.ModePerm)) - c.AssertNilErr(copyFile(fil, dirr+"/"+commit+".tar.gz")) + c.AssertNilErr(os.Rename(fil, dirr+"/"+commit+".tar.gz")) p := db.CreatePackage(user, name, remo.ID, details.ID, repo, desc, license, details.StarCount) v := db.CreateVersion(p, commit, unpackedsize, totalsize, filelist, tarsize, tarhash, deps, devdeps) diff --git a/pkg/handler/handler.go b/pkg/handler/handler.go index af156cd..ae78e0d 100644 --- a/pkg/handler/handler.go +++ b/pkg/handler/handler.go @@ -3,7 +3,6 @@ package handler import ( "encoding/json" "fmt" - "io" "log" "net/http" "os" @@ -112,24 +111,6 @@ func fileSize(filepath string) int64 { return info.Size() } -func copyFile(src string, dest string) error { - existing, err := os.Open(src) - if err != nil { - return err - } - defer existing.Close() - newfile, err := os.Create(dest) - if err != nil { - return err - } - defer newfile.Close() - _, err = io.Copy(newfile, existing) - if err != nil { - return err - } - return nil -} - func fixPackages(in []*db.Package) []map[string]interface{} { res := []map[string]interface{}{} for _, item := range in { diff --git a/pkg/handler/hook.go b/pkg/handler/hook.go index 831c657..9a8751c 100644 --- a/pkg/handler/hook.go +++ b/pkg/handler/hook.go @@ -134,7 +134,7 @@ func Hook(w http.ResponseWriter, r *http.Request) { tarhash := "sha256-" + strings.ToLower(util.HashStream("SHA256", tarf)) dirr := etc.DataRoot() + "/packages/" + user.UUID.String() + "/" + details.ID c.AssertNilErr(os.MkdirAll(dirr, os.ModePerm)) - c.AssertNilErr(copyFile(fil, dirr+"/"+commit+".tar.gz")) + c.AssertNilErr(os.Rename(fil, dirr+"/"+commit+".tar.gz")) c.Assert(db.Version{}.ByCommit(pkg, commit) == nil, "Version at this commit already created.") vnew := db.CreateVersion(pkg, commit, unpackedsize, totalsize, filelist, tarsize, tarhash, deps, devdeps)