mirrors/rimgo
1
0
Fork 0
mirror of https://codeberg.org/video-prize-ranch/rimgo.git synced 2026-02-27 18:59:45 +00:00
Code Issues Projects Releases Wiki Activity

simplify SplitNameExt

Browse Source
This commit is contained in:
orangix
2026-01-31 05:19:02 +01:00
parent d84ca93e0e
commit 4ffe09bb81
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@@ -87,7 +87,7 @@ func main() {
app.Handle("GET /t/{tag}", wrapHandler(func(w http.ResponseWriter, r *http.Request) error { app.Handle("GET /t/{tag}", wrapHandler(func(w http.ResponseWriter, r *http.Request) error {
name, ext := utils.SplitNameExt(r.PathValue("tag")) name, ext := utils.SplitNameExt(r.PathValue("tag"))
if ext != "" { if ext != "" {
r.SetPathValue("tag", name[0:len(name)-1]) r.SetPathValue("tag", name)
r.SetPathValue("type", ext) r.SetPathValue("type", ext)
return pages.HandleTagRSS(w, r) return pages.HandleTagRSS(w, r)
} }
@@ -98,7 +98,7 @@ func main() {
app.Handle("GET /user/{userID}", wrapHandler(func(w http.ResponseWriter, r *http.Request) error { app.Handle("GET /user/{userID}", wrapHandler(func(w http.ResponseWriter, r *http.Request) error {
name, ext := utils.SplitNameExt(r.PathValue("userID")) name, ext := utils.SplitNameExt(r.PathValue("userID"))
if ext != "" { if ext != "" {
r.SetPathValue("userID", name[0:len(name)-1]) r.SetPathValue("userID", name)
r.SetPathValue("type", ext) r.SetPathValue("type", ext)
return pages.HandleUserRSS(w, r) return pages.HandleUserRSS(w, r)
} }
@@ -133,7 +133,7 @@ func main() {
r.SetPathValue("baseName", baseName) r.SetPathValue("baseName", baseName)
r.SetPathValue("extension", extension) r.SetPathValue("extension", extension)
switch extension { switch extension {
case "png", "gif", "jpg", "jpeg", "webp", "mp4", "webm": case ".png", ".gif", ".jpg", ".jpeg", ".webp", ".mp4", ".webm":
return pages.HandleMedia(w, r) return pages.HandleMedia(w, r)
} }
fallthrough fallthrough

2
pages/media.go
View File

@@ -14,7 +14,7 @@ func HandleMedia(w http.ResponseWriter, r *http.Request) error {
w.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; img-src 'self'") w.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; img-src 'self'")
baseName, extension := r.PathValue("baseName"), r.PathValue("extension") baseName, extension := r.PathValue("baseName"), r.PathValue("extension")
if strings.HasPrefix(r.URL.Path, "/stack") { if strings.HasPrefix(r.URL.Path, "/stack") {
return handleMedia(w, r, "https://i.stack.imgur.com/"+baseName[5:]+extension) return handleMedia(w, r, "https://i.stack.imgur.com/"+baseName+extension)
} else { } else {
return handleMedia(w, r, "https://i.imgur.com/"+baseName+extension) return handleMedia(w, r, "https://i.imgur.com/"+baseName+extension)
} }

6
pages/rss.go
View File

@@ -116,19 +116,19 @@ func handleFeed(w http.ResponseWriter, r *http.Request, instance string, feed *f
w.Header().Set("Content-Type", mime.TypeByExtension("."+r.PathValue("type"))) w.Header().Set("Content-Type", mime.TypeByExtension("."+r.PathValue("type")))
switch r.PathValue("type") { switch r.PathValue("type") {
case "atom": case ".atom":
body, err := feed.ToAtom() body, err := feed.ToAtom()
if err != nil { if err != nil {
return err return err
} }
w.Write([]byte(body)) w.Write([]byte(body))
case "json": case ".json":
body, err := feed.ToJSON() body, err := feed.ToJSON()
if err != nil { if err != nil {
return err return err
} }
w.Write([]byte(body)) w.Write([]byte(body))
case "rss": case ".rss":
body, err := feed.ToRss() body, err := feed.ToRss()
if err != nil { if err != nil {
return err return err

16
utils/splitNameExt.go
View File

@@ -1,16 +1,8 @@
package utils package utils
import "path/filepath"
func SplitNameExt(path string) (name, ext string) { func SplitNameExt(path string) (name, ext string) {
name, ext = path, "" ext = filepath.Ext(path)
for range 5 { return path[:len(path)-len(ext)], ext
if len(name) == 0 || name[len(name)-1] == '.' || name[len(name)-1] == '/' {
break
}
name = name[:len(name)-1]
ext = path[len(name):]
}
if len(name) == 0 || name[len(name)-1] != '.' {
return path, ""
}
return
} }