Remove bbolt database dependency
Replaced bbolt-based database handling with Fyne built-in preferences for storing application settings. Deleted migration logic, database initialization, and error handling related to bbolt, simplifying the codebase and reducing external dependencies.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
package setting
|
||||
|
||||
type DirectoryForSavingContract interface {
|
||||
GetDirectoryForSaving() (string, error)
|
||||
SaveDirectoryForSaving(path string) (Setting, error)
|
||||
GetDirectoryForSaving() string
|
||||
SaveDirectoryForSaving(path string) Setting
|
||||
}
|
||||
|
||||
type DirectoryForSaving struct {
|
||||
@@ -13,10 +13,10 @@ func NewSettingDirectoryForSaving(settingRepository RepositoryContract) *Directo
|
||||
return &DirectoryForSaving{settingRepository: settingRepository}
|
||||
}
|
||||
|
||||
func (setting DirectoryForSaving) GetDirectoryForSaving() (string, error) {
|
||||
func (setting DirectoryForSaving) GetDirectoryForSaving() string {
|
||||
return setting.settingRepository.GetValue("directoryForSaving")
|
||||
}
|
||||
|
||||
func (setting DirectoryForSaving) SaveDirectoryForSaving(path string) (Setting, error) {
|
||||
func (setting DirectoryForSaving) SaveDirectoryForSaving(path string) Setting {
|
||||
return setting.settingRepository.CreateOrUpdate("directoryForSaving", path)
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
package setting
|
||||
|
||||
type Setting struct {
|
||||
Code string `json:"code"`
|
||||
Value string `json:"value"`
|
||||
Code string
|
||||
Value string
|
||||
}
|
||||
|
@@ -1,82 +1,39 @@
|
||||
package setting
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/db"
|
||||
"go.etcd.io/bbolt"
|
||||
"fyne.io/fyne/v2"
|
||||
)
|
||||
|
||||
type RepositoryContract interface {
|
||||
Create(setting Setting) (Setting, error)
|
||||
CreateOrUpdate(code string, value string) (Setting, error)
|
||||
GetValue(code string) (value string, err error)
|
||||
Create(setting Setting) Setting
|
||||
CreateOrUpdate(code string, value string) Setting
|
||||
GetValue(code string) string
|
||||
}
|
||||
|
||||
type Repository struct {
|
||||
db *bbolt.DB
|
||||
app fyne.App
|
||||
}
|
||||
|
||||
func NewRepository(db *bbolt.DB) *Repository {
|
||||
return &Repository{db}
|
||||
}
|
||||
|
||||
func (r Repository) GetValue(code string) (value string, err error) {
|
||||
var setting Setting
|
||||
|
||||
err = r.db.View(func(tx *bbolt.Tx) error {
|
||||
b := tx.Bucket([]byte("settings"))
|
||||
if b == nil {
|
||||
return errors.New("bucket 'settings' not found")
|
||||
}
|
||||
val := b.Get([]byte(code))
|
||||
if val == nil {
|
||||
return db.ErrRecordNotFound
|
||||
}
|
||||
return json.Unmarshal(val, &setting)
|
||||
})
|
||||
if err != nil {
|
||||
return "", err
|
||||
func NewRepository(app fyne.App) *Repository {
|
||||
return &Repository{
|
||||
app: app,
|
||||
}
|
||||
|
||||
return setting.Value, nil
|
||||
|
||||
}
|
||||
|
||||
func (r Repository) Create(setting Setting) (Setting, error) {
|
||||
err := r.db.Update(func(tx *bbolt.Tx) error {
|
||||
b := tx.Bucket([]byte("settings"))
|
||||
if b == nil {
|
||||
return errors.New("bucket 'settings' not found")
|
||||
}
|
||||
|
||||
data, err := json.Marshal(setting)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return b.Put([]byte(setting.Code), data)
|
||||
})
|
||||
return setting, err
|
||||
func (r Repository) GetValue(code string) string {
|
||||
return r.app.Preferences().String(code)
|
||||
}
|
||||
|
||||
func (r Repository) CreateOrUpdate(code string, value string) (Setting, error) {
|
||||
func (r Repository) Create(setting Setting) Setting {
|
||||
r.app.Preferences().SetString(setting.Code, setting.Value)
|
||||
return setting
|
||||
}
|
||||
|
||||
func (r Repository) CreateOrUpdate(code string, value string) Setting {
|
||||
var setting Setting
|
||||
setting.Code = code
|
||||
setting.Value = value
|
||||
|
||||
err := r.db.Update(func(tx *bbolt.Tx) error {
|
||||
b := tx.Bucket([]byte("settings"))
|
||||
if b == nil {
|
||||
return errors.New("bucket 'settings' not found")
|
||||
}
|
||||
|
||||
data, err := json.Marshal(setting)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return b.Put([]byte(code), data)
|
||||
})
|
||||
return setting, err
|
||||
r.app.Preferences().SetString(code, value)
|
||||
return setting
|
||||
}
|
||||
|
Reference in New Issue
Block a user