From 5f64530ccfedc50824b6e67e78c9ecd84581590a Mon Sep 17 00:00:00 2001
From: Minho <longfei6671@163.com>
Date: Tue, 3 Apr 2018 13:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=9A=84?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 converter/converter.go | 16 ++++++++--------
 models/book_result.go  |  4 +---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/converter/converter.go b/converter/converter.go
index 6d89e3c0..bf16512f 100644
--- a/converter/converter.go
+++ b/converter/converter.go
@@ -458,15 +458,15 @@ func (this *Converter) convertToEpub() (err error) {
 		filepath.Join(this.OutputPath, "content.epub"),
 		filepath.Join(this.OutputPath, output, "book.epub"),
 	}
-	cmd := exec.Command(ebookConvert, args...)
+	//cmd := exec.Command(ebookConvert, args...)
+	//
+	//if this.Debug {
+	//	fmt.Println(cmd.Args)
+	//}
+	//fmt.Println("正在转换EPUB文件", args[0])
+	//return cmd.Run()
 
-	if this.Debug {
-		fmt.Println(cmd.Args)
-	}
-	fmt.Println("正在转换EPUB文件", args[0])
-	return cmd.Run()
-
-	//return filetil.CopyFile(filepath.Join(this.OutputPath, "content.epub"),filepath.Join(this.OutputPath, output, "book.epub"))
+	return filetil.CopyFile(args[0],args[1])
 }
 
 //转成mobi
diff --git a/models/book_result.go b/models/book_result.go
index 175fa3e3..0d735370 100644
--- a/models/book_result.go
+++ b/models/book_result.go
@@ -232,9 +232,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
 		beego.Error("创建目录失败 => ",tempOutputPath,err)
 	}
 
-	defer func(p string) {
-		os.RemoveAll(p)
-	}(tempOutputPath)
+	defer os.RemoveAll(strings.TrimSuffix(tempOutputPath,"source"))
 
 	if filetil.FileExists(pdfpath) && filetil.FileExists(epubpath) && filetil.FileExists(mobipath) && filetil.FileExists(docxpath) {
 		convertBookResult.EpubPath = epubpath