feat(artrans): Run on frontend client.

Signed-off-by: qwqcode <[email protected]>

.vscode/settings.json

@@ -3,7 +3,8 @@
         "akismet",
         "artalk",
         "artran",
-        "Artrans",
+        "artrans",
+        "artransfer",
         "gomail",
         "Goreleaser",
         "gorm",

cmd/export.go

@@ -1,13 +1,12 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
 
 	"github.com/ArtalkJS/ArtalkGo/lib"
-	"github.com/ArtalkJS/ArtalkGo/model"
+	"github.com/ArtalkJS/ArtalkGo/lib/artransfer"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -21,20 +20,10 @@ var exportCmd = &cobra.Command{
 - 文档：https://artalk.js.org/guide/transfer.html
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		comments := []model.Comment{}
-		lib.DB.Find(&comments)
-
-		artrans := []model.Artran{}
-		for _, c := range comments {
-			ct := c.ToArtran()
-			artrans = append(artrans, ct)
-		}
-
-		jsonByte, err := json.Marshal(artrans)
+		jsonStr, err := artransfer.ExportArtransString()
 		if err != nil {
 			logrus.Fatal(err)
 		}
-		jsonStr := string(jsonByte)
 
 		outputFile := cmd.Flag("output").Value.String()
 		if outputFile == "" {

cmd/import.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/ArtalkJS/ArtalkGo/lib/importer"
+	"github.com/ArtalkJS/ArtalkGo/lib/artransfer"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -30,29 +30,32 @@ var importCmd = &cobra.Command{
 		}
 
 		content := string(buf)
-		basic := importer.GetBasicParamsFrom(args[1:])
+		basic := artransfer.GetBasicParamsFrom(args[1:])
 		basic.UrlResolver = false // 默认关闭 URL 解析器：因为 pageKey 是完整，且站点隔离开
-		importer.ImportArtransByStr(basic, content)
+		artransfer.ImportArtransByStr(basic, content)
 
 		logrus.Info("导入结束")
 	},
 	Args:       cobra.MinimumNArgs(1),
-	ArgAliases: importer.GetSupportNames(),
+	ArgAliases: artransfer.GetSupportNames(),
 }
 
 func init() {
 	rootCmd.AddCommand(importCmd)
 
-	for _, item := range importer.Supports {
-		imp := importer.GetImporterInfo(item)
+	for _, item := range artransfer.Supports {
+		imp := artransfer.GetImporterInfo(item)
 		subCmd := &cobra.Command{
 			Use:   imp.Name + " [参数]",
 			Short: imp.Desc,
 			Run: func(cmd *cobra.Command, args []string) {
-				importer.RunByName(imp.Name, args)
+				artransfer.Assumeyes, _ = cmd.Flags().GetBool("assumeyes")
+				artransfer.RunByName(imp.Name, args)
 			},
 		}
 
 		importCmd.AddCommand(subCmd)
 	}
+
+	flagPV(importCmd, "assumeyes", "y", false, "Automatically answer yes for all questions.")
 }

cmd/root.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"strings"
 	"time"
@@ -62,6 +63,16 @@ func init() {
 
 	rootCmd.SetVersionTemplate("Artalk-GO {{printf \"version %s\" .Version}}\n")
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "配置文件路径 (defaults are './artalk-go.yml')")
+
+	versionCmd := &cobra.Command{
+		Use:     "version",
+		Short:   "输出 ArtalkGo 版本信息",
+		Version: Version,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Println("ArtalkGo (" + lib.Version + "/" + lib.CommitHash + ")")
+		},
+	}
+	rootCmd.AddCommand(versionCmd)
 }
 
 // 1. 初始化配置

http/a_http.go

@@ -114,7 +114,7 @@ func InitRoute(e *echo.Echo) {
 	admin.POST("/site-del", ActionAdminSiteDel)
 	admin.POST("/setting-get", ActionAdminSettingGet)
 	admin.POST("/setting-save", ActionAdminSettingSave)
-	admin.POST("/importer", ActionAdminImporter)
+	admin.POST("/artransfer", ActionAdminArtransfer)
 	// admin.POST("/vote-sync", ActionAdminVoteSync) // 数据导入功能未关注 vote 部分，暂时注释
 
 	admin.POST("/send-mail", ActionAdminSendMail)

http/api_admin_artransfer.go

@@ -0,0 +1,45 @@
+package http
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/ArtalkJS/ArtalkGo/lib/artransfer"
+	"github.com/labstack/echo/v4"
+)
+
+type ParamsAdminArtransfer struct {
+	Type    string `mapstructure:"type" param:"required"`
+	Payload string `mapstructure:"payload"`
+}
+
+func ActionAdminArtransfer(c echo.Context) error {
+	if isOK, resp := AdminOnly(c); !isOK {
+		return resp
+	}
+
+	var p ParamsAdminArtransfer
+	if isOK, resp := ParamsDecode(c, ParamsAdminArtransfer{}, &p); !isOK {
+		return resp
+	}
+
+	var payload []string
+	err := json.Unmarshal([]byte(p.Payload), &payload)
+	if err != nil {
+		return RespError(c, "payload 解析错误", Map{
+			"error": err,
+		})
+	}
+
+	c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextPlainCharsetUTF8)
+	c.Response().WriteHeader(http.StatusOK)
+
+	artransfer.Assumeyes = true
+	artransfer.HttpOutput = func(continueRun bool, text string) {
+		c.Response().Write([]byte(text))
+		c.Response().Flush()
+	}
+	artransfer.RunByName(p.Type, payload)
+
+	return nil
+}

lib/importer/artalk_v1.go → lib/artransfer/artalk_v1.go

@@ -1,4 +1,4 @@
-package importer
+package artransfer
 
 import (
 	"github.com/ArtalkJS/ArtalkGo/model"
@@ -17,12 +17,20 @@ type _ArtalkV1Importer struct {
 }
 
 func (imp *_ArtalkV1Importer) Run(basic *BasicParams, payload []string) {
-	RequiredBasicTargetSite(basic)
+	err := RequiredBasicTargetSite(basic)
+	if err != nil {
+		logFatal(err)
+		return
+	}
 
 	// 读取文件
-	jsonStr := JsonFileReady(payload)
+	jsonStr, jErr := JsonFileReady(payload)
+	if jErr != nil {
+		logFatal(jErr)
+		return
+	}
 
-	var aComments []ArtalkV1AFS
+	var aComments []ArtalkV1CommentAFS
 	JsonDecodeFAS(jsonStr, &aComments)
 
 	tp := []model.Artran{}
@@ -49,7 +57,7 @@ func (imp *_ArtalkV1Importer) Run(basic *BasicParams, payload []string) {
 	ImportArtrans(basic, tp)
 }
 
-type ArtalkV1AFS struct {
+type ArtalkV1CommentAFS struct {
 	ID          string `json:"id"`
 	Content     string `json:"content"`
 	Nick        string `json:"nick"`