Replace GORM with bbolt for database operations
Migrated from GORM to bbolt for lightweight key-value storage, better aligning with project requirements. Updated repository methods to utilize bbolt's native APIs and removed dependencies associated with GORM.
This commit is contained in:
22
main.go
22
main.go
@@ -4,6 +4,7 @@ import (
|
||||
"errors"
|
||||
"fyne.io/fyne/v2"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
|
||||
dberror "git.kor-elf.net/kor-elf/gui-for-ffmpeg/db"
|
||||
error2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/error"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/handler"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
|
||||
@@ -12,10 +13,10 @@ import (
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/migration"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
"go.etcd.io/bbolt"
|
||||
"golang.org/x/text/language"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"os"
|
||||
"time"
|
||||
)
|
||||
|
||||
var application kernel.AppContract
|
||||
@@ -50,20 +51,20 @@ func init() {
|
||||
|
||||
func main() {
|
||||
errorView := error2.NewView(application)
|
||||
if canCreateFile("data/database") != true {
|
||||
if canCreateFile("data/database.db") != true {
|
||||
errorView.PanicErrorWriteDirectoryData()
|
||||
application.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
|
||||
db, err := gorm.Open(sqlite.Open("data/database"), &gorm.Config{})
|
||||
db, err := bbolt.Open("data/database.db", 0600, &bbolt.Options{Timeout: 3 * time.Second})
|
||||
if err != nil {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
|
||||
defer appCloseWithDb(db)
|
||||
defer db.Close()
|
||||
|
||||
err = migration.Run(db)
|
||||
if err != nil {
|
||||
@@ -75,7 +76,7 @@ func main() {
|
||||
settingRepository := setting.NewRepository(db)
|
||||
convertorRepository := convertor.NewRepository(settingRepository)
|
||||
pathFFmpeg, err := convertorRepository.GetPathFfmpeg()
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
|
||||
if err != nil && errors.Is(err, dberror.ErrRecordNotFound) == false {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
return
|
||||
@@ -83,7 +84,7 @@ func main() {
|
||||
ffPathUtilities.FFmpeg = pathFFmpeg
|
||||
|
||||
pathFFprobe, err := convertorRepository.GetPathFfprobe()
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
|
||||
if err != nil && errors.Is(err, dberror.ErrRecordNotFound) == false {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
return
|
||||
@@ -108,13 +109,6 @@ func main() {
|
||||
application.GetWindow().ShowAndRun()
|
||||
}
|
||||
|
||||
func appCloseWithDb(db *gorm.DB) {
|
||||
sqlDB, err := db.DB()
|
||||
if err == nil {
|
||||
_ = sqlDB.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func canCreateFile(path string) bool {
|
||||
file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0666)
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user