From 4f65d46d56d78d9b14da9201b0e4045efad81630 Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@gentoo.org>
Date: Mon, 30 Dec 2019 16:32:39 +0100
Subject: [PATCH] Drop CompressedPath, or we don't have a way to compare
 checksums

Refers to #33
---
 pkg/compiler/artifact.go | 59 ++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/pkg/compiler/artifact.go b/pkg/compiler/artifact.go
index f8298863..3377bbfd 100644
--- a/pkg/compiler/artifact.go
+++ b/pkg/compiler/artifact.go
@@ -69,14 +69,13 @@ func (i ArtifactIndex) CleanPath() ArtifactIndex {
 // which will consist in just of an repository.yaml which is just the repository structure with the list of package artifact.
 // In this way a generic client can fetch the packages and, after unpacking the tree, performing queries to install packages.
 type PackageArtifact struct {
-	Path           string `json:"path"`
-	CompressedPath string `json:"compressedpath"`
+	Path string `json:"path"`
 
 	Dependencies    []*PackageArtifact        `json:"dependencies"`
 	CompileSpec     *LuetCompilationSpec      `json:"compilationspec"`
 	Checksums       Checksums                 `json:"checksums"`
 	SourceAssertion solver.PackagesAssertions `json:"-"`
-	CompressionType CompressionImplementation `json:"compression"`
+	CompressionType CompressionImplementation `json:"compressiontype"`
 }
 
 func NewPackageArtifact(path string) Artifact {
@@ -233,7 +232,8 @@ func (a *PackageArtifact) Compress(src string, concurrency int) error {
 		}
 		w.Close()
 		os.RemoveAll(a.Path) // Remove original
-		a.CompressedPath = gzipfile
+		//	a.CompressedPath = gzipfile
+		a.Path = gzipfile
 		return nil
 		//a.Path = gzipfile
 	}
@@ -248,15 +248,16 @@ func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error {
 
 	case GZip:
 		// Create the uncompressed archive
-		archive, err := os.Create(a.GetPath())
+		archive, err := os.Create(a.GetPath() + ".uncompressed")
 		if err != nil {
 			return err
 		}
-		defer os.RemoveAll(a.GetPath())
+		defer os.RemoveAll(a.GetPath() + ".uncompressed")
+		defer archive.Close()
 
-		original, err := os.Open(a.CompressedPath)
+		original, err := os.Open(a.Path)
 		if err != nil {
-			return err
+			return errors.Wrap(err, "Cannot open "+a.Path)
 		}
 		defer original.Close()
 
@@ -269,10 +270,10 @@ func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error {
 
 		_, err = io.Copy(archive, r)
 		if err != nil {
-			return err
+			return errors.Wrap(err, "Cannot copy to "+a.GetPath()+".uncompressed")
 		}
 
-		err = helpers.Untar(a.GetPath(), dst, keepPerms)
+		err = helpers.Untar(a.GetPath()+".uncompressed", dst, keepPerms)
 		if err != nil {
 			return err
 		}
@@ -283,13 +284,41 @@ func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error {
 }
 
 func (a *PackageArtifact) FileList() ([]string, error) {
+	var tr *tar.Reader
+	switch a.CompressionType {
+	case None:
+
+		tarFile, err := os.Open(a.GetPath())
+		if err != nil {
+			return []string{}, errors.Wrap(err, "Could not open package archive")
+		}
+		defer tarFile.Close()
+		tr = tar.NewReader(tarFile)
+
+	case GZip:
+		// Create the uncompressed archive
+		archive, err := os.Create(a.GetPath() + ".uncompressed")
+		if err != nil {
+			return []string{}, err
+		}
+		defer os.RemoveAll(a.GetPath() + ".uncompressed")
+		defer archive.Close()
+
+		original, err := os.Open(a.Path)
+		if err != nil {
+			return []string{}, errors.Wrap(err, "Cannot open "+a.Path)
+		}
+		defer original.Close()
+
+		bufferedReader := bufio.NewReader(original)
+		r, err := gzip.NewReader(bufferedReader)
+		if err != nil {
+			return []string{}, err
+		}
+		defer r.Close()
+		tr = tar.NewReader(r)
 
-	tarFile, err := os.Open(a.GetPath())
-	if err != nil {
-		return []string{}, errors.Wrap(err, "Could not open package archive")
 	}
-	defer tarFile.Close()
-	tr := tar.NewReader(tarFile)
 
 	var files []string
 	// untar each segment