Fix some stuff

Former-commit-id: a820779e24a9e41ae3ef07ad6c49b3b441192b82 [formerly 04d8b699793d2f662cfd7ebbbf1118239deb0ec7] [formerly 94e538cb9690c186fc113e27c008f894d719d453 [formerly 921cc2f930]]
Former-commit-id: 9ddc40cc471fb3ea3fd0fcf811907f102fa13bc2 [formerly a5ea3e36f6b362f8910874d5d1ed087187e05dcc]
Former-commit-id: c4c4cc4c1505145d9b1c1058d94e6dc80a3cd5de

cmd/filemanager/main.go

@@ -188,6 +188,7 @@ func handler() http.Handler {
 			Rules:         []*filemanager.Rule{},
 			Locale:        viper.GetString("Locale"),
 			CSS:           "",
+			Scope:         viper.GetString("Scope"),
 			FileSystem:    fileutils.Dir(viper.GetString("Scope")),
 		},
 		Store: &filemanager.Store{
@@ -195,6 +196,9 @@ func handler() http.Handler {
 			Users:  bolt.UsersStore{DB: db},
 			Share:  bolt.ShareStore{DB: db},
 		},
+		NewFS: func(scope string) filemanager.FileSystem {
+			return fileutils.Dir(scope)
+		},
 	}
 
 	err = fm.Load()

staticgen/hugo.go

@@ -84,7 +84,7 @@ func (h Hugo) Hook(c *fm.Context, w http.ResponseWriter, r *http.Request) (int,
 		return http.StatusForbidden, nil
 	}
 
-	filename := filepath.Join(string(c.User.FileSystem), r.URL.Path)
+	filename := filepath.Join(c.User.Scope, r.URL.Path)
 	archetype := r.Header.Get("archetype")
 
 	ext := filepath.Ext(filename)
@@ -108,7 +108,7 @@ func (h Hugo) Hook(c *fm.Context, w http.ResponseWriter, r *http.Request) (int,
 
 // Publish publishes a post.
 func (h Hugo) Publish(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
-	filename := filepath.Join(string(c.User.FileSystem), r.URL.Path)
+	filename := filepath.Join(c.User.Scope, r.URL.Path)
 
 	// We only run undraft command if it is a file.
 	if strings.HasSuffix(filename, ".md") && strings.HasSuffix(filename, ".markdown") {

staticgen/jekyll.go

@@ -45,7 +45,7 @@ func (j Jekyll) Hook(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 
 // Publish publishes a post.
 func (j Jekyll) Publish(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
-	filename := filepath.Join(string(c.User.FileSystem), r.URL.Path)
+	filename := filepath.Join(c.User.Scope, r.URL.Path)
 
 	// We only run undraft command if it is a file.
 	if err := j.undraft(filename); err != nil {