From c07194c3db28df3696fc8ebe28b965e345ae0da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 20 Oct 2018 01:04:11 +0700 Subject: [PATCH] Add rdb files as a submodule (#64) * Add rdb files as a submodule * Try to fix disk space issue --- .gitmodules | 3 +++ Makefile | 3 ++- database | 1 + main.go | 2 +- scanner/scanner.go | 4 ++++ 5 files changed, 11 insertions(+), 2 deletions(-) create mode 160000 database diff --git a/.gitmodules b/.gitmodules index ecea2678..b273185b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = assets url = https://github.com/kivutar/ludo-assets.git branch = master +[submodule "database"] + path = database + url = https://github.com/kivutar/ludo-database.git diff --git a/Makefile b/Makefile index 8df25676..8cd6eff1 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ $(BUNDLENAME).app: ludo mkdir -p $(BUNDLENAME).app/Contents/Resources/$(BUNDLENAME).iconset cp pkg/Info.plist $(BUNDLENAME).app/Contents/ echo "APPL????" > $(BUNDLENAME).app/Contents/PkgInfo + cp -r database $(BUNDLENAME).app/Contents/Resources cp -r assets $(BUNDLENAME).app/Contents/Resources sips -z 16 16 assets/icon.png --out $(BUNDLENAME).app/Contents/Resources/$(BUNDLENAME).iconset/icon_16x16.png sips -z 32 32 assets/icon.png --out $(BUNDLENAME).app/Contents/Resources/$(BUNDLENAME).iconset/icon_16x16@2x.png @@ -24,7 +25,7 @@ $(BUNDLENAME).app: ludo empty.dmg: mkdir -p template - hdiutil create -fs HFSX -layout SPUD -size 40m empty.dmg -srcfolder template -format UDRW -volname $(BUNDLENAME) -quiet + hdiutil create -fs HFSX -layout SPUD -size 200m empty.dmg -srcfolder template -format UDRW -volname $(BUNDLENAME) -quiet rmdir template $(BUNDLENAME).dmg: empty.dmg $(BUNDLENAME).app diff --git a/database b/database new file mode 160000 index 00000000..d6f4f41e --- /dev/null +++ b/database @@ -0,0 +1 @@ +Subproject commit d6f4f41e91f0ce2bce6223d1fe3abc58662830ac diff --git a/main.go b/main.go index c26a86dc..633c3568 100644 --- a/main.go +++ b/main.go @@ -78,7 +78,7 @@ func main() { settings.Save() } - state.Global.DB, err = scanner.LoadDB("/Users/kivutar/libretro-database/rdb/") + state.Global.DB, err = scanner.LoadDB("database/") if err != nil { log.Println("Can't load game database:", err) } diff --git a/scanner/scanner.go b/scanner/scanner.go index f3428cf4..306e3998 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -7,6 +7,7 @@ import ( "os/user" "path/filepath" "strconv" + "strings" "github.com/libretro/ludo/notifications" "github.com/libretro/ludo/rdb" @@ -23,6 +24,9 @@ func LoadDB(dir string) (rdb.DB, error) { } db := make(rdb.DB) for _, f := range files { + if !strings.Contains(f.Name(), ".rdb") { + continue + } filename := f.Name() system := filename[0 : len(filename)-4] bytes, _ := ioutil.ReadFile(dir + f.Name())