Session auto-cleanup. Leave only N unnamed sessions

cmd/qory/main.go

@@ -38,6 +38,8 @@ const (
 	argUnset = "unset"
 
 	historyLength = 10
+
+	sessionUnnamedLimit = 10
 )
 
 var (

cmd/qory/runner.go

@@ -110,6 +110,11 @@ func runQueryInner(
 	if err = sessionManager.Store(sessionID, sess); err != nil {
 		fmt.Printf("Store session failed: %v", err)
 	}
+
+	if err = sessionManager.Cleanup(sessionUnnamedLimit); err != nil {
+		fmt.Printf("Auto-cleanup failed: %v", err)
+	}
+
 	return nil
 }
 
@@ -141,9 +146,9 @@ func runQueryWithLastSession(
 		return ErrorBadArguments
 	}
 
-        sessionID, err := sessionManager.Last()
-        if err != nil {
-                return err
+	sessionID, err := sessionManager.Last()
+	if err != nil {
+		return err
 	}
 
 	args = args[2:] // Leave only relevant arguments

lib/session/manager.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/dtrugman/qory/lib/message"
+	"github.com/google/uuid"
 )
 
 const (
@@ -65,6 +66,7 @@ type Manager interface {
 	Store(id string, session Session) error
 	Enum(limit int) (map[string]SessionPreview, error)
 	Last() (string, error)
+	Cleanup(limit int) error
 }
 
 func NewManager(dir string) (Manager, error) {
@@ -173,6 +175,33 @@ func (m *manager) Last() (string, error) {
 	return fileInfos[0].name, nil
 }
 
+func (m *manager) Cleanup(limit int) error {
+	fileInfos, err := getDirFilesSortedByModTime(m.dir)
+	if err != nil {
+		return err
+	}
+
+	unnamedSessions := make([]fileInfo, 0)
+	for _, info := range fileInfos {
+		if _, err := uuid.Parse(info.name); err == nil {
+			unnamedSessions = append(unnamedSessions, info)
+		}
+	}
+
+	if len(unnamedSessions) <= limit {
+		return nil
+	}
+
+	for _, info := range unnamedSessions[limit:] {
+		path := filepath.Join(m.dir, info.name)
+		if err := os.Remove(path); err != nil {
+			return fmt.Errorf("delete file %s: %v", info.name, err)
+		}
+	}
+
+	return nil
+}
+
 func (m *manager) Load(id string) (Session, error) {
 	if !m.validID(id) {
 		return Session{}, ErrInvalidID