Update deps, refactoring

adapters/repository/badger/db.go

@@ -1,128 +0,0 @@
-package badger
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path"
-
-	"github.com/dgraph-io/badger/v4"
-	"github.com/dgraph-io/badger/v4/options"
-	"go.uber.org/zap"
-)
-
-const (
-	backupStartPath = "backup_start.db"
-	backupStopPath  = "backup_stop.db"
-)
-
-type BackupType uint8
-
-const (
-	BackupStart BackupType = iota
-	BackupStop
-)
-
-var ErrDBClosed = fmt.Errorf("database is closed")
-
-type logger struct {
-	*zap.SugaredLogger
-}
-
-func (l *logger) Warningf(s string, i ...interface{}) {
-	l.SugaredLogger.Warnf(s, i...)
-}
-
-func NewBadger(dir string, log *zap.Logger) (*badger.DB, error) {
-	opts := badger.DefaultOptions(dir)
-	opts.Logger = &logger{SugaredLogger: log.Sugar()}
-	opts.Compression = options.ZSTD
-	opts.ZSTDCompressionLevel = 6
-
-	db, err := badger.Open(opts)
-	if err != nil {
-		return nil, fmt.Errorf("open database: %w", err)
-	}
-
-	if err := Backup(db, BackupStart); err != nil {
-		log.Error("backup on start failed", zap.Error(err))
-	}
-
-	return db, nil
-}
-
-func Backup(db *badger.DB, bt BackupType) error {
-	dir := db.Opts().Dir
-	var backupPath string
-
-	switch bt {
-	case BackupStart:
-		backupPath = path.Join(dir, backupStartPath)
-	case BackupStop:
-		backupPath = path.Join(dir, backupStopPath)
-	}
-
-	file, err := os.OpenFile(backupPath, os.O_CREATE|os.O_WRONLY, os.FileMode(0600))
-	if err != nil {
-		return fmt.Errorf("open backup file %s: %w", backupPath, err)
-	}
-	defer func() {
-		_ = file.Close()
-	}()
-
-	_, err = db.Backup(file, 0)
-	if err != nil {
-		return fmt.Errorf("backup: %w", err)
-	}
-
-	return nil
-}
-
-func Restore(db *badger.DB) error {
-	dir := db.Opts().Dir
-
-	backupPathStart := path.Join(dir, backupStartPath)
-	backupPathStop := path.Join(dir, backupStopPath)
-
-	startStat, err := os.Stat(backupPathStart)
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return fmt.Errorf("stat file %s: %w", backupPathStart, err)
-	}
-
-	stopStat, err := os.Stat(backupPathStop)
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return fmt.Errorf("stat file %s: %w", backupPathStop, err)
-	}
-
-	var backupFile string
-
-	switch {
-	case stopStat != nil && startStat != nil:
-		if stopStat.ModTime().After(startStat.ModTime()) {
-			backupFile = backupPathStop
-		} else {
-			backupFile = backupPathStart
-		}
-
-	case stopStat != nil:
-		backupFile = backupPathStart
-
-	case startStat != nil:
-		backupFile = backupPathStop
-	}
-
-	file, err := os.OpenFile(backupFile, os.O_RDONLY, os.FileMode(0600))
-	if err != nil {
-		return fmt.Errorf("open backup file %s: %w", backupFile, err)
-	}
-
-	defer func() {
-		_ = file.Close()
-	}()
-
-	if err := db.Load(file, 20); err != nil {
-		return fmt.Errorf("load backup: %w", err)
-	}
-
-	return nil
-}

adapters/repository/badger/page.go

@@ -8,6 +8,8 @@ import (
 	"github.com/dgraph-io/badger/v4"
 	"github.com/google/uuid"
 
+	"github.com/derfenix/webarchive/adapters/repository"
+
 	"github.com/derfenix/webarchive/entity"
 )
 
@@ -24,7 +26,9 @@ type Page struct {
 }
 
 func (p *Page) GetFile(_ context.Context, pageID, fileID uuid.UUID) (*entity.File, error) {
-	page := entity.Page{ID: pageID}
+	page := entity.Page{}
+	page.ID = pageID
+
 	var file *entity.File
 
 	err := p.db.View(func(txn *badger.Txn) error {
@@ -66,7 +70,7 @@ func (p *Page) GetFile(_ context.Context, pageID, fileID uuid.UUID) (*entity.Fil
 
 func (p *Page) Save(_ context.Context, page *entity.Page) error {
 	if p.db.IsClosed() {
-		return ErrDBClosed
+		return repository.ErrDBClosed
 	}
 
 	marshaled, err := marshal(page)
@@ -88,16 +92,17 @@ func (p *Page) Save(_ context.Context, page *entity.Page) error {
 }
 
 func (p *Page) Get(_ context.Context, id uuid.UUID) (*entity.Page, error) {
-	site := entity.Page{ID: id}
+	page := entity.Page{}
+	page.ID = id
 
 	err := p.db.View(func(txn *badger.Txn) error {
-		data, err := txn.Get(p.key(&site))
+		data, err := txn.Get(p.key(&page))
 		if err != nil {
 			return fmt.Errorf("get data: %w", err)
 		}
 
 		err = data.Value(func(val []byte) error {
-			if err := unmarshal(val, &site); err != nil {
+			if err := unmarshal(val, &page); err != nil {
 				return fmt.Errorf("unmarshal data: %w", err)
 			}
 
@@ -113,7 +118,7 @@ func (p *Page) Get(_ context.Context, id uuid.UUID) (*entity.Page, error) {
 		return nil, fmt.Errorf("view: %w", err)
 	}
 
-	return &site, nil
+	return &page, nil
 }
 
 func (p *Page) ListAll(ctx context.Context) ([]*entity.Page, error) {
@@ -143,16 +148,7 @@ func (p *Page) ListAll(ctx context.Context) ([]*entity.Page, error) {
 				return fmt.Errorf("get item: %w", err)
 			}
 
-			pages = append(pages, &entity.Page{
-				ID:          page.ID,
-				URL:         page.URL,
-				Description: page.Description,
-				Created:     page.Created,
-				Formats:     page.Formats,
-				Version:     page.Version,
-				Status:      page.Status,
-				Meta:        page.Meta,
-			})
+			pages = append(pages, &page)
 		}
 
 		return nil
@@ -196,12 +192,11 @@ func (p *Page) ListUnprocessed(ctx context.Context) ([]entity.Page, error) {
 				return fmt.Errorf("get item: %w", err)
 			}
 
-			if page.Status != entity.StatusProcessing {
-				continue
+			if page.Status == entity.StatusNew {
+				//goland:noinspection GoVetCopyLock
+				pages = append(pages, page) //nolint:govet // didn't touch the lock here
 			}
 
-			//goland:noinspection GoVetCopyLock
-			pages = append(pages, page) //nolint:govet // didn't touch the lock here
 		}
 
 		return nil

adapters/repository/badger/page_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/derfenix/webarchive/adapters/repository"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
@@ -31,7 +32,7 @@ func TestSite(t *testing.T) {
 
 	log := zaptest.NewLogger(t)
 
-	db, err := NewBadger(tempDir, log.Named("db"))
+	db, err := repository.NewBadger(tempDir, log.Named("db"))
 	require.NoError(t, err)
 
 	siteRepo, err := NewPage(db)