feat(release): release v0.0.3

GoAdminGroup · Jul 29, 2020 · 421f45b · 421f45b
1 parent 8e150ba
commit 421f45b
Show file tree

Hide file tree

Showing 23 changed files with 86 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,8 @@ GOCMD = go
 all: fmt
 
 fmt:
-	GO111MODULE=off $(GOCMD) fmt ./...
+	GO111MODULE=off go fmt ./...
+	GO111MODULE=off goimports -l -w .
 
 test:
 	gotest -v ./tests
diff --git a/controller/common.go b/controller/common.go
@@ -1,6 +1,12 @@
 package controller
 
 import (
+	template2 "html/template"
+	"net/url"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/GoAdminGroup/filemanager/models"
 	"github.com/GoAdminGroup/filemanager/modules/constant"
 	"github.com/GoAdminGroup/filemanager/modules/language"
@@ -9,25 +15,23 @@ import (
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/config"
+	"github.com/GoAdminGroup/go-admin/modules/menu"
+	"github.com/GoAdminGroup/go-admin/plugins"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/paginator"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/parameter"
 	"github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/go-admin/template/icon"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/GoAdminGroup/go-admin/template/types/action"
 	"github.com/GoAdminGroup/html"
-	template2 "html/template"
-	"net/url"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 type Handler struct {
 	roots       root.Roots
 	permissions permission.Permission
 
-	HTML func(ctx *context.Context, panel types.Panel, animation ...bool)
+	HTML     func(ctx *context.Context, panel types.Panel, options ...plugins.HTMLOptions)
+	HTMLMenu func(ctx *context.Context, panel types.Panel, options ...plugins.HTMLOptions)
 }
 
 func NewHandler(root root.Roots, p permission.Permission) *Handler {
@@ -106,6 +110,10 @@ func (h *Handler) table(ctx *context.Context, files models.Files, err error) {
 	h.HTML(ctx, h.tablePanel(ctx, files, err), false)
 }
 
+func (h *Handler) tableMenu(ctx *context.Context, menu *menu.Menu, files models.Files, err error) {
+	h.HTMLMenu(ctx, h.tablePanel(ctx, files, err), menu, false)
+}
+
 func link(u string, c template2.HTML, pjax bool) template2.HTML {
 	if pjax {
 		return template.Default().Link().SetURL(u).SetContent(c).GetContent()

diff --git a/controller/delete.go b/controller/delete.go
@@ -1,11 +1,12 @@
 package controller
 
 import (
-	"github.com/GoAdminGroup/filemanager/guard"
-	"github.com/GoAdminGroup/go-admin/context"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"github.com/GoAdminGroup/filemanager/guard"
+	"github.com/GoAdminGroup/go-admin/context"
 )
 
 func (h *Handler) Delete(ctx *context.Context) {

diff --git a/controller/download.go b/controller/download.go
@@ -1,13 +1,14 @@
 package controller
 
 import (
+	"net/url"
+	"path/filepath"
+	"strings"
+
 	"github.com/GoAdminGroup/filemanager/models"
 	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
-	"net/url"
-	"path/filepath"
-	"strings"
 )
 
 func (h *Handler) Download(ctx *context.Context) {

diff --git a/controller/files.go b/controller/files.go
@@ -1,14 +1,15 @@
 package controller
 
 import (
-	"github.com/GoAdminGroup/filemanager/guard"
-	"github.com/GoAdminGroup/filemanager/models"
-	"github.com/GoAdminGroup/filemanager/modules/util"
-	"github.com/GoAdminGroup/go-admin/context"
 	"io/ioutil"
 	"mime"
 	"path/filepath"
 	"strings"
+
+	"github.com/GoAdminGroup/filemanager/guard"
+	"github.com/GoAdminGroup/filemanager/models"
+	"github.com/GoAdminGroup/filemanager/modules/util"
+	"github.com/GoAdminGroup/go-admin/context"
 )
 
 func (h *Handler) ListFiles(ctx *context.Context) {
@@ -49,6 +50,6 @@ func (h *Handler) ListFiles(ctx *context.Context) {
 		filesOfDir = append(filesOfDir, file)
 	}
 
-	h.table(ctx, filesOfDir, nil)
+	h.tableMenu(ctx, filesOfDir, nil)
 	return
 }
diff --git a/controller/move.go b/controller/move.go
@@ -1,15 +1,16 @@
 package controller
 
 import (
-	"github.com/GoAdminGroup/filemanager/guard"
-	"github.com/GoAdminGroup/filemanager/modules/language"
-	"github.com/GoAdminGroup/filemanager/modules/util"
-	"github.com/GoAdminGroup/go-admin/context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
+
+	"github.com/GoAdminGroup/filemanager/guard"
+	"github.com/GoAdminGroup/filemanager/modules/language"
+	"github.com/GoAdminGroup/filemanager/modules/util"
+	"github.com/GoAdminGroup/go-admin/context"
 )
 
 func (h *Handler) Move(ctx *context.Context) {

diff --git a/controller/rename.go b/controller/rename.go
@@ -1,12 +1,13 @@
 package controller
 
 import (
-	"github.com/GoAdminGroup/filemanager/guard"
-	"github.com/GoAdminGroup/filemanager/modules/language"
-	"github.com/GoAdminGroup/go-admin/context"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"github.com/GoAdminGroup/filemanager/guard"
+	"github.com/GoAdminGroup/filemanager/modules/language"
+	"github.com/GoAdminGroup/go-admin/context"
 )
 
 func (h *Handler) Rename(ctx *context.Context) {

diff --git a/controller/upload.go b/controller/upload.go
@@ -1,14 +1,15 @@
 package controller
 
 import (
-	"github.com/GoAdminGroup/filemanager/guard"
-	"github.com/GoAdminGroup/filemanager/modules/language"
-	"github.com/GoAdminGroup/go-admin/context"
-	"github.com/GoAdminGroup/go-admin/modules/file"
 	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
+
+	"github.com/GoAdminGroup/filemanager/guard"
+	"github.com/GoAdminGroup/filemanager/modules/language"
+	"github.com/GoAdminGroup/go-admin/context"
+	"github.com/GoAdminGroup/go-admin/modules/file"
 )
 
 func (h *Handler) Upload(ctx *context.Context) {

diff --git a/example/code/golang/main.go b/example/code/golang/main.go
@@ -1,11 +1,12 @@
 package main
 
 import (
-	"github.com/GoAdminGroup/filemanager/modules/root"
 	"log"
 	"os"
 	"os/signal"
 
+	"github.com/GoAdminGroup/filemanager/modules/root"
+
 	_ "github.com/GoAdminGroup/go-admin/adapter/gin"
 	_ "github.com/GoAdminGroup/go-admin/modules/db/drivers/sqlite"
 	_ "github.com/GoAdminGroup/themes/sword"

diff --git a/filemanager.go b/filemanager.go
@@ -2,9 +2,12 @@ package filemanager
 
 import (
 	"encoding/json"
+	"strings"
+	"time"
+
 	"github.com/GoAdminGroup/filemanager/controller"
 	"github.com/GoAdminGroup/filemanager/guard"
-	"github.com/GoAdminGroup/filemanager/modules/error"
+	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	language2 "github.com/GoAdminGroup/filemanager/modules/language"
 	"github.com/GoAdminGroup/filemanager/modules/permission"
 	"github.com/GoAdminGroup/filemanager/modules/root"
@@ -21,8 +24,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/table"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/GoAdminGroup/go-admin/template/types/form"
-	"strings"
-	"time"
 )
 
 type FileManager struct {
@@ -167,6 +168,7 @@ func (f *FileManager) InitPlugin(srv service.List) {
 	f.guard = guard.New(f.roots, f.Conn, p)
 	f.App = f.initRouter(srv)
 	f.handler.HTML = f.HTML
+	f.handler.HTMLMenu = f.HTMLMenu
 
 	language.Lang[language.CN].Combine(language2.CN)
 	language.Lang[language.EN].Combine(language2.EN)
@@ -179,13 +181,13 @@ func (f *FileManager) GetInfo() plugins.Info {
 		Website:     "https://www.go-admin.cn",
 		Title:       "FileManager",
 		Description: "A plugin help you manage files in your server",
-		Version:     "v0.0.1",
+		Version:     "v0.0.3",
 		Author:      "Official",
-		Url:         "https://github.com/GoAdminGroup/filemanager/archive/master.zip",
+		Url:         "https://github.com/GoAdminGroup/filemanager/archive/v0.0.3.zip",
 		Cover:       "",
 		Agreement:   "",
-		CreatedAt:   utils.ParseTime("2020-04-05 00:00:00"),
-		UpdatedAt:   utils.ParseTime("2020-06-28 00:00:00"),
+		CreateDate:  utils.ParseTime("2020-04-05"),
+		UpdateDate:  utils.ParseTime("2020-07-29"),
 	}
 }
 

diff --git a/guard/delete.go b/guard/delete.go
@@ -1,11 +1,12 @@
 package guard
 
 import (
+	"path/filepath"
+	"strings"
+
 	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
-	"path/filepath"
-	"strings"
 )
 
 type DeleteParam struct {

diff --git a/guard/guard.go b/guard/guard.go
@@ -1,16 +1,17 @@
 package guard
 
 import (
+	"net/url"
+	"path/filepath"
+	"strings"
+
 	"github.com/GoAdminGroup/filemanager/modules/constant"
 	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/filemanager/modules/permission"
 	"github.com/GoAdminGroup/filemanager/modules/root"
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/db"
-	"net/url"
-	"path/filepath"
-	"strings"
 )
 
 type Guardian struct {

diff --git a/guard/move.go b/guard/move.go
@@ -1,10 +1,11 @@
 package guard
 
 import (
+	"path/filepath"
+
 	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
-	"path/filepath"
 )
 
 type MoveParam struct {

diff --git a/guard/rename.go b/guard/rename.go
@@ -1,10 +1,11 @@
 package guard
 
 import (
+	"path/filepath"
+
 	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
-	"path/filepath"
 )
 
 type RenameParam struct {

diff --git a/guard/upload.go b/guard/upload.go
@@ -1,13 +1,14 @@
 package guard
 
 import (
+	"mime/multipart"
+	"path/filepath"
+	"strings"
+
 	"github.com/GoAdminGroup/filemanager/modules/constant"
 	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/filemanager/modules/util"
 	"github.com/GoAdminGroup/go-admin/context"
-	"mime/multipart"
-	"path/filepath"
-	"strings"
 )
 
 type UploadParam struct {

diff --git a/modules/error/error.go b/modules/error/error.go
@@ -2,6 +2,7 @@ package errors
 
 import (
 	"errors"
+
 	"github.com/GoAdminGroup/filemanager/modules/language"
 )
 

diff --git a/modules/language/language.go b/modules/language/language.go
@@ -1,8 +1,9 @@
 package language
 
 import (
-	"github.com/GoAdminGroup/go-admin/modules/language"
 	"html/template"
+
+	"github.com/GoAdminGroup/go-admin/modules/language"
 )
 
 func Get(key string) string {

diff --git a/modules/root/root.go b/modules/root/root.go
@@ -1,7 +1,7 @@
 package root
 
 import (
-	"github.com/GoAdminGroup/filemanager/modules/error"
+	errors "github.com/GoAdminGroup/filemanager/modules/error"
 	"github.com/GoAdminGroup/go-admin/context"
 )
 

diff --git a/modules/util/util.go b/modules/util/util.go
@@ -2,13 +2,14 @@ package util
 
 import (
 	"fmt"
-	"golang.org/x/tools/godoc/util"
 	"io"
 	"mime"
 	"mime/multipart"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"golang.org/x/tools/godoc/util"
 )
 
 func FileExist(path string) bool {

diff --git a/previewer/code.go b/previewer/code.go
@@ -1,8 +1,9 @@
 package previewer
 
 import (
-	"github.com/GoAdminGroup/html"
 	"html/template"
+
+	"github.com/GoAdminGroup/html"
 )
 
 type Code struct {

diff --git a/previewer/image.go b/previewer/image.go
@@ -2,10 +2,11 @@ package previewer
 
 import (
 	"encoding/base64"
+	"html/template"
+
 	template2 "github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/html"
 	"github.com/h2non/filetype"
-	"html/template"
 )
 
 type Image struct{}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package errors @@
     import (
     	"errors"
     	"github.com/GoAdminGroup/filemanager/modules/language"
     )
@@ Expand Down @@