Use an embedded file system for the structure folder

Author: paul-norman

README.md

@@ -47,7 +47,7 @@ Download the most suitable build for your system from the `releases`. This will
 
 ```Shell
 sudo mkdir -p /var/www/ip-location-api
-sudo wget -q -O /var/www/ip-location-api/ip-location-api https://github.com/paul-norman/ip-location-api/releases/download/v1.0.0/ip-location-api-linux-x64.bin 
+sudo wget -q -O /var/www/ip-location-api/ip-location-api https://github.com/paul-norman/ip-location-api/releases/latest/download/ip-location-api-linux-x64.bin 
 sudo chmod +x /var/www/ip-location-api/ip-location-api
 ``` 
 
@@ -64,6 +64,8 @@ cd /var/www/ip-location-api
 sudo ./ip-location-api
 ```
 
+**It's probably a good idea to start the system up manually like this on the first run** because it will allow you to see the data loading progress / any problems. After that, using a service is a good idea.
+
 ## Configuration
 
 Configuration is handled by an environmental (`.env`) file. Example files for each database type exist in the `.env.sample` directory. All database types share some information:

data_access.go

@@ -1,10 +1,14 @@
 package main
 
 import (
+	"embed"
 	"net"
 	"os"
 )
 
+//go:embed structure/*.sql
+var dbStructures embed.FS
+
 func dbConnect() {
 	switch os.Getenv("DB_TYPE") {
 		case "postgres": 	postgresConnect()

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/seancfoley/bintree v1.3.1 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
 	modernc.org/libc v1.56.0 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect

go.sum

@@ -45,8 +45,8 @@ golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
+golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
 golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

mysql.go

@@ -259,7 +259,8 @@ func mysqlSaveCities(cities []IpCity) {
 }
 
 func mysqlFile(sqlPath string) {
-	sqlBytes, err := os.ReadFile(sqlPath)
+	sqlBytes, err := dbStructures.ReadFile(sqlPath)
+	//sqlBytes, err := os.ReadFile(sqlPath)
 	if err != nil {
 		panic(err)
 	}

postgres.go

@@ -315,7 +315,8 @@ func fixPostgresVars(sqlString string) string {
 }
 
 func postgresFile(sqlPath string) {
-	sqlBytes, err := os.ReadFile(sqlPath)
+	sqlBytes, err := dbStructures.ReadFile(sqlPath)
+	//sqlBytes, err := os.ReadFile(sqlPath)
 	if err != nil {
 		panic(err)
 	}

sqlite.go

@@ -351,7 +351,8 @@ func sqliteSaveCities(cities []IpCity) {
 }
 
 func sqliteFile(sqlPath string) {
-	sqlBytes, err := os.ReadFile(sqlPath)
+	sqlBytes, err := dbStructures.ReadFile(sqlPath)
+	//sqlBytes, err := os.ReadFile(sqlPath)
 	if err != nil {
 		panic(err)
 	}