remove some deprecated calls

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

6 files changed, 22 insertions, 72 deletions

diff --git a/pkg/portage/dependencies/dependency.go b/pkg/portage/dependencies/dependency.go
index 0d08c18..18d7a39 100644
--- a/pkg/portage/dependencies/dependency.go
+++ b/pkg/portage/dependencies/dependency.go
@@ -4,16 +4,13 @@ import (
 	"archive/tar"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"regexp"
 	"soko/pkg/config"
 	"soko/pkg/database"
 	"soko/pkg/logger"
 	"soko/pkg/models"
-	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/ulikunitz/xz"
@@ -21,10 +18,6 @@ import (
 
 var Dependencies []*models.ReverseDependency
 
-var (
-	mu sync.RWMutex
-)
-
 func FullPackageDependenciesUpdate() {
 
 	database.Connect()
@@ -37,13 +30,15 @@ func FullPackageDependenciesUpdate() {
 
 	logger.Info.Println("Got", dependencyCounter, "dependencies.")
 
-	// TODO in future we want a better incremental update here
-	deleteAllDependencies()
-
-	logger.Info.Println("Start inserting dependencies into the database")
+	database.TruncateTable[models.ReverseDependency]("id")
 	// because we removed all previous rows in table, we aren't concerned about
 	// duplicates, so we can use bulk insert
-	database.DBCon.Model(&Dependencies).Insert()
+	res, err := database.DBCon.Model(&Dependencies).Insert()
+	if err != nil {
+		logger.Error.Println("Error during inserting dependencies", err)
+	} else {
+		logger.Info.Println("Inserted", res.RowsAffected(), "dependencies")
+	}
 
 	updateStatus()
 }
@@ -83,10 +78,10 @@ func UpdateDependencies() (int, error) {
 			return 0, err
 		}
 		switch hdr.Typeflag {
-		case tar.TypeReg, tar.TypeRegA:
+		case tar.TypeReg:
 			nameParts := strings.SplitN(hdr.Name, "/", 2)
 
-			rawResponse, err := ioutil.ReadAll(tr)
+			rawResponse, err := io.ReadAll(tr)
 			if err != nil {
 				logger.Error.Println(err)
 				return 0, err
@@ -142,49 +137,6 @@ func versionSpecifierToPackageAtom(versionSpecifier string) string {
 	return gpackage
 }
 
-func deleteAllDependencies() {
-	var reverseDependencies []*models.ReverseDependency
-	err := database.DBCon.Model(&reverseDependencies).Column("id").Select()
-	if err != nil {
-		logger.Error.Println(err)
-		return
-	} else if len(reverseDependencies) == 0 {
-		return
-	}
-
-	res, err := database.DBCon.Model(&reverseDependencies).Delete()
-	if err != nil {
-		logger.Error.Println(err)
-		return
-	}
-	logger.Info.Println("Deleted", res.RowsAffected(), "dependencies from the database.")
-}
-
-func deleteOutdatedDependencies(newDependencies []*models.ReverseDependency) {
-	var oldDependencies []*models.ReverseDependency
-	database.DBCon.Model(&oldDependencies).Select()
-
-	for index, oldDependency := range oldDependencies {
-
-		if index%10000 == 0 {
-			fmt.Println(time.Now().Format(time.Kitchen) + ": " + strconv.Itoa(index) + " / " + strconv.Itoa(len(oldDependencies)))
-		}
-
-		found := false
-		for _, newDependency := range newDependencies {
-			if oldDependency.Id == newDependency.Id {
-				found = true
-			}
-		}
-
-		if !found {
-			database.DBCon.Model(oldDependency).WherePK().Delete()
-		}
-
-	}
-
-}
-
 func updateStatus() {
 	database.DBCon.Model(&models.Application{
 		Id:         "dependencies",
diff --git a/pkg/portage/pkgcheck/parse.go b/pkg/portage/pkgcheck/parse.go
index 732b7f8..153a242 100644
--- a/pkg/portage/pkgcheck/parse.go
+++ b/pkg/portage/pkgcheck/parse.go
@@ -2,7 +2,7 @@ package pkgcheck
 
 import (
 	"encoding/xml"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"soko/pkg/config"
@@ -35,7 +35,7 @@ func UpdatePkgCheckResults() {
 	defer database.DBCon.Close()
 
 	if config.Quiet() == "true" {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 	}
 
 	// get the pkg check results from qa-reports.gentoo.org
diff --git a/pkg/portage/projects/update.go b/pkg/portage/projects/update.go
index 62a6a96..c17b22f 100644
--- a/pkg/portage/projects/update.go
+++ b/pkg/portage/projects/update.go
@@ -2,7 +2,7 @@ package projects
 
 import (
 	"encoding/xml"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"soko/pkg/config"
@@ -18,7 +18,7 @@ func UpdateProjects() {
 	defer database.DBCon.Close()
 
 	if config.Quiet() == "true" {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 	}
 
 	// get projects from api.gentoo.org
diff --git a/pkg/portage/update.go b/pkg/portage/update.go
index b2b14a4..3db726c 100644
--- a/pkg/portage/update.go
+++ b/pkg/portage/update.go
@@ -3,7 +3,7 @@
 package portage
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"soko/pkg/config"
@@ -26,7 +26,7 @@ func Update() {
 	defer database.DBCon.Close()
 
 	if config.Quiet() == "true" {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 	}
 
 	logger.Info.Println("Start update...")
@@ -140,7 +140,7 @@ func FullUpdate() {
 	defer database.DBCon.Close()
 
 	if config.Quiet() == "true" {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 	}
 
 	logger.Info.Println("Full update up...")
diff --git a/pkg/selfcheck/portage/category.go b/pkg/selfcheck/portage/category.go
index 62ef93d..d7c04a9 100644
--- a/pkg/selfcheck/portage/category.go
+++ b/pkg/selfcheck/portage/category.go
@@ -4,7 +4,7 @@ package repository
 
 import (
 	"encoding/xml"
-	"io/ioutil"
+	"io"
 	"os"
 	"regexp"
 	"soko/pkg/config"
@@ -29,7 +29,6 @@ func UpdateCategory(path string) {
 	}
 }
 
-
 // updateModifiedCategory adds a category to the database or
 // updates it. To do so, it parses the metadata from metadata.xml
 func updateModifiedCategory(changedFile string) {
@@ -51,7 +50,7 @@ func updateModifiedCategory(changedFile string) {
 	})
 }
 
-func addCategory(category *models.Category){
+func addCategory(category *models.Category) {
 	found := false
 	for _, cat := range storage.Categories {
 		if cat.Name == category.Name {
@@ -73,7 +72,7 @@ func GetCatMetadata(path string) Catmetadata {
 		logger.Error.Println(err)
 	}
 	defer xmlFile.Close()
-	byteValue, _ := ioutil.ReadAll(xmlFile)
+	byteValue, _ := io.ReadAll(xmlFile)
 	var catmetadata Catmetadata
 	xml.Unmarshal(byteValue, &catmetadata)
 	return catmetadata
diff --git a/pkg/selfcheck/portage/package.go b/pkg/selfcheck/portage/package.go
index b0dc9e0..14289a0 100644
--- a/pkg/selfcheck/portage/package.go
+++ b/pkg/selfcheck/portage/package.go
@@ -4,7 +4,7 @@ package repository
 
 import (
 	"encoding/xml"
-	"io/ioutil"
+	"io"
 	"os"
 	"regexp"
 	"soko/pkg/config"
@@ -83,8 +83,7 @@ func updateModifiedPackage(changedFile string) {
 
 }
 
-
-func addPackage(newPackage *models.Package){
+func addPackage(newPackage *models.Package) {
 	found := false
 	for _, p := range storage.Packages {
 		if p.Atom == newPackage.Atom {
@@ -106,7 +105,7 @@ func GetPkgMetadata(path string) Pkgmetadata {
 		logger.Error.Println(err)
 	}
 	defer xmlFile.Close()
-	byteValue, _ := ioutil.ReadAll(xmlFile)
+	byteValue, _ := io.ReadAll(xmlFile)
 	var pkgmetadata Pkgmetadata
 	xml.Unmarshal(byteValue, &pkgmetadata)
 	return pkgmetadata