diff --git a/go.sum b/go.sum index b0c2995..8b36dab 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= github.com/go-gl/mathgl v1.2.0 h1:v2eOj/y1B2afDxF6URV1qCYmo1KW08lAMtTbOn3KXCY= @@ -14,11 +12,6 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs= github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/mutecomm/go-sqlcipher/v4 v4.4.2 h1:eM10bFtI4UvibIsKr10/QT7Yfz+NADfjZYh0GKrXUNc= -github.com/mutecomm/go-sqlcipher/v4 v4.4.2/go.mod h1:mF2UmIpBnzFeBdu/ypTDb/LdbS0nk0dfSN1WUsWTjMA= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/veandco/go-sdl2 v0.4.40 h1:fZv6wC3zz1Xt167P09gazawnpa0KY5LM7JAvKpX9d/U= github.com/veandco/go-sdl2 v0.4.40/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY= golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= diff --git a/internal/db/newDb.go b/internal/db/newDb.go index e535cd4..21a3e1b 100644 --- a/internal/db/newDb.go +++ b/internal/db/newDb.go @@ -17,6 +17,7 @@ func Connect(dbpath string) (*gorm.DB, error) { if err != nil { return nil, err } + // Set pragmas sqlDB, err := db.DB() if err != nil { diff --git a/internal/sync/sync.go b/internal/sync/sync.go index 7b09a4a..2fd3951 100644 --- a/internal/sync/sync.go +++ b/internal/sync/sync.go @@ -4,6 +4,7 @@ import ( "regexp" "gorm.io/gorm" + "gorm.io/gorm/clause" "rhemawavetech.com/rhemawave/internal/db" "rhemawavetech.com/rhemawave/internal/logger" "rhemawavetech.com/rhemawave/internal/netreq" @@ -43,20 +44,38 @@ func SyncProclamations(database *gorm.DB) ([]db.Proclamation, error) { } err = database.Transaction(func(tx *gorm.DB) error { - // Clear the database - // Where "1 = 1" because batch Delete() requires a condition - // 'Where "1 = 1"' is like saying "while true be true" and tricks GORM into deleting everything - if err := tx.Where("1 = 1").Delete(db.Proclamation{}).Error; err != nil { + ids := make([]string, len(proclamations)) + for i, p := range proclamations { + ids[i] = p.ID + } + + if len(ids) == 0 { + // API returned nothing → DB should be empty + if err := tx.Where("1 = 1").Delete(&db.Proclamation{}).Error; err != nil { + return err + } + } else { + // Remove anything not in API + if err := tx.Where("id NOT IN ?", ids).Delete(&db.Proclamation{}).Error; err != nil { + return err + } + } + + // Upsert (preserve Selected automatically) + if err := tx.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "id"}}, + DoUpdates: clause.AssignmentColumns([]string{ + "name", + "content", + "solfeggio_frequency_id", + "category_id", + "available", + "price", + }), + }).Create(&proclamations).Error; err != nil { return err } - // Then re-populate the database - if err := tx.Save(&proclamations).Error; err != nil { - return err - } - // Old sync code - // if err := tx.Omit("selected").Save(&proclamations).Error; err != nil { - // return err - // } + return nil }) diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_android_arm.a new file mode 100644 index 0000000..3955382 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_darwin_amd64.a new file mode 100644 index 0000000..809567d Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_darwin_arm64.a new file mode 100644 index 0000000..7c334ed Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_android_arm.a new file mode 100644 index 0000000..73150d1 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_darwin_amd64.a new file mode 100644 index 0000000..e0e0211 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_386.a new file mode 100644 index 0000000..250aaf5 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_amd64.a new file mode 100644 index 0000000..c077268 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_arm.a new file mode 100644 index 0000000..ca07372 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_windows_386.a new file mode 100644 index 0000000..42c8792 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_windows_amd64.a new file mode 100644 index 0000000..2e79f52 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_gfx_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_android_arm.a new file mode 100644 index 0000000..f2313fd Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_darwin_amd64.a new file mode 100644 index 0000000..ff7f1ff Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_darwin_arm64.a new file mode 100644 index 0000000..e0bc5eb Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_386.a new file mode 100644 index 0000000..0b8a2a8 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_amd64.a new file mode 100644 index 0000000..f4502bb Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_arm.a new file mode 100644 index 0000000..42a02d4 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_windows_386.a new file mode 100644 index 0000000..7ba15aa Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_windows_amd64.a new file mode 100644 index 0000000..99e9562 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_image_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_386.a new file mode 100644 index 0000000..e5c18e0 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_amd64.a new file mode 100644 index 0000000..1124539 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_arm.a new file mode 100644 index 0000000..b45294b Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_android_arm.a new file mode 100644 index 0000000..e6931ca Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_darwin_amd64.a new file mode 100644 index 0000000..d80e0b5 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_darwin_arm64.a new file mode 100644 index 0000000..a63b1c3 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_386.a new file mode 100644 index 0000000..65f5150 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_amd64.a new file mode 100644 index 0000000..b988888 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_arm.a new file mode 100644 index 0000000..5d89d49 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_windows_386.a new file mode 100644 index 0000000..0d33aef Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_windows_amd64.a new file mode 100644 index 0000000..f888bd6 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_mixer_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_android_arm.a new file mode 100644 index 0000000..add4519 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_darwin_amd64.a new file mode 100644 index 0000000..cec7005 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_darwin_arm64.a new file mode 100644 index 0000000..4525e7c Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_386.a new file mode 100644 index 0000000..0e40f5b Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_amd64.a new file mode 100644 index 0000000..b322096 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_arm.a new file mode 100644 index 0000000..8ee083c Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_windows_386.a new file mode 100644 index 0000000..3ce7b0e Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_windows_amd64.a new file mode 100644 index 0000000..1938c57 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_ttf_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_windows_386.a new file mode 100644 index 0000000..86a6c8f Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_windows_amd64.a new file mode 100644 index 0000000..7a0c158 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_android_arm.a new file mode 100644 index 0000000..2faab1a Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_darwin_amd64.a new file mode 100644 index 0000000..86f721f Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_386.a new file mode 100644 index 0000000..51e70f5 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_amd64.a new file mode 100644 index 0000000..6d9bb3d Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_arm.a new file mode 100644 index 0000000..366b6b7 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_windows_386.a new file mode 100644 index 0000000..e3ddb60 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_windows_amd64.a new file mode 100644 index 0000000..a7bca83 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libSDL2main_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_android_arm.a new file mode 100644 index 0000000..7a19e20 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_darwin_amd64.a new file mode 100644 index 0000000..ecb3403 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_darwin_arm64.a new file mode 100644 index 0000000..9c0d037 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_386.a new file mode 100644 index 0000000..78dd3f0 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_amd64.a new file mode 100644 index 0000000..678a40e Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_arm.a new file mode 100644 index 0000000..0c86142 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_windows_386.a new file mode 100644 index 0000000..925df5c Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_windows_amd64.a new file mode 100644 index 0000000..06a86c7 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libfreetype_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_android_arm.a new file mode 100644 index 0000000..d8c5bb4 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_darwin_amd64.a new file mode 100644 index 0000000..96ed3e5 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_darwin_arm64.a new file mode 100644 index 0000000..221f7dc Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_386.a new file mode 100644 index 0000000..5f54db7 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_amd64.a new file mode 100644 index 0000000..9e7bbb7 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_arm.a new file mode 100644 index 0000000..428b804 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_windows_386.a new file mode 100644 index 0000000..2e24c98 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_windows_amd64.a new file mode 100644 index 0000000..eb54908 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libjpeg_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_android_arm.a new file mode 100644 index 0000000..3b84d39 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_darwin_amd64.a new file mode 100644 index 0000000..809d051 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_darwin_arm64.a new file mode 100644 index 0000000..20b623f Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_386.a new file mode 100644 index 0000000..4b1b4e8 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_amd64.a new file mode 100644 index 0000000..3500d4c Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_arm.a new file mode 100644 index 0000000..b9c2f1a Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_windows_386.a new file mode 100644 index 0000000..4f41bc9 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_windows_amd64.a new file mode 100644 index 0000000..8bec966 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libmpg123_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_android_arm.a new file mode 100644 index 0000000..17b2b88 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_darwin_amd64.a new file mode 100644 index 0000000..4e782fd Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_darwin_arm64.a new file mode 100644 index 0000000..6d799f8 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_386.a new file mode 100644 index 0000000..c6e0aef Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_amd64.a new file mode 100644 index 0000000..fd50e3b Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_arm.a new file mode 100644 index 0000000..7aad4f7 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_windows_386.a new file mode 100644 index 0000000..1235cfa Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libogg_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libogg_windows_amd64.a new file mode 100644 index 0000000..45d0bdc Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libogg_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_android_arm.a new file mode 100644 index 0000000..2ab621c Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_darwin_amd64.a new file mode 100644 index 0000000..5863e12 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_darwin_arm64.a new file mode 100644 index 0000000..9cf62e6 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_386.a new file mode 100644 index 0000000..d423664 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_amd64.a new file mode 100644 index 0000000..4c72996 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_arm.a new file mode 100644 index 0000000..26932ee Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_windows_386.a new file mode 100644 index 0000000..c6ebc11 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libpng_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libpng_windows_amd64.a new file mode 100644 index 0000000..0b0993f Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libpng_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_android_arm.a new file mode 100644 index 0000000..1c35572 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_darwin_amd64.a new file mode 100644 index 0000000..0bb1f9b Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_darwin_arm64.a new file mode 100644 index 0000000..eeec45c Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_386.a new file mode 100644 index 0000000..29fd17a Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_amd64.a new file mode 100644 index 0000000..ecddb6d Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_arm.a new file mode 100644 index 0000000..f355eb9 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_windows_386.a new file mode 100644 index 0000000..1dff310 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_windows_amd64.a new file mode 100644 index 0000000..8520bf9 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbis_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_android_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_android_arm.a new file mode 100644 index 0000000..f81aba7 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_android_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_darwin_amd64.a new file mode 100644 index 0000000..e37139e Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_darwin_arm64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_darwin_arm64.a new file mode 100644 index 0000000..982a1fb Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_darwin_arm64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_386.a new file mode 100644 index 0000000..bd624e2 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_amd64.a new file mode 100644 index 0000000..dd58749 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_arm.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_arm.a new file mode 100644 index 0000000..e96941a Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_linux_arm.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_windows_386.a new file mode 100644 index 0000000..0c2479a Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_windows_amd64.a new file mode 100644 index 0000000..ac0d6c4 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libvorbisfile_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libz_darwin_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libz_darwin_amd64.a new file mode 100644 index 0000000..5f321c4 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libz_darwin_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libz_linux_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libz_linux_386.a new file mode 100644 index 0000000..aa3ea05 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libz_linux_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libz_linux_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libz_linux_amd64.a new file mode 100644 index 0000000..fdcfc3d Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libz_linux_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libz_windows_386.a b/vendor/github.com/veandco/go-sdl2/_libs/libz_windows_386.a new file mode 100644 index 0000000..5a7ab12 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libz_windows_386.a differ diff --git a/vendor/github.com/veandco/go-sdl2/_libs/libz_windows_amd64.a b/vendor/github.com/veandco/go-sdl2/_libs/libz_windows_amd64.a new file mode 100644 index 0000000..cab0237 Binary files /dev/null and b/vendor/github.com/veandco/go-sdl2/_libs/libz_windows_amd64.a differ diff --git a/vendor/github.com/veandco/go-sdl2/mix/sdl_mixer.go b/vendor/github.com/veandco/go-sdl2/mix/sdl_mixer.go index 9f8d36f..1cfca80 100644 --- a/vendor/github.com/veandco/go-sdl2/mix/sdl_mixer.go +++ b/vendor/github.com/veandco/go-sdl2/mix/sdl_mixer.go @@ -37,12 +37,9 @@ package mix //} //#endif import "C" -import ( - "reflect" - "unsafe" - - "github.com/veandco/go-sdl2/sdl" -) +import "unsafe" +import "reflect" +import "github.com/veandco/go-sdl2/sdl" // Chunk is the internal format for an audio chunk. // (https://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer_85.html) @@ -215,7 +212,6 @@ func LoadWAV(file string) (chunk *Chunk, err error) { chunk = (*Chunk)(unsafe.Pointer(C.Mix_LoadWAV_RW(C.SDL_RWFromFile(_file, _rb), 1))) if chunk == nil { err = sdl.GetError() - return nil, err } return } @@ -228,7 +224,6 @@ func LoadMUS(file string) (mus *Music, err error) { mus = (*Music)(unsafe.Pointer(C.Mix_LoadMUS(_file))) if mus == nil { err = sdl.GetError() - return nil, err } return }