Refactoring: build pool path in Package. #8

deb/package.go

@@ -388,16 +388,18 @@ func (p *Package) LinkFromPool(publishedStorage aptly.PublishedStorage, packageP
 			return err
 		}
 
-		relPath, err := publishedStorage.LinkFromPool(prefix, component, poolDir, packagePool, sourcePath)
+		relPath := filepath.Join("pool", component, poolDir)
+		publishedDirectory := filepath.Join(prefix, relPath)
+
+		err = publishedStorage.LinkFromPool(publishedDirectory, packagePool, sourcePath)
 		if err != nil {
 			return err
 		}
 
-		dir := filepath.Dir(relPath)
 		if p.IsSource {
-			p.Extra()["Directory"] = dir
+			p.Extra()["Directory"] = relPath
 		} else {
-			p.Files()[i].downloadPath = dir
+			p.Files()[i].downloadPath = relPath
 		}
 	}
 

files/public.go

@@ -47,34 +47,29 @@ func (storage *PublishedStorage) RemoveDirs(path string) error {
 
 // LinkFromPool links package file from pool to dist's pool location
 //
-// prefix is publishing prefix for this repo (e.g. empty or "ppa/")
+// publishedDirectory is desired location in pool (like prefix/pool/component/liba/libav/)
-// component is component name when publishing (e.g. main)
-// poolDirectory is desired location in pool (like liba/libav/)
 // sourcePool is instance of aptly.PackagePool
 // sourcePath is filepath to package file in package pool
 //
 // LinkFromPool returns relative path for the published file to be included in package index
-func (storage *PublishedStorage) LinkFromPool(prefix string, component string, poolDirectory string, sourcePool aptly.PackagePool, sourcePath string) (string, error) {
+func (storage *PublishedStorage) LinkFromPool(publishedDirectory string, sourcePool aptly.PackagePool, sourcePath string) error {
 	// verify that package pool is local pool is filesystem pool
 	_ = sourcePool.(*PackagePool)
 
 	baseName := filepath.Base(sourcePath)
-
+	poolPath := filepath.Join(storage.rootPath, publishedDirectory)
-	relPath := filepath.Join("pool", component, poolDirectory, baseName)
-	poolPath := filepath.Join(storage.rootPath, prefix, "pool", component, poolDirectory)
 
 	err := os.MkdirAll(poolPath, 0755)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	_, err = os.Stat(filepath.Join(poolPath, baseName))
 	if err == nil { // already exists, skip
-		return relPath, nil
+		return nil
 	}
 
-	err = os.Link(sourcePath, filepath.Join(poolPath, baseName))
+	return os.Link(sourcePath, filepath.Join(poolPath, baseName))
-	return relPath, err
 }
 
 // ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path

files/public_test.go

@@ -123,9 +123,8 @@ func (s *PublishedStorageSuite) TestLinkFromPool(c *C) {
 		err = ioutil.WriteFile(t.sourcePath, []byte("Contents"), 0644)
 		c.Assert(err, IsNil)
 
-		path, err := s.storage.LinkFromPool(t.prefix, t.component, t.poolDirectory, pool, t.sourcePath)
+		err = s.storage.LinkFromPool(filepath.Join(t.prefix, "pool", t.component, t.poolDirectory), pool, t.sourcePath)
 		c.Assert(err, IsNil)
-		c.Assert(path, Equals, t.expectedFilename)
 
 		st, err := os.Stat(filepath.Join(s.storage.rootPath, t.prefix, t.expectedFilename))
 		c.Assert(err, IsNil)