aniani/amfora
1
0
Fork 0
mirror of https://github.com/makew0rld/amfora.git synced 2024-12-04 14:46:29 -05:00
Code

♻️ Making charset handling nicer

Browse Source
This commit is contained in:
makeworld 2020-06-19 13:33:53 -04:00
parent 41075c8c41
commit 85a89846bb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
renderer/renderer.go
View File

@ -19,6 +19,9 @@ import (
"gitlab.com/tslocum/cview" "gitlab.com/tslocum/cview"
) )
// Charset values that are compatible with UTF-8, lowercased.
var utfCharsets = []string{"", "utf-8", "us-ascii"}
// CanDisplay returns true if the response is supported by Amfora // CanDisplay returns true if the response is supported by Amfora
// for displaying on the screen. // for displaying on the screen.
// It also doubles as a function to detect whether something can be stored in a Page struct. // It also doubles as a function to detect whether something can be stored in a Page struct.
@ -31,15 +34,16 @@ func CanDisplay(res *gemini.Response) bool {
if err != nil { if err != nil {
return false return false
} }
if strings.ToLower(params["charset"]) != "utf-8" && strings.ToLower(params["charset"]) != "us-ascii" && params["charset"] != "" {
// Amfora doesn't support other charsets
return false
}
if mediatype != "text/gemini" && mediatype != "text/plain" { if mediatype != "text/gemini" && mediatype != "text/plain" {
// Amfora doesn't support other filetypes // Amfora doesn't support other filetypes
return false return false
} }
return true for _, charset := range utfCharsets {
if strings.ToLower(params["charset"]) == charset {
return true // Supported
}
}
return false
} }
// convertRegularGemini converts non-preformatted blocks of text/gemini // convertRegularGemini converts non-preformatted blocks of text/gemini