Merge branch 'master' into i287

rusq · Dec 20, 2024 · 610cf75 · 610cf75
2 parents bdfc20e + 2ec0e64
commit 610cf75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/downloader/downloader.go b/downloader/downloader.go
@@ -144,13 +144,14 @@ type Request struct {
 func (c *Client) Start(ctx context.Context) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+	slog.Debug("starting downloader")
 
-	if c.started.CompareAndSwap(true, true) {
-		// already started
+	if c.started.Load() {
 		return
 	}
 	c.requests = make(chan Request, c.chanBufSz)
 	c.wg = c.startWorkers(ctx, c.requests)
+	c.started.Store(true)
 }
 
 // startWorkers starts download workers.  It returns a sync.WaitGroup.  If the

diff --git a/internal/format/csv.go b/internal/format/csv.go
@@ -121,6 +121,7 @@ func (c *CSV) Users(ctx context.Context, w io.Writer, users []slack.User) error
 		"Team ID",
 		"Name",
 		"Is Admin?",
+		"Last Updated",
 		"Is Deleted?",
 		"Is Bot?",
 		"Real Name",
@@ -139,6 +140,7 @@ func (c *CSV) Users(ctx context.Context, w io.Writer, users []slack.User) error
 			u.TeamID,
 			u.Name,
 			fb(u.IsAdmin),
+			u.Updated.Time().Format("2006-01-02 15:04:05"),
 			fb(u.Deleted),
 			fb(u.IsBot),
 			u.RealName,