integrated cidx into pidx module, fixed panic

Author: bgn42

cmd/installer/pack.go

@@ -345,7 +345,7 @@ func (p *PackType) purge() (bool, error) {
 		return false, err
 	}
 
-	cTag := xml.CacheTag{Vendor: p.Vendor, Name: p.Name, Version: p.Version}
+	cTag := xml.PdscTag{Vendor: p.Vendor, Name: p.Name, Version: p.Version}
 	if err = Installation.PublicCacheIndexXML.RemovePdsc(cTag); err == nil {
 		webFile := Installation.WebDir + "/" + p.VName() + utils.PdscExtension
 		files = append(files, webFile) // also add pdsc file in .Web

cmd/installer/root.go

@@ -576,7 +576,7 @@ func InitializeCache() error {
 			return errs.ErrUnknownBehavior
 		}
 		releaseTag := pdscXML.FindReleaseTagByVersion("")
-		cacheTag := xml.CacheTag{
+		cacheTag := xml.PdscTag{
 			Vendor:  packInfo.Vendor,
 			Name:    packInfo.Pack,
 			Version: releaseTag.Version,
@@ -591,7 +591,7 @@ func InitializeCache() error {
 				cacheTag.URL = releaseTag.URL[:i+1]
 			}
 		}
-		_ = Installation.PublicCacheIndexXML.AddPdsc(cacheTag)
+		_ = Installation.PublicCacheIndexXML.AddReplacePdsc(cacheTag)
 	}
 	return nil
 }
@@ -709,7 +709,7 @@ func DownloadPDSCFiles(skipInstalledPdscFiles bool, concurrency int, timeout int
 //
 // Returns:
 //   - error: An error if any operation fails, otherwise nil.
-func UpdateInstalledPDSCFiles(pidxXML *xml.PidxXML, cidxXML *xml.CidxXML, updatePrivatePdsc, showInfo bool, concurrency int, timeout int) error {
+func UpdateInstalledPDSCFiles(pidxXML, cidxXML *xml.PidxXML, updatePrivatePdsc, showInfo bool, concurrency int, timeout int) error {
 	ctx := context.TODO()
 	concurrency = CheckConcurrency(concurrency)
 	sem := semaphore.NewWeighted(int64(concurrency))
@@ -1005,7 +1005,7 @@ func UpdatePublicIndex(indexPath string, sparse, downloadPdsc, downloadRemaining
 		}
 	}
 
-	cidxXML := xml.NewCidxXML(Installation.PublicCacheIndex)
+	cidxXML := xml.NewPidxXML(Installation.PublicCacheIndex, true)
 	if err := cidxXML.Read(); err != nil { // public cache index XML
 		if err = InitializeCache(); err != nil {
 			return err
@@ -1604,11 +1604,11 @@ func SetPackRoot(packRoot string, create bool) error {
 		WebDir:      filepath.Join(packRoot, ".Web"),
 		PackIdx:     filepath.Join(packRoot, "pack.idx"),
 	}
-	Installation.LocalPidx = xml.NewPidxXML(filepath.Join(Installation.LocalDir, "local_repository.pidx"))
+	Installation.LocalPidx = xml.NewPidxXML(filepath.Join(Installation.LocalDir, "local_repository.pidx"), false)
 	Installation.PublicIndex = filepath.Join(Installation.WebDir, PublicIndexName)
 	Installation.PublicCacheIndex = filepath.Join(Installation.WebDir, PublicCacheIndex)
-	Installation.PublicIndexXML = xml.NewPidxXML(Installation.PublicIndex)
-	Installation.PublicCacheIndexXML = xml.NewCidxXML(Installation.PublicCacheIndex)
+	Installation.PublicIndexXML = xml.NewPidxXML(Installation.PublicIndex, false)
+	Installation.PublicCacheIndexXML = xml.NewPidxXML(Installation.PublicCacheIndex, true)
 
 	missingDirs := []string{}
 	for _, dir := range []string{packRoot, Installation.DownloadDir, Installation.LocalDir, Installation.WebDir} {
@@ -1698,8 +1698,8 @@ type PacksInstallationType struct {
 	// PublicIndexXML stores a xml.PidxXML reference for PackRoot/WebDir/index.pidx
 	PublicIndexXML *xml.PidxXML
 
-	// PublicCacheIndexXML stores a xml.CidxXML reference for PackRoot/WebDir/cache.idx
-	PublicCacheIndexXML *xml.CidxXML
+	// PublicCacheIndexXML stores a xml.PidxXML reference for PackRoot/WebDir/cache.idx
+	PublicCacheIndexXML *xml.PidxXML
 
 	// LocalPidx is a reference to "local_repository.pidx" that contains a flat
 	// list of PDSC tags representing all packs installed via PDSC files.
@@ -1713,6 +1713,8 @@ type PacksInstallationType struct {
 	PackIdx string
 
 	ReadOnly bool
+
+	lock sync.Mutex
 }
 
 // updateCfg represents the content of "update.cfg" file.
@@ -2119,7 +2121,7 @@ func (p *PacksInstallationType) downloadPdscFile(pdscTag xml.PdscTag, skipInstal
 		return errs.ErrUnknownBehavior
 	}
 	releaseTag := pdscXML.FindReleaseTagByVersion("")
-	cacheTag := xml.CacheTag{
+	cacheTag := xml.PdscTag{
 		Vendor:  pdscTag.Vendor,
 		Name:    pdscTag.Name,
 		Version: releaseTag.Version,
@@ -2134,7 +2136,10 @@ func (p *PacksInstallationType) downloadPdscFile(pdscTag xml.PdscTag, skipInstal
 			cacheTag.URL = releaseTag.URL[:i+1]
 		}
 	}
-	_ = p.PublicCacheIndexXML.AddPdsc(cacheTag)
+
+	p.lock.Lock()
+	defer p.lock.Unlock()
+	_ = p.PublicCacheIndexXML.AddReplacePdsc(cacheTag)
 	_ = p.PublicCacheIndexXML.Write()
 
 	return err

cmd/installer/root_pdsc_add_test.go

@@ -38,7 +38,7 @@ func TestAddPdsc(t *testing.T) {
 		assert.Nil(installer.SetPackRoot(localTestingDir, CreatePackRoot))
 		installer.UnlockPackRoot()
 		assert.Nil(installer.ReadIndexFiles())
-		installer.Installation.LocalPidx = xml.NewPidxXML(badLocalRepositoryPidx)
+		installer.Installation.LocalPidx = xml.NewPidxXML(badLocalRepositoryPidx, false)
 		defer removePackRoot(localTestingDir)
 
 		err := installer.AddPdsc(pdscPack123)

cmd/installer/root_test.go

@@ -759,7 +759,7 @@ func TestUpdatePublicIndex(t *testing.T) {
 		// Create a temp index file to serve it for update
 		tempIndexFile := filepath.Join(localTestingDir, installer.PublicIndexName)
 		assert.Nil(utils.CopyFile(samplePublicIndex, tempIndexFile))
-		indexXML := xml.NewPidxXML(tempIndexFile)
+		indexXML := xml.NewPidxXML(tempIndexFile, false)
 		assert.Nil(indexXML.Read())
 		assert.Nil(indexXML.AddPdsc(xml.PdscTag{
 			URL:     indexServer.URL(),
@@ -827,7 +827,7 @@ func TestUpdatePublicIndex(t *testing.T) {
 		// Now get a new index.pidx and the 1.2.4 pdscs into the server and attempt updating with sparse=false
 		tempIndexFile := filepath.Join(localTestingDir, installer.PublicIndexName)
 		assert.Nil(utils.CopyFile(samplePublicIndex, tempIndexFile))
-		indexXML := xml.NewPidxXML(tempIndexFile)
+		indexXML := xml.NewPidxXML(tempIndexFile, false)
 		assert.Nil(indexXML.Read())
 
 		for i := 1; i < 11; i++ {