Remove duplicate pprof flags, use more precise "time ago" func

Author: iBug

cmd/run.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
-	"runtime/pprof"
 	"syscall"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"github.com/taoky/ayano/pkg/analyze"
 	"github.com/taoky/ayano/pkg/fileiter"
 	"github.com/taoky/ayano/pkg/systemd"
@@ -123,49 +123,24 @@ func runCmd() *cobra.Command {
 	return cmd
 }
 
+func normalizeAnalyzeFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
+	switch name {
+	case "cpuprofile":
+		name = "cpuprof"
+	case "memprofile":
+		name = "memprof"
+	}
+	return pflag.NormalizedName(name)
+}
+
 // First, create a helper function to handle common command configuration
 func setupAnalyzeCommand(cmd *cobra.Command, cmdType string) (analyze.AnalyzerConfig, error) {
 	config := analyze.DefaultConfig()
 	config.InstallFlags(cmd.Flags(), cmd.Name())
-
-	var cpuProf string
-	var memProf string
-	cmd.Flags().StringVar(&cpuProf, "cpuprof", "", "write CPU pprof data to file")
-	cmd.Flags().StringVar(&memProf, "memprof", "", "write memory pprof data to file")
-
-	// Return a function to handle performance profiling logic
-	handleProf := func() error {
-		if cpuProf != "" {
-			f, err := os.Create(cpuProf)
-			if err != nil {
-				return fmt.Errorf("failed to create CPU pprof file: %w", err)
-			}
-			defer f.Close()
-			if err := pprof.StartCPUProfile(f); err != nil {
-				return fmt.Errorf("failed to start CPU pprof: %w", err)
-			}
-			defer pprof.StopCPUProfile()
-		}
-
-		if memProf != "" {
-			f, err := os.Create(memProf)
-			if err != nil {
-				return fmt.Errorf("failed to create memory pprof file: %w", err)
-			}
-			defer f.Close()
-			if err := pprof.WriteHeapProfile(f); err != nil {
-				return fmt.Errorf("failed to write memory pprof: %w", err)
-			}
-		}
-		return nil
-	}
+	cmd.Flags().SetNormalizeFunc(normalizeAnalyzeFlags)
 
 	// Set the command execution function
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {
-		if err := handleProf(); err != nil {
-			return err
-		}
-
 		switch cmdType {
 		case "analyze":
 			config.Analyze = true
@@ -192,8 +167,9 @@ func analyzeCmd() *cobra.Command {
 
 func dirAnalyzeCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "dir-analyze [filename...]",
-		Short: "Analyze log by directory (show statistics for each first-level directory)",
+		Use:     "dir-analyze [filename...]",
+		Aliases: []string{"dir-analyse"},
+		Short:   "Analyze log by directory (show statistics for each first-level directory)",
 	}
 	setupAnalyzeCommand(cmd, "dir-analyze")
 	return cmd

pkg/analyze/analyze.go

@@ -185,10 +185,8 @@ func (c *AnalyzerConfig) InstallFlags(flags *pflag.FlagSet, cmdname string) {
 	flags.BoolVar(&c.Truncate, "truncate", c.Truncate, "Truncate long URLs from output")
 	flags.IntVar(&c.Truncate2, "truncate-to", c.Truncate2, "Truncate URLs to given length, overrides --truncate")
 
-	flags.StringVar(&c.CpuProfile, "cpuprofile", c.CpuProfile, "Write CPU profiling information")
-	flags.StringVar(&c.MemProfile, "memprofile", c.MemProfile, "Write memory profiling information")
-	flags.MarkHidden("cpuprofile")
-	flags.MarkHidden("memprofile")
+	flags.StringVar(&c.CpuProfile, "cpuprof", c.CpuProfile, "Write CPU profiling information")
+	flags.StringVar(&c.MemProfile, "memprof", c.MemProfile, "Write memory profiling information")
 
 	if cmdname == "analyze" {
 		c.Whole = true
@@ -671,6 +669,7 @@ func (a *Analyzer) PrintTopValues(displayRecord map[netip.Prefix]time.Time, sort
 	table.SetColumnAlignment(tAlignment)
 	table.SetHeader(tHeaders)
 
+	now := time.Now()
 	for i := range top {
 		key := keys[i]
 		ipStats := a.stats[key]
@@ -689,8 +688,8 @@ func (a *Analyzer) PrintTopValues(displayRecord map[netip.Prefix]time.Time, sort
 			lastUpdateTime = ipStats.LastURLUpdate.Format(TimeFormat)
 			lastAccessTime = ipStats.LastURLAccess.Format(TimeFormat)
 		} else {
-			lastUpdateTime = humanize.Time(ipStats.LastURLUpdate)
-			lastAccessTime = humanize.Time(ipStats.LastURLAccess)
+			lastUpdateTime = HumanizeAgo(now.Sub(ipStats.LastURLUpdate))
+			lastAccessTime = HumanizeAgo(now.Sub(ipStats.LastURLAccess))
 		}
 
 		average := total / uint64(reqTotal)

pkg/analyze/util.go

@@ -8,6 +8,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/dustin/go-humanize"
 )
@@ -202,3 +203,28 @@ func TruncateFilenameLen(input string, target int) string {
 	// truncating basename alone would not suffice, keep characters from end
 	return input[len(input)-target:]
 }
+
+func HumanizeAgo(d time.Duration) string {
+	if d < 0 {
+		return "in the future"
+	}
+	if d < time.Second {
+		return "now"
+	}
+	if d < time.Minute {
+		return fmt.Sprintf("%ds ago", int(d.Seconds()))
+	}
+	if d < time.Hour {
+		minutes := int(d.Minutes())
+		seconds := int(d.Seconds()) - minutes*60
+		return fmt.Sprintf("%dm%2ds ago", minutes, seconds)
+	}
+	if d < 24*time.Hour {
+		hours := int(d.Hours())
+		minutes := int(d.Minutes()) - hours*60
+		return fmt.Sprintf("%dh%2dm ago", hours, minutes)
+	}
+	days := int(d.Hours()) / 24
+	hours := int(d.Hours()) - days*24
+	return fmt.Sprintf("%dd%2dh ago", days, hours)
+}