Refactor into client + server backends

main.go

@@ -7,9 +7,10 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/op/go-logging"
 
-	"github.com/restitux/ikinuki-server/database"
-	"github.com/restitux/ikinuki-server/rest"
-	"gitlab.com/ohea/golang/config"
+	"git.ohea.xyz/golang/config"
+
+	"git.ohea.xyz/mediasrv/server/database"
+	"git.ohea.xyz/mediasrv/server/rest"
 )
 
 func get_data_dir() string {
@@ -19,14 +20,14 @@ func get_data_dir() string {
 	xdg_data_home := os.Getenv("XDG_DATA_HOME")
 
 	if xdg_data_home != "" {
-		return filepath.Join(xdg_data_home, "ikinuki")
+		return filepath.Join(xdg_data_home, "mediasrv")
 	} else {
 		home := os.Getenv("HOME")
-		return filepath.Join(home, ".local", "share", "ikinuki")
+		return filepath.Join(home, ".local", "share", "mediasrv")
 	}
 }
 
-var log = logging.MustGetLogger("ikinuki-server")
+var log = logging.MustGetLogger("mediasrv-server")
 
 type Config struct {
 	Address       string
@@ -47,7 +48,7 @@ func main() {
 	logging.SetBackend(backendLeveled)
 
 	configData := config.Config[Config]{
-		Name:     "ikinuki",
+		Name:     "mediasrv",
 		Filename: "server",
 		Config: Config{
 			Address:       "127.0.0.1",
@@ -59,6 +60,7 @@ func main() {
 	ret, err := configData.Get()
 	if ret == true {
 		log.Warningf("Created config file at %v, please edit and launch again\n", *configData.ConfigFile)
+		return
 	}
 
 	data_dir := get_data_dir()
@@ -76,6 +78,6 @@ func main() {
 		}
 	}
 
-	rest.RunHTTPServer(configData.Config.Address, configData.Config.Port, data_dir)
+	rest.RunServer(configData.Config.Address, configData.Config.Port, data_dir, configData.Config.ScanDirectory)
 
 }