Replace packr with go embed (#1751)

* Embed performer images
* Embed schema migrations
* Update dependencies
* Embed UI
* Remove remaining packr references
This commit is contained in:
WithoutPants
2021-09-22 13:08:34 +10:00
committed by GitHub
parent f292238e7f
commit 56111433a1
429 changed files with 39923 additions and 23061 deletions

View File

@@ -2,6 +2,7 @@ package database
import (
"database/sql"
"embed"
"errors"
"fmt"
"os"
@@ -9,10 +10,9 @@ import (
"time"
"github.com/fvbommel/sortorder"
"github.com/gobuffalo/packr/v2"
"github.com/golang-migrate/migrate/v4"
sqlite3mig "github.com/golang-migrate/migrate/v4/database/sqlite3"
"github.com/golang-migrate/migrate/v4/source"
"github.com/golang-migrate/migrate/v4/source/iofs"
"github.com/jmoiron/sqlx"
sqlite3 "github.com/mattn/go-sqlite3"
@@ -26,6 +26,9 @@ var dbPath string
var appSchemaVersion uint = 28
var databaseSchemaVersion uint
//go:embed migrations/*.sql
var migrationsBox embed.FS
var (
// ErrMigrationNeeded indicates that a database migration is needed
// before the database can be initialized
@@ -200,17 +203,13 @@ func Version() uint {
}
func getMigrate() (*migrate.Migrate, error) {
migrationsBox := packr.New("Migrations Box", "./migrations")
packrSource := &Packr2Source{
Box: migrationsBox,
Migrations: source.NewMigrations(),
migrations, err := iofs.New(migrationsBox, "migrations")
if err != nil {
panic(err.Error())
}
databasePath := utils.FixWindowsPath(dbPath)
s, _ := WithInstance(packrSource)
const disableForeignKeys = true
conn := open(databasePath, disableForeignKeys)
conn := open(dbPath, disableForeignKeys)
driver, err := sqlite3mig.WithInstance(conn.DB, &sqlite3mig.Config{})
if err != nil {
@@ -219,9 +218,9 @@ func getMigrate() (*migrate.Migrate, error) {
// use sqlite3Driver so that migration has access to durationToTinyInt
return migrate.NewWithInstance(
"packr2",
s,
databasePath,
"iofs",
migrations,
dbPath,
driver,
)
}