附件管理

Author: TruthHun88

change.md

@@ -36,6 +36,7 @@
 - [x] 支持音频和视频播放管理
 - [x] 管理后台，恢复和优化附件管理功能
 - [ ] 如果管理员或者用户是书籍项目所有人，则音视频链接支持直链播放，否则对音视频链接进行一定的防盗链处理
+- [ ] 内容阅读页面音频视频播放功能
 - [x] 增加和升级API，使小程序和APP支持音频和视频播放，以及图片放大预览
 - [x] 优化`html2json`仓库，解析`HTML`内容，使小程序支持音频和视频播放功能，以及图片放大预览功能
 - [ ] 检测和隐藏相关功能

commands/command.go

@@ -24,7 +24,6 @@ import (
 
 var (
 	ConfigurationFile = "./conf/app.conf"
-	WorkingDirectory  = "./"
 	LogFile           = "./logs"
 )
 
@@ -226,49 +225,40 @@ func RegisterFunction() {
 
 func ResolveCommand(args []string) {
 	flagSet := flag.NewFlagSet("MinDoc command: ", flag.ExitOnError)
-	flagSet.StringVar(&ConfigurationFile, "config", "", "MinDoc configuration file.")
-	flagSet.StringVar(&WorkingDirectory, "dir", "", "MinDoc working directory.")
-	flagSet.StringVar(&LogFile, "log", "", "MinDoc log file path.")
+	flagSet.StringVar(&ConfigurationFile, "config", "", "BookStack configuration file.")
+	flagSet.StringVar(&LogFile, "log", "", "BookStack log file path.")
 
 	flagSet.Parse(args)
 
-	if WorkingDirectory == "" {
-		if p, err := filepath.Abs(os.Args[0]); err == nil {
-			WorkingDirectory = filepath.Dir(p)
-		}
-	}
-	if LogFile == "" {
-		LogFile = filepath.Join(WorkingDirectory, "logs")
-	}
 	if ConfigurationFile == "" {
-		ConfigurationFile = filepath.Join(WorkingDirectory, "conf", "app.conf")
-		config := filepath.Join(WorkingDirectory, "conf", "app.conf.example")
+		ConfigurationFile = filepath.Join("conf", "app.conf")
+		config := filepath.Join("conf", "app.conf.example")
 		if !utils.FileExists(ConfigurationFile) && utils.FileExists(config) {
 			utils.CopyFile(ConfigurationFile, config)
 		}
 	}
-	gocaptcha.ReadFonts(filepath.Join(WorkingDirectory, "static", "fonts"), ".ttf")
+	gocaptcha.ReadFonts(filepath.Join("static", "fonts"), ".ttf")
 
 	err := beego.LoadAppConfig("ini", ConfigurationFile)
 
 	if err != nil {
 		log.Println("An error occurred:", err)
 		os.Exit(1)
 	}
-	uploads := filepath.Join(WorkingDirectory, "uploads")
+	uploads := filepath.Join("uploads")
 
 	os.MkdirAll(uploads, 0666)
 
-	beego.BConfig.WebConfig.StaticDir["/static"] = filepath.Join(WorkingDirectory, "static")
+	beego.BConfig.WebConfig.StaticDir["/static"] = filepath.Join("static")
 	beego.BConfig.WebConfig.StaticDir["/uploads"] = uploads
-	beego.BConfig.WebConfig.ViewsPath = filepath.Join(WorkingDirectory, "views")
+	beego.BConfig.WebConfig.ViewsPath = filepath.Join("views")
 
-	fonts := filepath.Join(WorkingDirectory, "static", "fonts")
+	fonts := filepath.Join("static", "fonts")
 
 	if !utils.FileExists(fonts) {
 		log.Fatal("Font path not exist.")
 	}
-	gocaptcha.ReadFonts(filepath.Join(WorkingDirectory, "static", "fonts"), ".ttf")
+	gocaptcha.ReadFonts(filepath.Join("static", "fonts"), ".ttf")
 
 	RegisterDataBase()
 	RegisterModel()
@@ -280,8 +270,4 @@ func init() {
 
 	gocaptcha.ReadFonts("./static/fonts", ".ttf")
 	gob.Register(models.Member{})
-
-	if p, err := filepath.Abs(os.Args[0]); err == nil {
-		WorkingDirectory = filepath.Dir(p)
-	}
 }

commands/daemon/daemon.go

@@ -20,11 +20,10 @@ type Daemon struct {
 func NewDaemon() *Daemon {
 
 	config := &service.Config{
-		Name:             "BookStackd",                            //服务显示名称
-		DisplayName:      "BookStack Service",                     //服务名称
-		Description:      "A document online management program.", //服务描述
-		WorkingDirectory: commands.WorkingDirectory,
-		Arguments:        os.Args[1:],
+		Name:        "BookStackd",                            //服务显示名称
+		DisplayName: "BookStack Service",                     //服务名称
+		Description: "A document online management program.", //服务描述
+		Arguments:   os.Args[1:],
 	}
 
 	return &Daemon{

controllers/BookController.go

@@ -19,7 +19,6 @@ import (
 	"github.com/TruthHun/BookStack/models/store"
 	"github.com/russross/blackfriday"
 
-	"github.com/TruthHun/BookStack/commands"
 	"github.com/TruthHun/BookStack/conf"
 	"github.com/TruthHun/BookStack/models"
 	"github.com/TruthHun/BookStack/utils"
@@ -414,7 +413,7 @@ func (this *BookController) UploadCover() {
 		this.JsonResult(500, "图片剪切")
 	}
 
-	filePath = filepath.Join(commands.WorkingDirectory, "uploads", time.Now().Format("200601"), fileName+ext)
+	filePath = filepath.Join("uploads", time.Now().Format("200601"), fileName+ext)
 
 	//生成缩略图并保存到磁盘
 	err = graphics.ImageResizeSaveFile(subImg, 175, 230, filePath)
@@ -423,7 +422,7 @@ func (this *BookController) UploadCover() {
 		this.JsonResult(500, "保存图片失败")
 	}
 
-	url := "/" + strings.Replace(strings.TrimPrefix(filePath, commands.WorkingDirectory), "\\", "/", -1)
+	url := "/" + strings.Replace(filePath, "\\", "/", -1)
 	if strings.HasPrefix(url, "//") {
 		url = string(url[1:])
 	}

controllers/DocumentController.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/TruthHun/BookStack/commands"
 	"github.com/TruthHun/BookStack/conf"
 	"github.com/TruthHun/BookStack/models"
 	"github.com/TruthHun/BookStack/models/store"
@@ -632,10 +631,12 @@ func (this *DocumentController) Upload() {
 	}
 
 	name := "editormd-file-file"
-	if fileType != "" && !strings.Contains(fileType, "/") {
-		name = "editormd-" + fileType + "-file"
-	} else {
-		fileType = strings.Split(fileType, "/")[0]
+	if docId == 0 {
+		if fileType != "" && !strings.Contains(fileType, "/") {
+			name = "editormd-" + fileType + "-file"
+		} else {
+			fileType = strings.Split(fileType, "/")[0]
+		}
 	}
 
 	file, moreFile, err := this.GetFile(name)
@@ -725,19 +726,21 @@ func (this *DocumentController) Upload() {
 	attachment.FileName = moreFile.Filename
 	attachment.CreateAt = this.Member.MemberId
 	attachment.FileExt = ext
-	attachment.FilePath = strings.TrimPrefix(filePath, commands.WorkingDirectory)
+	attachment.FilePath = filePath
 	attachment.DocumentId = docId
 
+	// 非附件
+	if name != "editormd-file-file" {
+		attachment.DocumentId = 0
+	}
+
 	if fileInfo, err := os.Stat(filePath); err == nil {
 		attachment.FileSize = float64(fileInfo.Size())
 	}
-	if docId > 0 {
-		attachment.DocumentId = docId
-	}
 
 	if strings.EqualFold(ext, ".jpg") || strings.EqualFold(ext, ".jpeg") || strings.EqualFold(ext, ".png") || strings.EqualFold(ext, ".gif") {
 
-		attachment.HttpPath = "/" + strings.Replace(strings.TrimPrefix(filePath, commands.WorkingDirectory), "\\", "/", -1)
+		attachment.HttpPath = "/" + strings.Replace(filePath, "\\", "/", -1)
 		if strings.HasPrefix(attachment.HttpPath, "//") {
 			attachment.HttpPath = string(attachment.HttpPath[1:])
 		}
@@ -783,7 +786,7 @@ func (this *DocumentController) Upload() {
 				beego.Error(err.Error())
 			}
 			attachment.HttpPath = "/" + osspath
-			attachment.FilePath = filepath.Join(commands.WorkingDirectory, osspath)
+			attachment.FilePath = attachment.HttpPath
 		} else {
 			if err := store.ModelStoreLocal.MoveToStore(filePath, osspath); err != nil {
 				beego.Error(err.Error())
@@ -796,7 +799,7 @@ func (this *DocumentController) Upload() {
 		}
 	}
 
-	attachment.HttpPath = "/" + attachment.FilePath
+	attachment.HttpPath = "/" + strings.TrimLeft(attachment.FilePath, "./")
 
 	result := map[string]interface{}{
 		"errcode":   0,
@@ -859,7 +862,7 @@ func (this *DocumentController) DownloadAttachment() {
 	if attachment.BookId != bookId {
 		this.Abort("404")
 	}
-	this.Ctx.Output.Download(filepath.Join(commands.WorkingDirectory, attachment.FilePath), attachment.FileName)
+	this.Ctx.Output.Download(strings.TrimLeft(attachment.FilePath, "./"), attachment.FileName)
 
 	this.StopRun()
 }
@@ -899,7 +902,7 @@ func (this *DocumentController) RemoveAttachment() {
 		this.JsonResult(6005, "删除失败")
 	}
 
-	os.Remove(filepath.Join(commands.WorkingDirectory, attach.FilePath))
+	os.Remove(strings.TrimLeft(attach.FilePath, "./"))
 	this.JsonResult(0, "ok", attach)
 }
 

controllers/ManagerController.go

@@ -19,7 +19,6 @@ import (
 
 	"os"
 
-	"github.com/TruthHun/BookStack/commands"
 	"github.com/TruthHun/BookStack/conf"
 	"github.com/TruthHun/BookStack/models"
 	"github.com/TruthHun/BookStack/models/store"
@@ -776,7 +775,6 @@ func (this *ManagerController) AttachDetailed() {
 		this.Abort("404")
 	}
 
-	attach.FilePath = filepath.Join(commands.WorkingDirectory, attach.FilePath)
 	attach.HttpPath = this.BaseUrl() + attach.HttpPath
 	attach.IsExist = utils.FileExists(attach.FilePath)
 	this.Data["Model"] = attach

controllers/SettingController.go

@@ -12,7 +12,6 @@ import (
 
 	"fmt"
 
-	"github.com/TruthHun/BookStack/commands"
 	"github.com/TruthHun/BookStack/conf"
 	"github.com/TruthHun/BookStack/models"
 	"github.com/TruthHun/BookStack/utils"
@@ -256,7 +255,7 @@ func (this *SettingController) Upload() {
 
 	fileName := strconv.FormatInt(time.Now().UnixNano(), 16)
 
-	filePath := filepath.Join(commands.WorkingDirectory, "uploads", time.Now().Format("2006/01"), fileName+ext)
+	filePath := filepath.Join("uploads", time.Now().Format("2006/01"), fileName+ext)
 
 	path := filepath.Dir(filePath)
 
@@ -278,7 +277,7 @@ func (this *SettingController) Upload() {
 	}
 	os.Remove(filePath)
 
-	filePath = filepath.Join(commands.WorkingDirectory, "uploads", time.Now().Format("200601"), fileName+ext)
+	filePath = filepath.Join("uploads", time.Now().Format("200601"), fileName+ext)
 
 	err = graphics.ImageResizeSaveFile(subImg, 120, 120, filePath)
 	err = graphics.SaveImage(filePath, subImg)
@@ -288,7 +287,7 @@ func (this *SettingController) Upload() {
 		this.JsonResult(500, "保存文件失败")
 	}
 
-	url := "/" + strings.Replace(strings.TrimPrefix(filePath, commands.WorkingDirectory), "\\", "/", -1)
+	url := "/" + strings.Replace(filePath, "\\", "/", -1)
 	if strings.HasPrefix(url, "//") {
 		url = string(url[1:])
 	}
@@ -300,8 +299,9 @@ func (this *SettingController) Upload() {
 		if err != nil {
 			this.JsonResult(60001, "保存头像失败")
 		}
-		if strings.HasPrefix(avatar, "/uploads/") {
-			os.Remove(filepath.Join(commands.WorkingDirectory, avatar))
+		avatar = strings.TrimLeft(avatar, "./")
+		if strings.HasPrefix(avatar, "uploads/") {
+			os.Remove(avatar)
 		}
 		this.SetMember(*member)
 	}