testing nntp-transfer merge

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.25.3'
 
       - name: Install dependencies
         run: go mod download

appVersion.txt

@@ -1 +1 @@
-4.7.3
+4.7.4

cmd/expire-news/main.go

@@ -310,11 +310,11 @@ func getNewsgroupsToExpire(db *database.Database, targetGroup string) ([]*models
 // expireArticlesInGroup expires articles older than cutoffDate in the specified group
 func expireArticlesInGroup(db *database.Database, groupName string, cutoffDate time.Time, batchSize int, dryRun bool) (int, int, error) {
 	// Get group database
-	groupDBs, err := db.GetGroupDBs(groupName)
+	groupDB, err := db.GetGroupDB(groupName)
 	if err != nil {
 		return 0, 0, fmt.Errorf("failed to get group database: %v", err)
 	}
-	defer groupDBs.Return(db)
+	defer groupDB.Return()
 
 	totalExpired := 0
 	totalScanned := 0
@@ -324,7 +324,7 @@ func expireArticlesInGroup(db *database.Database, groupName string, cutoffDate t
 	offset := 0
 	for {
 		// Get batch of articles
-		articles, err := getArticleBatch(groupDBs, offset, batchSize)
+		articles, err := getArticleBatch(groupDB, offset, batchSize)
 		if err != nil {
 			return totalExpired, totalScanned, fmt.Errorf("failed to get article batch: %v", err)
 		}
@@ -357,7 +357,7 @@ func expireArticlesInGroup(db *database.Database, groupName string, cutoffDate t
 
 		// Delete articles in this batch if not dry run
 		if !dryRun && len(articlesToDelete) > 0 {
-			if err := deleteArticles(groupDBs, articlesToDelete); err != nil {
+			if err := deleteArticles(groupDB, articlesToDelete); err != nil {
 				return totalExpired, totalScanned, fmt.Errorf("failed to delete articles: %v", err)
 			}
 		}
@@ -380,15 +380,15 @@ func expireArticlesInGroup(db *database.Database, groupName string, cutoffDate t
 }
 
 // getArticleBatch retrieves a batch of articles from the group database
-func getArticleBatch(groupDBs *database.GroupDBs, offset, limit int) ([]*models.Article, error) {
+func getArticleBatch(groupDB *database.GroupDB, offset, limit int) ([]*models.Article, error) {
 	query := `
 		SELECT article_num, date_sent
 		FROM articles
 		ORDER BY article_num
 		LIMIT ? OFFSET ?
 	`
 
-	rows, err := database.RetryableQuery(groupDBs.DB, query, limit, offset)
+	rows, err := database.RetryableQuery(groupDB.DB, query, limit, offset)
 	if err != nil {
 		return nil, err
 	}
@@ -398,8 +398,8 @@ func getArticleBatch(groupDBs *database.GroupDBs, offset, limit int) ([]*models.
 	for rows.Next() {
 		article := &models.Article{}
 		article.ArticleNums = make(map[*string]int64)
-		article.ArticleNums[groupDBs.NewsgroupPtr] = -1 // Initialize with group name
-		err := rows.Scan(article.ArticleNums[groupDBs.NewsgroupPtr], &article.DateSent)
+		article.ArticleNums[groupDB.NewsgroupPtr] = -1 // Initialize with group name
+		err := rows.Scan(article.ArticleNums[groupDB.NewsgroupPtr], &article.DateSent)
 		if err != nil {
 			return nil, err
 		}
@@ -410,13 +410,13 @@ func getArticleBatch(groupDBs *database.GroupDBs, offset, limit int) ([]*models.
 }
 
 // deleteArticles removes articles from the database using proper batch operations
-func deleteArticles(groupDBs *database.GroupDBs, articleNums []int64) error {
+func deleteArticles(groupDB *database.GroupDB, articleNums []int64) error {
 	if len(articleNums) == 0 {
 		return nil
 	}
 
 	// Begin transaction
-	tx, err := groupDBs.DB.Begin()
+	tx, err := groupDB.DB.Begin()
 	if err != nil {
 		return err
 	}
@@ -495,15 +495,15 @@ func getPlaceholders(count int) string {
 // pruneArticlesInGroup removes oldest articles to keep the group under maxArticles limit
 func pruneArticlesInGroup(db *database.Database, groupName string, maxArticles int, batchSize int, dryRun bool) (int, int, error) {
 	// Get group database
-	groupDBs, err := db.GetGroupDBs(groupName)
+	groupDB, err := db.GetGroupDB(groupName)
 	if err != nil {
 		return 0, 0, fmt.Errorf("failed to get group database: %v", err)
 	}
-	defer groupDBs.Return(db)
+	defer groupDB.Return()
 
 	// First count total articles
 	var totalArticles int
-	err = database.RetryableQueryRowScan(groupDBs.DB, "SELECT COUNT(*) FROM articles", nil, &totalArticles)
+	err = database.RetryableQueryRowScan(groupDB.DB, "SELECT COUNT(*) FROM articles", nil, &totalArticles)
 	if err != nil {
 		return 0, 0, fmt.Errorf("failed to count articles: %v", err)
 	}
@@ -525,7 +525,7 @@ func pruneArticlesInGroup(db *database.Database, groupName string, maxArticles i
 		LIMIT ?
 	`
 
-	rows, err := database.RetryableQuery(groupDBs.DB, query, articlesToRemove)
+	rows, err := database.RetryableQuery(groupDB.DB, query, articlesToRemove)
 	if err != nil {
 		return 0, totalArticles, fmt.Errorf("failed to query oldest articles: %v", err)
 	}
@@ -556,7 +556,7 @@ func pruneArticlesInGroup(db *database.Database, groupName string, maxArticles i
 			}
 
 			batch := articlesToDelete[i:end]
-			if err := deleteArticles(groupDBs, batch); err != nil {
+			if err := deleteArticles(groupDB, batch); err != nil {
 				return totalPruned, totalArticles, fmt.Errorf("failed to delete article batch: %v", err)
 			}
 
@@ -577,22 +577,22 @@ func pruneArticlesInGroup(db *database.Database, groupName string, maxArticles i
 // updateNewsgroupCounters updates the message count and last article number for a newsgroup
 func updateNewsgroupCounters(db *database.Database, groupName string) error {
 	// Get group database to count current articles
-	groupDBs, err := db.GetGroupDBs(groupName)
+	groupDB, err := db.GetGroupDB(groupName)
 	if err != nil {
 		return fmt.Errorf("failed to get group database: %v", err)
 	}
-	defer groupDBs.Return(db)
+	defer groupDB.Return()
 
 	// Count current articles
 	var messageCount int64
-	err = database.RetryableQueryRowScan(groupDBs.DB, "SELECT COUNT(*) FROM articles", nil, &messageCount)
+	err = database.RetryableQueryRowScan(groupDB.DB, "SELECT COUNT(*) FROM articles", nil, &messageCount)
 	if err != nil {
 		return fmt.Errorf("failed to count articles: %v", err)
 	}
 
 	// Get the highest article number
 	var lastArticle int64
-	err = database.RetryableQueryRowScan(groupDBs.DB, "SELECT COALESCE(MAX(article_num), 0) FROM articles", nil, &lastArticle)
+	err = database.RetryableQueryRowScan(groupDB.DB, "SELECT COALESCE(MAX(article_num), 0) FROM articles", nil, &lastArticle)
 	if err != nil {
 		return fmt.Errorf("failed to get last article: %v", err)
 	}

cmd/fix-references/main.go

@@ -129,7 +129,7 @@ func main() {
 	for i, newsgroup := range newsgroups {
 		fmt.Printf("🔍 [%d/%d] Processing newsgroup: %s\n", i+1, len(newsgroups), newsgroup.Name)
 
-		groupDB, err := db.GetGroupDBs(newsgroup.Name)
+		groupDB, err := db.GetGroupDB(newsgroup.Name)
 		if err != nil {
 			fmt.Printf("   ❌ Failed to get group database: %v\n", err)
 			continue
@@ -138,7 +138,7 @@ func main() {
 		processed, fixed, err := fixReferencesInNewsgroup(groupDB, *dryRun, *verbose, *limit, *batchSize)
 		if err != nil {
 			fmt.Printf("   ❌ Failed to fix references: %v\n", err)
-			groupDB.Return(db)
+			groupDB.Return()
 			continue
 		}
 
@@ -156,7 +156,7 @@ func main() {
 			}
 		}
 
-		groupDB.Return(db)
+		groupDB.Return()
 
 		if processed > 0 {
 			if fixed > 0 {
@@ -186,7 +186,7 @@ func main() {
 	}
 }
 
-func fixReferencesInNewsgroup(groupDB *database.GroupDBs, dryRun, verbose bool, limit, batchSize int) (int, int, error) {
+func fixReferencesInNewsgroup(groupDB *database.GroupDB, dryRun, verbose bool, limit, batchSize int) (int, int, error) {
 	// Get total count for progress tracking
 	var totalCount int
 	countQuery := "SELECT COUNT(*) FROM articles WHERE headers_json IS NOT NULL AND headers_json != ''"
@@ -234,7 +234,7 @@ func fixReferencesInNewsgroup(groupDB *database.GroupDBs, dryRun, verbose bool,
 	return totalProcessed, totalFixed, nil
 }
 
-func processBatch(groupDB *database.GroupDBs, dryRun, verbose bool, offset, batchSize int) (int, int, error) {
+func processBatch(groupDB *database.GroupDB, dryRun, verbose bool, offset, batchSize int) (int, int, error) {
 	// Query articles with potentially broken references
 	query := `
 		SELECT article_num, message_id, "references", headers_json
@@ -320,7 +320,7 @@ func processBatch(groupDB *database.GroupDBs, dryRun, verbose bool, offset, batc
 }
 
 // rebuildThreadsInNewsgroup rebuilds thread relationships for a newsgroup using batched processing
-func rebuildThreadsInNewsgroup(groupDB *database.GroupDBs, verbose bool, batchSize int) (int, error) {
+func rebuildThreadsInNewsgroup(groupDB *database.GroupDB, verbose bool, batchSize int) (int, error) {
 	// Get total article count
 	var totalCount int
 	err := database.RetryableQueryRowScan(groupDB.DB, "SELECT COUNT(*) FROM articles", nil, &totalCount)
@@ -419,7 +419,7 @@ func rebuildThreadsInNewsgroup(groupDB *database.GroupDBs, verbose bool, batchSi
 	return totalThreadsBuilt, nil
 }
 
-func processThreadBatch(groupDB *database.GroupDBs, msgIDToArticleNum map[string]int64, offset, batchSize int, verbose bool) (int, error) {
+func processThreadBatch(groupDB *database.GroupDB, msgIDToArticleNum map[string]int64, offset, batchSize int, verbose bool) (int, error) {
 	// Get batch of articles with their references
 	rows, err := database.RetryableQuery(groupDB.DB, `
 		SELECT article_num, message_id, "references"

cmd/fix-thread-activity/main.go

@@ -60,14 +60,14 @@ func main() {
 }
 
 func fixGroupThreadActivity(db *database.Database, groupName string) error {
-	groupDBs, err := db.GetGroupDBs(groupName)
+	groupDB, err := db.GetGroupDB(groupName)
 	if err != nil {
 		return fmt.Errorf("failed to get group DB: %w", err)
 	}
-	defer groupDBs.Return(db)
+	defer groupDB.Return()
 
 	// Get only thread cache entries that have future last_activity timestamps
-	rows, err := database.RetryableQuery(groupDBs.DB, `
+	rows, err := database.RetryableQuery(groupDB.DB, `
 		SELECT thread_root, child_articles, last_activity
 		FROM thread_cache
 		WHERE last_activity > datetime('now', '+25 hour')
@@ -136,7 +136,7 @@ func fixGroupThreadActivity(db *database.Database, groupName string) error {
 		for _, articleNum := range articleNums {
 			var dateSent time.Time
 			var hide int
-			err := database.RetryableQueryRowScan(groupDBs.DB, `
+			err := database.RetryableQueryRowScan(groupDB.DB, `
 				SELECT date_sent, hide
 				FROM articles
 				WHERE article_num = ?`, []interface{}{articleNum}, &dateSent, &hide)
@@ -161,7 +161,7 @@ func fixGroupThreadActivity(db *database.Database, groupName string) error {
 			// Format as UTC string to avoid timezone encoding issues
 			utcTimeStr := maxDate.UTC().Format("2006-01-02 15:04:05")
 
-			_, err := database.RetryableExec(groupDBs.DB, `
+			_, err := database.RetryableExec(groupDB.DB, `
 				UPDATE thread_cache
 				SET last_activity = ?
 				WHERE thread_root = ?`, utcTimeStr, thread.root)