move main package to root directory

Author: ma6254

Makefile

@@ -2,7 +2,7 @@ BUILD_TIME := $(shell date "+%F %T")
 COMMIT_ID := $(shell git rev-parse HEAD)
 BUILD_VERSION := $(shell git describe --tags $(COMMIT_ID))
 
-Package := "github.com/ma6254/FictionDown/cmd/FictionDown"
+Package := "github.com/ma6254/FictionDown"
 
 LDFLAG := "\
 -s -w \
@@ -19,7 +19,7 @@ build:
 	go build -v --ldflags $(LDFLAG) $(Package)
 
 multiple_build:
-	gox -osarch="linux/arm" -osarch="linux/amd64" --osarch="darwin/amd64" -osarch="windows/amd64" -ldflags $(LDFLAG) -output "{{.Dir}}_$(BUILD_VERSION)_{{.OS}}_{{.Arch}}" github.com/ma6254/FictionDown/cmd/FictionDown
+	gox -osarch="linux/arm" -osarch="linux/amd64" --osarch="darwin/amd64" -osarch="windows/amd64" -ldflags $(LDFLAG) -output "{{.Dir}}_$(BUILD_VERSION)_{{.OS}}_{{.Arch}}" $(Package)
 
 install:
 	go install --ldflags $(LDFLAG) $(Package)

README.md

@@ -161,9 +161,11 @@ GLOBAL OPTIONS:
 包管理为 gomod
 
 ```bash
-go get github.com/ma6254/FictionDown/cmd/FictionDown
+go get github.com/ma6254/FictionDown
 ```
 
-交叉编译需要安装 gox
+交叉编译这几个平台的可执行文件：`linux/arm` `linux/amd64` `darwin/amd64` `windows/amd64`
 
-`make multiple_build`
+```bash
+make multiple_build
+```

cmd/FictionDown/check.go renamed to check.go

@@ -9,7 +9,6 @@ require (
 	github.com/bmaupin/go-epub v0.5.0
 	github.com/chromedp/chromedp v0.3.0
 	github.com/fatih/color v1.7.0 // indirect
-	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.1 // indirect
 	github.com/mattn/go-runewidth v0.0.4 // indirect

cmd/FictionDown/convert.go renamed to convert.go

@@ -12,8 +12,6 @@ github.com/chromedp/chromedp v0.3.0 h1:7/pwrXFRq6/ym3sxCykm90DMoyw6VKXY48DgGRgUU
 github.com/chromedp/chromedp v0.3.0/go.mod h1:EktsZcC2iycVrRhC9fDmshBpCK9lNnZYi6x2q9uE7zI=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
-github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
@@ -56,7 +54,5 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=
 gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

cmd/FictionDown/download.go renamed to download.go

@@ -36,7 +36,14 @@ func Type1BookInfo(nameExpr, coverExpr, authorExpr, chapterExpr string) func(bod
 			return
 		}
 		s = &store.Store{}
-		s.BookName = htmlquery.InnerText(htmlquery.FindOne(doc, nameExpr))
+		var tmpNode *html.Node
+
+		tmpNode = htmlquery.FindOne(doc, nameExpr)
+		if tmpNode == nil {
+			err = fmt.Errorf("No matching bookName")
+			return
+		}
+		s.BookName = htmlquery.InnerText(tmpNode)
 
 		if coverExpr == "" {
 			// log.Printf("Empty Cover Image Expr")