Skip to content

fix: clean account caches on deletion #1265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrinoff merged 2 commits into from
May 12, 2026
Merged

fix: clean account caches on deletion #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b4c31
feat(contacts): track usage per account
FromSi May 8, 2026
339398e
fix(accounts): clean cached data on deletion
FromSi May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cli/contacts_export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,12 @@ func exportToCSV(contacts []config.Contact, noHeader bool) ([]byte, error) {
}

for _, c := range contacts {
usage := config.ContactAggregateUsage(c)
record := []string{
escapeCSV(c.Name),
escapeCSV(c.Email),
c.LastUsed.Format("2006-01-02T15:04:05Z07:00"),
fmt.Sprintf("%d", c.UseCount),
usage.LastUsed.Format("2006-01-02T15:04:05Z07:00"),
fmt.Sprintf("%d", usage.UseCount),
}
if err := writer.Write(record); err != nil {
return nil, err
Expand Down
83 changes: 23 additions & 60 deletions cli/contacts_export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,23 @@ import (
"github.com/floatpane/matcha/config"
)

func testContact(name, email string, lastUsed time.Time, useCount int) config.Contact {
return config.Contact{
Name: name,
Email: email,
Usage: map[string]config.ContactUsage{
"account-1": {
LastUsed: lastUsed,
UseCount: useCount,
},
},
}
}

func TestExportToJSON(t *testing.T) {
contacts := []config.Contact{
{
Name: "John Doe",
Email: "john@example.com",
LastUsed: time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC),
UseCount: 5,
},
{
Name: "Jane Smith",
Email: "jane@test.com",
LastUsed: time.Date(2024, 2, 20, 14, 0, 0, 0, time.UTC),
UseCount: 10,
},
testContact("John Doe", "john@example.com", time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC), 5),
testContact("Jane Smith", "jane@test.com", time.Date(2024, 2, 20, 14, 0, 0, 0, time.UTC), 10),
}

data, err := exportToJSON(contacts)
Expand All @@ -48,18 +51,8 @@ func TestExportToJSON(t *testing.T) {

func TestExportToCSV(t *testing.T) {
contacts := []config.Contact{
{
Name: "John Doe",
Email: "john@example.com",
LastUsed: time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC),
UseCount: 5,
},
{
Name: "Jane Smith",
Email: "jane@test.com",
LastUsed: time.Date(2024, 2, 20, 14, 0, 0, 0, time.UTC),
UseCount: 10,
},
testContact("John Doe", "john@example.com", time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC), 5),
testContact("Jane Smith", "jane@test.com", time.Date(2024, 2, 20, 14, 0, 0, 0, time.UTC), 10),
}

data, err := exportToCSV(contacts, false)
Expand Down Expand Up @@ -89,18 +82,8 @@ func TestExportToCSV(t *testing.T) {

func TestExportToCSVNoHeader(t *testing.T) {
contacts := []config.Contact{
{
Name: "John Doe",
Email: "john@example.com",
LastUsed: time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC),
UseCount: 5,
},
{
Name: "Jane Smith",
Email: "jane@test.com",
LastUsed: time.Date(2024, 2, 20, 14, 0, 0, 0, time.UTC),
UseCount: 10,
},
testContact("John Doe", "john@example.com", time.Date(2024, 1, 15, 10, 30, 0, 0, time.UTC), 5),
testContact("Jane Smith", "jane@test.com", time.Date(2024, 2, 20, 14, 0, 0, 0, time.UTC), 10),
}

data, err := exportToCSV(contacts, true)
Expand Down Expand Up @@ -156,18 +139,8 @@ func TestEscapeCSV(t *testing.T) {

func TestExportToCSVWithSpecialChars(t *testing.T) {
contacts := []config.Contact{
{
Name: "Test, User",
Email: "test@example.com",
LastUsed: time.Now(),
UseCount: 1,
},
{
Name: `Test "Quotes"`,
Email: "quotes@test.com",
LastUsed: time.Now(),
UseCount: 2,
},
testContact("Test, User", "test@example.com", time.Now(), 1),
testContact(`Test "Quotes"`, "quotes@test.com", time.Now(), 2),
}

data, err := exportToCSV(contacts, false)
Expand Down Expand Up @@ -195,12 +168,7 @@ func TestExportJSONToFile(t *testing.T) {
outputPath := filepath.Join(tmpDir, "contacts.json")

contacts := []config.Contact{
{
Name: "Test User",
Email: "test@example.com",
LastUsed: time.Now(),
UseCount: 1,
},
testContact("Test User", "test@example.com", time.Now(), 1),
}

data, err := exportToJSON(contacts)
Expand Down Expand Up @@ -233,12 +201,7 @@ func TestExportCSVToFile(t *testing.T) {
outputPath := filepath.Join(tmpDir, "contacts.csv")

contacts := []config.Contact{
{
Name: "Test User",
Email: "test@example.com",
LastUsed: time.Now(),
UseCount: 1,
},
testContact("Test User", "test@example.com", time.Now(), 1),
}

data, err := exportToCSV(contacts, false)
Expand Down
Loading
Loading