Dev (#2)

fix: 修复当订阅链接有多个 clash 配置时丢失节点的问题
update: 增加检测更新
modify: 修改数据库路径
modify: 修改短链生成逻辑
modify: 统一输出信息

utils/check_update.go

@@ -0,0 +1,33 @@
+package utils
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"sub2clash/config"
+	"sub2clash/model"
+)
+
+func CheckUpdate() (bool, string, error) {
+	get, err := Get("https://api.github.com/repos/nitezs/sub2clash/tags")
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	var version model.Tags
+	all, err := io.ReadAll(get.Body)
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	err = json.Unmarshal(all, &version)
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	if version[0].Name == config.Version {
+		return false, "", nil
+	} else {
+		return true, version[0].Name, nil
+	}
+}

utils/database/database.go

@@ -2,17 +2,29 @@ package database
 
 import (
 	"github.com/glebarez/sqlite"
+	"go.uber.org/zap"
 	"gorm.io/gorm"
+	"path/filepath"
+	"sub2clash/logger"
 	"sub2clash/model"
+	"sub2clash/utils"
 )
 
 var DB *gorm.DB
 
 func ConnectDB() error {
 	// 用上面的数据库连接初始化 gorm
-	db, err := gorm.Open(sqlite.Open("sub2clash.db"), &gorm.Config{})
+	err := utils.MKDir("data")
 	if err != nil {
-		panic(err)
+		return err
+	}
+	db, err := gorm.Open(
+		sqlite.Open(filepath.Join("data", "sub2clash.db")), &gorm.Config{
+			Logger: nil,
+		},
+	)
+	if err != nil {
+		return err
 	}
 	if err != nil {
 		return err
@@ -24,3 +36,23 @@ func ConnectDB() error {
 	}
 	return nil
 }
+
+func FindShortLinkByUrl(url string, shortLink *model.ShortLink) *gorm.DB {
+	logger.Logger.Debug("find short link by url", zap.String("url", url))
+	return DB.Where("url = ?", url).First(&shortLink)
+}
+
+func FindShortLinkByHash(hash string, shortLink *model.ShortLink) *gorm.DB {
+	logger.Logger.Debug("find short link by hash", zap.String("hash", hash))
+	return DB.Where("hash = ?", hash).First(&shortLink)
+}
+
+func SaveShortLink(shortLink *model.ShortLink) {
+	logger.Logger.Debug("save short link", zap.String("hash", shortLink.Hash))
+	DB.Save(shortLink)
+}
+
+func FirstOrCreateShortLink(shortLink *model.ShortLink) {
+	logger.Logger.Debug("first or create short link", zap.String("hash", shortLink.Hash))
+	DB.FirstOrCreate(shortLink)
+}

utils/mkdir.go

@@ -0,0 +1,30 @@
+package utils
+
+import (
+	"errors"
+	"os"
+)
+
+func MKDir(dir string) error {
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		err := os.MkdirAll(dir, os.ModePerm)
+		if err != nil {
+
+			return err
+		}
+	}
+	return nil
+}
+
+func MkEssentialDir() error {
+	if err := MKDir("subs"); err != nil {
+		return errors.New("create subs dir failed" + err.Error())
+	}
+	if err := MKDir("templates"); err != nil {
+		return errors.New("create templates dir failed" + err.Error())
+	}
+	if err := MKDir("logs"); err != nil {
+		return errors.New("create logs dir failed" + err.Error())
+	}
+	return nil
+}

utils/os.go

@@ -1,16 +0,0 @@
-package utils
-
-import (
-	"os"
-)
-
-func MKDir(dir string) error {
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err := os.MkdirAll(dir, os.ModePerm)
-		if err != nil {
-
-			return err
-		}
-	}
-	return nil
-}

utils/proxy.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"sort"
 	"strings"
 	"sub2clash/model"
 	"sub2clash/parser"
@@ -30,12 +29,10 @@ func GetContryName(proxy model.Proxy) string {
 
 func AddProxy(
 	sub *model.Subscription, autotest bool,
-	lazy bool, sortStrategy string,
-	clashType model.ClashType, proxies ...model.Proxy,
+	lazy bool, clashType model.ClashType, proxies ...model.Proxy,
 ) {
 	newCountryGroupNames := make([]string, 0)
 	proxyTypes := model.GetSupportProxyTypes(clashType)
-
 	// 添加节点
 	for _, proxy := range proxies {
 		if !proxyTypes[proxy.Type] {
@@ -85,26 +82,6 @@ func AddProxy(
 			newCountryGroupNames = append(newCountryGroupNames, countryName)
 		}
 	}
-	// 统计国家策略组数量
-	countryGroupCount := 0
-	for i := range sub.ProxyGroups {
-		if sub.ProxyGroups[i].IsCountryGrop {
-			countryGroupCount++
-		}
-	}
-	// 对国家策略组进行排序
-	switch sortStrategy {
-	case "sizeasc":
-		sort.Sort(model.ProxyGroupsSortBySize(sub.ProxyGroups[:countryGroupCount]))
-	case "sizedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(sub.ProxyGroups[:countryGroupCount])))
-	case "nameasc":
-		sort.Sort(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount]))
-	case "namedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount])))
-	default:
-		sort.Sort(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount]))
-	}
 }
 
 func ParseProxy(proxies ...string) []model.Proxy {

utils/write_default_template.go

@@ -0,0 +1,37 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+	"sub2clash/config"
+)
+
+func writeTemplate(path string, template string) error {
+	tPath := filepath.Join(
+		"templates", path,
+	)
+	if _, err := os.Stat(tPath); os.IsNotExist(err) {
+		file, err := os.Create(tPath)
+		if err != nil {
+			return err
+		}
+		defer func(file *os.File) {
+			_ = file.Close()
+		}(file)
+		_, err = file.WriteString(template)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func WriteDefalutTemplate(templateMeta string, templateClash string) error {
+	if err := writeTemplate(config.Default.MetaTemplate, templateMeta); err != nil {
+		return err
+	}
+	if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
+		return err
+	}
+	return nil
+}