v4.3.1

mywords-flutter/lib/config/config.dart

@@ -5,7 +5,6 @@ final Map<String, String> _hostIconsAssetPath = {
   "www.nytimes.com": "$_iconPrefix/nytimes.png",
   "www.economist.com": "$_iconPrefix/theeconomist.png",
   "www.cnbc.com": "$_iconPrefix/cnbc.png",
-  "www.nbcnews.com": "$_iconPrefix/cnbc.png",
   "www.bbc.com": "$_iconPrefix/bbc.png",
   "www.bbc.co.uk": "$_iconPrefix/bbc.png",
   "www.thetimes.co.uk": "$_iconPrefix/thetimes.png",
@@ -14,7 +13,7 @@ final Map<String, String> _hostIconsAssetPath = {
   "www.washingtonpost.com": "$_iconPrefix/wp.png",
   "www.foxnews.com": "$_iconPrefix/foxnews.png",
   "apnews.com": "$_iconPrefix/ap.png",
-  "www.npr.org": "$_iconPrefix/ap.png",
+  "www.npr.org": "$_iconPrefix/npr.png",
   "www.theguardian.com": "$_iconPrefix/theguardian.png",
   "www.voanews.com": "$_iconPrefix/voanews.png",
   "time.com": "$_iconPrefix/time.png",

mywords-flutter/linux-deb/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: mywords
-Version: 4.3.0
+Version: 4.3.1
 Section: Education
 Priority: optional
 Architecture: amd64

mywords-flutter/pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
 # version number is versionName; build number is versionCode;
-version: 4.3.0+3
+version: 4.3.1+3
 
 environment:
   sdk: '>=3.2.3 <4.0.0'

mywords-go/client/sources.go

@@ -62,8 +62,9 @@ func (c *Client) saveSourcesToLocal(sources []string) (err error) {
 var localFixedSourcesMap = []string{
 	"https://cn.nytimes.com",
 	"https://www.bbc.co.uk",
+	"https://edition.cnn.com",
 	"https://apnews.com",
-	"https://www.npr.org",
+	"https://www.cbsnews.com",
 	"https://www.theguardian.com",
 	"https://www.voanews.com",
 	"https://time.com",
@@ -161,8 +162,9 @@ func (c *Client) getAllSources(ctx context.Context) []string {
 		hostsCountMap[host.Host] = host.Count
 	}
 
-	// 排序: 优先级: 公共源 > 按照host出现次数排序 > 私有源 > 按照source排序
+	// 排序: 优先级: 按照host出现次数排序 > 公共源 > 私有源 > 按照source排序
 	// host  通过getHostFromURL获取
+	// order: host count  > public > private > source
 	sort.Slice(allSources, func(i, j int) bool {
 		sourceI := allSources[i]
 		sourceJ := allSources[j]
@@ -173,22 +175,16 @@ func (c *Client) getAllSources(ctx context.Context) []string {
 		countJ := hostsCountMap[hostJ]
 		_, isPublicI := publicSourcesMap[sourceI]
 		_, isPublicJ := publicSourcesMap[sourceJ]
+		if countI != countJ {
+			return countI > countJ
+		}
+		// countI == countJ
 		if isPublicI && !isPublicJ {
 			return true
 		}
 		if !isPublicI && isPublicJ {
 			return false
 		}
-		if isPublicI && isPublicJ {
-			if countI != countJ {
-				return countI > countJ
-			}
-			return sourceI < sourceJ
-		}
-		// all are private sources
-		if countI != countJ {
-			return countI > countJ
-		}
 		return sourceI < sourceJ
 	})
 	return allSources
@@ -218,7 +214,7 @@ func (c *Client) GetSourcesPublic(ctx context.Context) ([]string, error) {
 	return sources, nil
 }
 func (c *Client) getSourcesFromPublic(ctx context.Context) ([]string, error) {
-	const sourceURL = "https://raw.githubusercontent.com/vito-go/assets/refs/heads/dev-sources/mywords/sources.list"
+	const sourceURL = "https://raw.githubusercontent.com/vito-go/assets/refs/heads/master/mywords/sources.list"
 	req, err := http.NewRequest("GET", sourceURL, nil)
 	if err != nil {
 		return nil, err