Merge pull request #9 from nak3/cleanup-initial-process

[fix] clean up startup process

Author: dinever

app/app.go

@@ -14,12 +14,19 @@ var (
 	App *golf.Application
 )
 
-func Init() {
-	App = golf.New()
-	err := model.Initialize("dingo.db")
-	if err != nil {
-		panic(err)
+func fileExists(filename string) bool {
+	_, err := os.Stat(filename)
+	return err == nil
+}
+
+func Init(dbPath string) {
+	if err := model.Initialize(dbPath, fileExists(dbPath)); err != nil {
+		fmt.Errorf("failed to intialize db: %v", err)
+		os.Exit(1)
 	}
+	fmt.Printf("Database is used at %s\n", dbPath)
+
+	App = golf.New()
 
 	App.Config.Set("app/static_dir", "static")
 	App.Config.Set("app.log_dir", "tmp/log")
@@ -131,6 +138,6 @@ func registerHomeHandler() {
 func Run(portNumber string) {
 	registerAdminURLHandlers()
 	registerHomeHandler()
-	fmt.Println("Application Started on port " + portNumber)
+	fmt.Printf("Application Started on port %s\n", portNumber)
 	App.Run(":" + portNumber)
 }

app/model/init.go

@@ -2,15 +2,14 @@ package model
 
 import (
 	"database/sql"
+	"time"
+
 	"github.com/dinever/dingo/app/utils"
 	_ "github.com/mattn/go-sqlite3"
-	"os"
-	"time"
 )
 
 var db *sql.DB
 
-
 const samplePostContent = `
 Welcome to Dingo! This is your first post. You can find it in the [admin panel](/admin/).
 
@@ -81,25 +80,40 @@ type Row interface {
 	Scan(dest ...interface{}) error
 }
 
-func Initialize(dbPath string) error {
+func Initialize(dbPath string, dbExists bool) error {
 	tokens = make(map[string]*Token)
 
+	if err := initConnection(dbPath); err != nil {
+		return err
+	}
+
+	if err := createTableIfNotExist(); err != nil {
+		return err
+	}
+
+	if !dbExists {
+		if err := createWelcomeData(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func initConnection(dbPath string) error {
 	var err error
-	_, errDB := os.Stat(dbPath)
 	db, err = sql.Open("sqlite3", dbPath)
 	if err != nil {
 		return err
 	}
-	_, err = db.Exec(schema)
-	if err != nil {
+	return nil
+}
+
+func createTableIfNotExist() error {
+	if _, err := db.Exec(schema); err != nil {
 		return err
 	}
-	if errDB != nil {
-		err = CreateWelcomeData()
-		if err != nil {
-			panic(err)
-		}
-	}
+
 	checkBlogSettings()
 	return nil
 }
@@ -110,7 +124,7 @@ func checkBlogSettings() {
 	SetSettingIfNotExists("description", "Awesome blog created by Dingo.", "blog")
 }
 
-func CreateWelcomeData() error {
+func createWelcomeData() error {
 	var err error
 	p := NewPost()
 	p.Title = "Welcome to Dingo!"

cmd/install.go

@@ -2,16 +2,15 @@ package main
 
 import (
 	"flag"
+
 	"github.com/dinever/dingo/app"
-	"github.com/dinever/dingo/cmd"
 )
 
 func main() {
-	if !cmd.CheckInstall() {
-		cmd.Install()
-	}
 	portPtr := flag.String("port", "8000", "The port number for Dingo to listen to.")
+	dbFilePathPtr := flag.String("database", "dingo.db", "The database file path for Djingo to use.")
 	flag.Parse()
-	Dingo.Init()
+
+	Dingo.Init(*dbFilePathPtr)
 	Dingo.Run(*portPtr)
 }