more housecleaning

4 files changed, 12 insertions, 104 deletions

diff --git a/Makefile b/Makefile
index 39329a4..1addd76 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,10 @@ BUILDTIME = $(shell date +%s)
 
 all: install
 	mirrors walk
+	mirrors incoming
 	mirrors verify
 
 everything: install
-	mirrors
-	find /home/mirrors/wit/dists
-	mirrors verify
 	mirrors everything
 	apt update
 	sleep 1
diff --git a/doNewest.go b/doNewest.go
index 7744499..aa50226 100644
--- a/doNewest.go
+++ b/doNewest.go
@@ -1,24 +1,15 @@
 package main
 
 import (
-	"crypto/sha256"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
 	"time"
 
 	"go.wit.com/lib/cobol"
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
 
 // make a list of the newest .deb files
-func doNewest(arch string) (string, error) {
-	log.Info("Processing dir", filepath.Join(me.pb.BaseDir, "pool"))
-
+func doGetNewest(arch string) *zoopb.Packages {
 	newest := zoopb.NewPackages()
 	for p := range me.pb.IterAll() {
 		if p.Architecture != arch {
@@ -44,94 +35,5 @@ func doNewest(arch string) (string, error) {
 	}
 
 	newest.SortPackage()
-	thefile := doMakePackagesFile(newest)
-
-	fullname := "/home/mirrors/wit/dists/sid/main/binary-amd64/Packages"
-	if err := os.WriteFile(fullname, []byte(thefile), 0644); err != nil {
-		return fullname, err
-	}
-	panic("file is: " + fullname)
-
-	r, err := shell.RunVerbose([]string{"gzip", "-k", fullname})
-	log.Info(r, err)
-	// r, err := shell.RunVerbose([]string{"gzip", fullname})
-	// panic("blah")
-	// shell.RunVerbose([]string{"bzip2", "-k", fullname})
-	// shell.RunVerbose([]string{"bzip2", fullname})
-
-	allfiles, _ := FindFiles("dists/sid/main")
-	for i, filename := range allfiles {
-		log.Info(i, filename)
-	}
-
-	releasePath := filepath.Join("/home/mirrors/wit/dists/sid", "Release")
-
-	rfile, _ := os.OpenFile(releasePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	fmt.Fprintf(rfile, "Origin: WIT.COM Debian Sid\n")
-	fmt.Fprintf(rfile, "Label: WIT.COM Debian Sid\n")
-	fmt.Fprintf(rfile, "Suite: sid\n")
-	fmt.Fprintf(rfile, "Codename: sid\n")
-	fmt.Fprintf(rfile, "Date: %s\n", time.Now().UTC().Format(time.RFC1123Z))
-	fmt.Fprintf(rfile, "Architectures: riscv64 amd64 arm64 all\n")
-	fmt.Fprintf(rfile, "Components: main\n")
-	fmt.Fprintf(rfile, "Description: Tooling for RiscV, Semiconductor Designs & Private Clouds\n")
-
-	/*
-		fmt.Fprintf(rfile, "MD5SUM:\n")
-		for i, filename := range allfiles {
-			log.Info(i, filename)
-			fileBytes, _ := os.ReadFile(filename)
-			sum := fmt.Sprintf("%x", md5.Sum(fileBytes)) // deprecated
-			newfile := strings.TrimPrefix(filename, "dists/sid/")
-			fmt.Fprintf(rfile, " %s %d %s\n", sum, len(fileBytes), newfile)
-		}
-		fmt.Fprintf(rfile, "SHA1:\n")
-		for i, filename := range allfiles {
-			log.Info(i, filename)
-			fileBytes, _ := os.ReadFile(filename)
-			sum := fmt.Sprintf("%x", sha1.Sum(fileBytes))
-			newfile := strings.TrimPrefix(filename, "dists/sid/")
-			fmt.Fprintf(rfile, " %s %d %s\n", sum, len(fileBytes), newfile)
-		}
-	*/
-	fmt.Fprintf(rfile, "SHA256:\n")
-	for i, filename := range allfiles {
-		log.Info(i, filename)
-		fileBytes, _ := os.ReadFile(filename)
-		sum := fmt.Sprintf("%x", sha256.Sum256(fileBytes))
-		newfile := strings.TrimPrefix(filename, "dists/sid/")
-		fmt.Fprintf(rfile, " %s %d %s\n", sum, len(fileBytes), newfile)
-	}
-	// fmt.Fprintf(rfile, "SHA1:\n")
-	// fmt.Fprintf(rfile, "SHA256:\n")
-	rfile.Close()
-
-	// Sign the file
-	log.Println("Signing with GPG key:", gpgKeyID)
-
-	distPath := "/home/mirrors/wit/dists/sid"
-	// Create InRelease
-	cmdClearSign := exec.Command("gpg", "--default-key", gpgKeyID, "--clearsign", "-o", filepath.Join(distPath, "InRelease"), releasePath)
-	if err := runCommand(cmdClearSign); err != nil {
-		log.Printf("failed to create InRelease: %v\n", err)
-	}
-
-	// Create Release.gpg
-	cmdDetachedSign := exec.Command("gpg", "--default-key", gpgKeyID, "-abs", "-o", filepath.Join(distPath, "Release.gpg"), releasePath)
-	if err := runCommand(cmdDetachedSign); err != nil {
-		log.Printf("failed to create Release.gpg: %v\n", err)
-	}
-	/*
-		var sum string
-		switch name {
-		case "MD5Sum":
-			sum = fmt.Sprintf("%x", md5.Sum(fileBytes))
-		case "SHA1":
-			sum = fmt.Sprintf("%x", sha1.Sum(fileBytes))
-		case "SHA256":
-			// FIX 3: Use the correct sha256.Sum256 function.
-			sum = fmt.Sprintf("%x", sha256.Sum256(fileBytes))
-	*/
-
-	return "doNewest", nil
+	return newest
 }
diff --git a/main.go b/main.go
index ccd1357..fc14458 100644
--- a/main.go
+++ b/main.go
@@ -84,7 +84,8 @@ func main() {
 	}
 
 	if argv.Newest != nil {
-		s, err = doNewest("amd64")
+		all := doGetNewest("amd64")
+		s = "newest .deb files table: " + all.PrintTable()
 	}
 
 	if argv.List != nil {
diff --git a/makePackagesFile.go b/makePackagesFile.go
index 0de9e3c..0257712 100644
--- a/makePackagesFile.go
+++ b/makePackagesFile.go
@@ -33,6 +33,10 @@ func populateDebInfo(p *zoopb.Package) error {
 	if r.Exit != 0 {
 		return errors.New("dpkg returned -1")
 	}
+	stat, err := os.Stat(fullname)
+	if err != nil {
+		return err
+	}
 	filedata, err := os.Open(fullname)
 	if err != nil {
 		return err
@@ -58,6 +62,9 @@ func populateDebInfo(p *zoopb.Package) error {
 	// p.DebInfo.SHA1 = fmt.Sprintf("%x", hSHA1.Sum(nil))     // deprecated
 	// SHA256 HASH END
 
+	// set file create time
+	p.Ctime = timestamppb.New(stat.ModTime())
+
 	// PARSE "dpkg -I <p.Filename>", then exit as we are done
 	starting := true
 	all := strings.Join(r.Stdout, "\n")