chore: Optimized for Debian acceleration

soulteary · Nov 20, 2022 · 6f2a84b · 6f2a84b
1 parent 0f6c69f
commit 6f2a84b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/internal/define/debian.go b/internal/define/debian.go
@@ -6,9 +6,7 @@ const (
 	DEBIAN_BENCHMAKR_URL = "dists/bullseye/main/binary-amd64/Release"
 )
 
-var DEBIAN_HOST_PATTERN = regexp.MustCompile(
-	`https?://(deb|security|snapshot).debian.org/debian/(.+)$`,
-)
+var DEBIAN_HOST_PATTERN = regexp.MustCompile(`/debian/(.+)$`)
 
 // https://www.debian.org/mirror/list 2022.11.19
 // Sites that contain protocol headers, restrict access to resources using that protocol
@@ -37,6 +35,7 @@ var BUILDIN_DEBIAN_MIRRORS = GenerateBuildInList(DEBIAN_OFFICAL_MIRRORS, DEBIAN_
 var DEBIAN_DEFAULT_CACHE_RULES = []Rule{
 	{Pattern: regexp.MustCompile(`deb$`), CacheControl: `max-age=100000`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN},
 	{Pattern: regexp.MustCompile(`udeb$`), CacheControl: `max-age=100000`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN},
+	{Pattern: regexp.MustCompile(`InRelease$`), CacheControl: `max-age=3600`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN},
 	{Pattern: regexp.MustCompile(`DiffIndex$`), CacheControl: `max-age=3600`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN},
 	{Pattern: regexp.MustCompile(`PackagesIndex$`), CacheControl: `max-age=3600`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN},
 	{Pattern: regexp.MustCompile(`Packages\.(bz2|gz|lzma)$`), CacheControl: `max-age=3600`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN},

diff --git a/internal/mirrors/mirrors.go b/internal/mirrors/mirrors.go
@@ -66,13 +66,13 @@ func GetGeoMirrorUrlsByMode(mode int) (mirrors []string) {
 
 func GetFullMirrorURL(mirror Define.UrlWithAlias) string {
 	if mirror.Http {
-		if strings.HasSuffix(mirror.URL, "http://") {
+		if strings.HasPrefix(mirror.URL, "http://") {
 			return mirror.URL
 		}
 		return "http://" + mirror.URL
 	}
 	if mirror.Https {
-		if strings.HasSuffix(mirror.URL, "https://") {
+		if strings.HasPrefix(mirror.URL, "https://") {
 			return mirror.URL
 		}
 		return "https://" + mirror.URL