feat: add hard delete flag and opal clean command
Add --hard flag to `opal delete` for permanent removal and a new `opal clean` command to bulk-purge soft-deleted tasks with optional --older duration filter. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,77 @@
|
|||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.jnss.me/joakim/opal/internal/engine"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
var olderFlag string
|
||||||
|
|
||||||
|
var cleanCmd = &cobra.Command{
|
||||||
|
Use: "clean",
|
||||||
|
Short: "Purge soft-deleted tasks from the database",
|
||||||
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
|
if err := cleanTasks(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
cleanCmd.Flags().StringVar(&olderFlag, "older", "", "Only purge tasks deleted longer than this duration ago (e.g. 30d, 1w)")
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanTasks() error {
|
||||||
|
var olderThan *time.Duration
|
||||||
|
if olderFlag != "" {
|
||||||
|
d, err := engine.ParseRecurrencePattern(olderFlag)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid duration %q: %w", olderFlag, err)
|
||||||
|
}
|
||||||
|
olderThan = &d
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks, err := engine.GetDeletedTasks(olderThan)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(tasks) == 0 {
|
||||||
|
fmt.Println("No deleted tasks to purge.")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if dryRunFlag {
|
||||||
|
fmt.Printf("Would permanently remove %d deleted task(s).\n", len(tasks))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(tasks) > 1 {
|
||||||
|
fmt.Printf("Permanently remove %d deleted task(s)? This cannot be undone. (y/N): ", len(tasks))
|
||||||
|
var confirm string
|
||||||
|
fmt.Scanln(&confirm)
|
||||||
|
if confirm != "y" && confirm != "Y" {
|
||||||
|
fmt.Println("Cancelled.")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, task := range tasks {
|
||||||
|
if err := task.Delete(true); err != nil {
|
||||||
|
return fmt.Errorf("failed to purge task %s: %w", task.UUID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("Purged %d deleted task(s).\n", len(tasks))
|
||||||
|
|
||||||
|
if err := engine.CleanupChangeLog(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Warning: failed to clean up change log: %v\n", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
+31
-10
@@ -8,19 +8,25 @@ import (
|
|||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var hardDeleteFlag bool
|
||||||
|
|
||||||
var deleteCmd = &cobra.Command{
|
var deleteCmd = &cobra.Command{
|
||||||
Use: "delete [filter...]",
|
Use: "delete [filter...]",
|
||||||
Short: "Delete tasks",
|
Short: "Delete tasks",
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
parsed := getParsedArgs(cmd)
|
parsed := getParsedArgs(cmd)
|
||||||
if err := deleteTasks(parsed.Filters); err != nil {
|
if err := deleteTasks(parsed.Filters, hardDeleteFlag); err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func deleteTasks(args []string) error {
|
func init() {
|
||||||
|
deleteCmd.Flags().BoolVar(&hardDeleteFlag, "hard", false, "Permanently remove task from database")
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteTasks(args []string, hard bool) error {
|
||||||
filter, err := engine.ParseFilter(args)
|
filter, err := engine.ParseFilter(args)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -53,15 +59,24 @@ func deleteTasks(args []string) error {
|
|||||||
return fmt.Errorf("no tasks matched filter")
|
return fmt.Errorf("no tasks matched filter")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
action := "delete"
|
||||||
|
if hard {
|
||||||
|
action = "permanently delete"
|
||||||
|
}
|
||||||
|
|
||||||
if dryRunFlag {
|
if dryRunFlag {
|
||||||
fmt.Print(engine.FormatTaskConfirmList("delete", tasks, ws))
|
fmt.Print(engine.FormatTaskConfirmList(action, tasks, ws))
|
||||||
fmt.Println("Dry run — no changes made.")
|
fmt.Println("Dry run — no changes made.")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(tasks) > 1 {
|
if len(tasks) > 1 || hard {
|
||||||
fmt.Print(engine.FormatTaskConfirmList("delete", tasks, ws))
|
fmt.Print(engine.FormatTaskConfirmList(action, tasks, ws))
|
||||||
fmt.Printf("Proceed? (y/N): ")
|
if hard {
|
||||||
|
fmt.Printf("This cannot be undone. Proceed? (y/N): ")
|
||||||
|
} else {
|
||||||
|
fmt.Printf("Proceed? (y/N): ")
|
||||||
|
}
|
||||||
var confirm string
|
var confirm string
|
||||||
fmt.Scanln(&confirm)
|
fmt.Scanln(&confirm)
|
||||||
if confirm != "y" && confirm != "Y" {
|
if confirm != "y" && confirm != "Y" {
|
||||||
@@ -71,14 +86,20 @@ func deleteTasks(args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, task := range tasks {
|
for _, task := range tasks {
|
||||||
task.Delete(false) // Soft delete
|
task.Delete(hard)
|
||||||
engine.RecordUndo("delete", task.UUID)
|
if !hard {
|
||||||
|
engine.RecordUndo("delete", task.UUID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
verb := "Deleted"
|
||||||
|
if hard {
|
||||||
|
verb = "Permanently deleted"
|
||||||
|
}
|
||||||
if len(tasks) == 1 {
|
if len(tasks) == 1 {
|
||||||
fmt.Printf("Deleted task %s\n", engine.FormatTaskSummary(tasks[0], ws))
|
fmt.Printf("%s task %s\n", verb, engine.FormatTaskSummary(tasks[0], ws))
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("Deleted %d task(s).\n", len(tasks))
|
fmt.Printf("%s %d task(s).\n", verb, len(tasks))
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ var (
|
|||||||
|
|
||||||
// Command classification
|
// Command classification
|
||||||
var commandNames = []string{
|
var commandNames = []string{
|
||||||
"add", "done", "modify", "delete",
|
"add", "done", "modify", "delete", "clean",
|
||||||
"start", "stop", "count", "projects", "tags",
|
"start", "stop", "count", "projects", "tags",
|
||||||
"info", "edit", "server", "sync", "reports", "setup",
|
"info", "edit", "server", "sync", "reports", "setup",
|
||||||
"version", "annotate", "denotate", "undo", "uncomplete", "log", "completion",
|
"version", "annotate", "denotate", "undo", "uncomplete", "log", "completion",
|
||||||
@@ -284,6 +284,7 @@ func init() {
|
|||||||
undoCmd.GroupID = "task"
|
undoCmd.GroupID = "task"
|
||||||
uncompleteCmd.GroupID = "task"
|
uncompleteCmd.GroupID = "task"
|
||||||
logCmd.GroupID = "task"
|
logCmd.GroupID = "task"
|
||||||
|
cleanCmd.GroupID = "task"
|
||||||
|
|
||||||
rootCmd.AddCommand(addCmd)
|
rootCmd.AddCommand(addCmd)
|
||||||
rootCmd.AddCommand(doneCmd)
|
rootCmd.AddCommand(doneCmd)
|
||||||
@@ -298,6 +299,7 @@ func init() {
|
|||||||
rootCmd.AddCommand(undoCmd)
|
rootCmd.AddCommand(undoCmd)
|
||||||
rootCmd.AddCommand(uncompleteCmd)
|
rootCmd.AddCommand(uncompleteCmd)
|
||||||
rootCmd.AddCommand(logCmd)
|
rootCmd.AddCommand(logCmd)
|
||||||
|
rootCmd.AddCommand(cleanCmd)
|
||||||
|
|
||||||
// Other commands
|
// Other commands
|
||||||
countCmd.GroupID = "other"
|
countCmd.GroupID = "other"
|
||||||
|
|||||||
@@ -736,6 +736,48 @@ func (t *Task) IsRecurringInstance() bool {
|
|||||||
return t.ParentUUID != nil
|
return t.ParentUUID != nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetDeletedTasks retrieves soft-deleted tasks, optionally filtered by age.
|
||||||
|
// If olderThan is non-nil, only returns tasks deleted more than that duration ago.
|
||||||
|
func GetDeletedTasks(olderThan *time.Duration) ([]*Task, error) {
|
||||||
|
db := GetDB()
|
||||||
|
if db == nil {
|
||||||
|
return nil, fmt.Errorf("database not initialized")
|
||||||
|
}
|
||||||
|
|
||||||
|
query := `
|
||||||
|
SELECT id, uuid, status, description, project, priority,
|
||||||
|
created, modified, start, end, due, scheduled, wait, until_date,
|
||||||
|
recurrence_duration, parent_uuid, annotations
|
||||||
|
FROM tasks
|
||||||
|
WHERE status = ?`
|
||||||
|
args := []interface{}{byte(StatusDeleted)}
|
||||||
|
|
||||||
|
if olderThan != nil {
|
||||||
|
cutoff := timeNow().Add(-*olderThan).Unix()
|
||||||
|
query += ` AND end < ?`
|
||||||
|
args = append(args, cutoff)
|
||||||
|
}
|
||||||
|
|
||||||
|
query += ` ORDER BY end ASC`
|
||||||
|
|
||||||
|
rows, err := db.Query(query, args...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to query deleted tasks: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var tasks []*Task
|
||||||
|
for rows.Next() {
|
||||||
|
task, err := scanTask(rows)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to scan task: %w", err)
|
||||||
|
}
|
||||||
|
tasks = append(tasks, task)
|
||||||
|
}
|
||||||
|
|
||||||
|
return tasks, nil
|
||||||
|
}
|
||||||
|
|
||||||
// PopulateUrgency computes and sets the Urgency field on the given tasks.
|
// PopulateUrgency computes and sets the Urgency field on the given tasks.
|
||||||
func PopulateUrgency(tasks ...*Task) {
|
func PopulateUrgency(tasks ...*Task) {
|
||||||
cfg, _ := GetConfig()
|
cfg, _ := GetConfig()
|
||||||
|
|||||||
Reference in New Issue
Block a user