From 62f415efa3a05f458860326f20c96f5bbc423013 Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Wed, 5 Apr 2023 22:03:45 +0800
Subject: [PATCH] fix typo and format imports (#119)

---
 others/script/rime/check.go  | 3 ++-
 others/script/rime/emoji.go  | 3 ++-
 others/script/rime/en.go     | 5 +++--
 others/script/rime/others.go | 2 +-
 others/script/rime/rime.go   | 3 ++-
 others/script/rime/sogou.go  | 9 +++++----
 others/script/rime/sort.go   | 3 ++-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/others/script/rime/check.go b/others/script/rime/check.go
index ee002c9..ebefc80 100644
--- a/others/script/rime/check.go
+++ b/others/script/rime/check.go
@@ -3,7 +3,6 @@ package rime
 import (
 	"bufio"
 	"fmt"
-	mapset "github.com/deckarep/golang-set/v2"
 	"log"
 	"os"
 	"path"
@@ -12,6 +11,8 @@ import (
 	"time"
 	"unicode"
 	"unicode/utf8"
+
+	mapset "github.com/deckarep/golang-set/v2"
 )
 
 var specialWords = mapset.NewSet[string]()   // 特殊词汇列表，不进行任何检查
diff --git a/others/script/rime/emoji.go b/others/script/rime/emoji.go
index 014929b..fd63b2a 100644
--- a/others/script/rime/emoji.go
+++ b/others/script/rime/emoji.go
@@ -3,13 +3,14 @@ package rime
 import (
 	"bufio"
 	"fmt"
-	mapset "github.com/deckarep/golang-set/v2"
 	"log"
 	"os"
 	"regexp"
 	"strings"
 	"time"
 	"unicode/utf8"
+
+	mapset "github.com/deckarep/golang-set/v2"
 )
 
 var emojiTXT = "/Users/dvel/Library/Rime/opencc/emoji.txt"
diff --git a/others/script/rime/en.go b/others/script/rime/en.go
index 09f6b6b..76f7f77 100644
--- a/others/script/rime/en.go
+++ b/others/script/rime/en.go
@@ -2,11 +2,12 @@ package rime
 
 import (
 	"bufio"
-	mapset "github.com/deckarep/golang-set/v2"
 	"log"
 	"os"
 	"sort"
 	"strings"
+
+	mapset "github.com/deckarep/golang-set/v2"
 )
 
 // SortEnDict 排序 en.dict.yaml 词库
@@ -135,4 +136,4 @@ func enTxtToRimeDict(txtPath string) {
 	if err != nil {
 		log.Fatal(err)
 	}
-}
\ No newline at end of file
+}
diff --git a/others/script/rime/others.go b/others/script/rime/others.go
index b7ac6ba..3348caa 100644
--- a/others/script/rime/others.go
+++ b/others/script/rime/others.go
@@ -77,7 +77,7 @@ func processNewDict(dictPath string) {
 		if utf8.RuneCountInString(text) <= 2 {
 			continue
 		}
-		outFile.WriteString(line+"\n")
+		outFile.WriteString(line + "\n")
 	}
 	outFile.Sync()
 }
diff --git a/others/script/rime/rime.go b/others/script/rime/rime.go
index ef98268..4b2b400 100644
--- a/others/script/rime/rime.go
+++ b/others/script/rime/rime.go
@@ -5,7 +5,6 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"fmt"
-	mapset "github.com/deckarep/golang-set/v2"
 	"io"
 	"log"
 	"os"
@@ -13,6 +12,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	mapset "github.com/deckarep/golang-set/v2"
 )
 
 // 一个词条的组成部分
diff --git a/others/script/rime/sogou.go b/others/script/rime/sogou.go
index 3fbd949..cd163b2 100644
--- a/others/script/rime/sogou.go
+++ b/others/script/rime/sogou.go
@@ -3,8 +3,6 @@ package rime
 import (
 	"bufio"
 	"fmt"
-	"github.com/commander-cli/cmd"
-	mapset "github.com/deckarep/golang-set/v2"
 	"io"
 	"log"
 	"net/http"
@@ -15,9 +13,12 @@ import (
 	"strings"
 	"time"
 	"unicode/utf8"
+
+	"github.com/commander-cli/cmd"
+	mapset "github.com/deckarep/golang-set/v2"
 )
 
-var fileterMark = "# *_*"                // "# *_*" 和 mark 之间是过滤词列表
+var filterMark = "# *_*"                 // "# *_*" 和 mark 之间是过滤词列表
 var filterList = mapset.NewSet[string]() // 过滤词列表，在这个列表里的词汇，不再写入
 
 // UpdateSogou 更新搜狗流行词
@@ -62,7 +63,7 @@ func makeSogouFilterList() {
 			break
 		}
 		if !isFilterMark {
-			if strings.Contains(line, fileterMark) {
+			if strings.Contains(line, filterMark) {
 				isFilterMark = true
 			}
 			continue
diff --git a/others/script/rime/sort.go b/others/script/rime/sort.go
index 283630a..b4feeff 100644
--- a/others/script/rime/sort.go
+++ b/others/script/rime/sort.go
@@ -3,7 +3,6 @@ package rime
 import (
 	"bufio"
 	"fmt"
-	mapset "github.com/deckarep/golang-set/v2"
 	"log"
 	"os"
 	"path"
@@ -11,6 +10,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	mapset "github.com/deckarep/golang-set/v2"
 )
 
 // Sort 词库排序，顺便去重