fixed issue(#25) files are skipped when there is no banner, update im…

…age format
elvis972602 · Aug 4, 2023 · 71fac22 · 71fac22
1 parent 69bfc75
commit 71fac22
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/kemono/fetch.go b/kemono/fetch.go
@@ -169,12 +169,3 @@ func AddIndexToAttachments(attachments []File) []FileWithIndex {
 	}
 	return files
 }
-
-func isImage(ext string) bool {
-	switch ext {
-	case ".jpg", ".png", ".gif", ".webp", ".bmp", ".tiff", ".svg", ".ico", ".jpeg", ".jfif", ".jpe":
-		return true
-	default:
-		return false
-	}
-}
diff --git a/kemono/kemono.go b/kemono/kemono.go
@@ -258,7 +258,8 @@ func (k *Kemono) Start() {
 
 		// filter attachments
 		for i, post := range posts {
-			if k.Banner && post.File.Path != "" {
+			// download banner if banner is true or file is not image
+			if (k.Banner && post.File.Path != "") || !isImage(filepath.Ext(post.File.Name)) {
 				res := make([]File, len(post.Attachments)+1)
 				copy(res[1:], post.Attachments)
 				res[0] = post.File

diff --git a/kemono/utils.go b/kemono/utils.go
@@ -0,0 +1,10 @@
+package kemono
+
+func isImage(ext string) bool {
+	switch ext {
+	case ".apng", ".avif", ".bmp", ".gif", ".ico", ".cur", ".jpg", ".jpeg", ".jfif", ".pjpeg", ".pjp", ".png", ".svg", ".tif", ".tiff", ".webp", ".jpe":
+		return true
+	default:
+		return false
+	}
+}
diff --git a/main/main.go b/main/main.go
@@ -494,7 +494,7 @@ func parasLink(link string) (s, service, userId, postId string) {
 		log.Fatal("invalid url")
 	}
 
-	pattern := `(?i)^(?:.*\.)?(kemono|coomer)\.party$`
+	pattern := `(?i)^(?:.*\.)?(kemono|coomer)\.(?:party|su)$`
 	re := regexp.MustCompile(pattern)
 
 	matchedSubstrings := re.FindStringSubmatch(u.Host)

diff --git a/main/path.go b/main/path.go
@@ -119,7 +119,7 @@ func (t *TmplCache) Execute(typ string, config *PathConfig) string {
 
 func getTyp(ext string) string {
 	switch ext {
-	case ".jpg", ".png", ".gif", ".webp", ".bmp", ".tiff", ".svg", ".ico", ".jpeg", ".jfif", ".jpe":
+	case ".apng", ".avif", ".bmp", ".gif", ".ico", ".cur", ".jpg", ".jpeg", ".jfif", ".pjpeg", ".pjp", ".png", ".svg", ".tif", ".tiff", ".webp", ".jpe":
 		return "image"
 	case ".mp4", ".webm", ".mkv", ".avi", ".mov", ".wmv", ".flv", ".f4v", ".m4v", ".rmvb", ".rm", ".3gp", ".dat", ".ts", ".mts", ".vob":
 		return "video"