Almost working!

cmd/filemanager/main.go

@@ -10,9 +10,14 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/asdine/storm"
+
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 
 	"github.com/hacdias/filemanager"
+	"github.com/hacdias/filemanager/bolt"
+	h "github.com/hacdias/filemanager/http"
+	"github.com/hacdias/filemanager/staticgen"
 	"github.com/hacdias/fileutils"
 	flag "github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -25,7 +30,7 @@ var (
 	scope         string
 	commands      string
 	logfile       string
-	staticgen     string
+	staticg       string
 	locale        string
 	port          int
 	noAuth        bool
@@ -51,7 +56,7 @@ func init() {
 	flag.BoolVar(&allowNew, "allow-new", true, "Default allow new option for new users")
 	flag.BoolVar(&noAuth, "no-auth", false, "Disables authentication")
 	flag.StringVar(&locale, "locale", "en", "Default locale for new users")
-	flag.StringVar(&staticgen, "staticgen", "", "Static Generator you want to enable")
+	flag.StringVar(&staticg, "staticgen", "", "Static Generator you want to enable")
 	flag.BoolVarP(&showVer, "version", "v", false, "Show version")
 }
 
@@ -148,52 +153,6 @@ func main() {
 		})
 	}
 
-	// Create a File Manager instance.
-	fm, err := filemanager.New(viper.GetString("Database"), filemanager.User{
-		AllowCommands: viper.GetBool("AllowCommands"),
-		AllowEdit:     viper.GetBool("AllowEdit"),
-		AllowNew:      viper.GetBool("AllowNew"),
-		AllowPublish:  viper.GetBool("AllowPublish"),
-		Commands:      viper.GetStringSlice("Commands"),
-		Rules:         []*filemanager.Rule{},
-		Locale:        viper.GetString("Locale"),
-		CSS:           "",
-		FileSystem:    fileutils.Dir(viper.GetString("Scope")),
-	})
-
-	if viper.GetBool("NoAuth") {
-		fm.NoAuth = true
-	}
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	switch viper.GetString("StaticGen") {
-	case "hugo":
-		hugo := &filemanager.Hugo{
-			Root:        viper.GetString("Scope"),
-			Public:      filepath.Join(viper.GetString("Scope"), "public"),
-			Args:        []string{},
-			CleanPublic: true,
-		}
-
-		if err = fm.EnableStaticGen(hugo); err != nil {
-			log.Fatal(err)
-		}
-	case "jekyll":
-		jekyll := &filemanager.Jekyll{
-			Root:        viper.GetString("Scope"),
-			Public:      filepath.Join(viper.GetString("Scope"), "_site"),
-			Args:        []string{"build"},
-			CleanPublic: true,
-		}
-
-		if err = fm.EnableStaticGen(jekyll); err != nil {
-			log.Fatal(err)
-		}
-	}
-
 	// Builds the address and a listener.
 	laddr := viper.GetString("Address") + ":" + viper.GetString("Port")
 	listener, err := net.Listen("tcp", laddr)
@@ -205,7 +164,68 @@ func main() {
 	fmt.Println("Listening on", listener.Addr().String())
 
 	// Starts the server.
-	if err := http.Serve(listener, fm); err != nil {
+	if err := http.Serve(listener, handler()); err != nil {
 		log.Fatal(err)
 	}
 }
+
+func handler() http.Handler {
+	db, err := storm.Open(viper.GetString("Database"))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fm := &filemanager.FileManager{
+		NoAuth:    viper.GetBool("NoAuth"),
+		BaseURL:   "",
+		PrefixURL: "",
+		DefaultUser: &filemanager.User{
+			AllowCommands: viper.GetBool("AllowCommands"),
+			AllowEdit:     viper.GetBool("AllowEdit"),
+			AllowNew:      viper.GetBool("AllowNew"),
+			AllowPublish:  viper.GetBool("AllowPublish"),
+			Commands:      viper.GetStringSlice("Commands"),
+			Rules:         []*filemanager.Rule{},
+			Locale:        viper.GetString("Locale"),
+			CSS:           "",
+			FileSystem:    fileutils.Dir(viper.GetString("Scope")),
+		},
+		Store: &filemanager.Store{
+			Config: bolt.ConfigStore{DB: db},
+			Users:  bolt.UsersStore{DB: db},
+			Share:  bolt.ShareStore{DB: db},
+		},
+	}
+
+	err = fm.Load()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	switch viper.GetString("StaticGen") {
+	case "hugo":
+		hugo := &staticgen.Hugo{
+			Root:        viper.GetString("Scope"),
+			Public:      filepath.Join(viper.GetString("Scope"), "public"),
+			Args:        []string{},
+			CleanPublic: true,
+		}
+
+		if err = fm.Attach(hugo); err != nil {
+			log.Fatal(err)
+		}
+	case "jekyll":
+		jekyll := &staticgen.Jekyll{
+			Root:        viper.GetString("Scope"),
+			Public:      filepath.Join(viper.GetString("Scope"), "_site"),
+			Args:        []string{"build"},
+			CleanPublic: true,
+		}
+
+		if err = fm.Attach(jekyll); err != nil {
+			log.Fatal(err)
+		}
+	}
+
+	return h.ServeHTTP(fm)
+}