SeanOMik
/
roulette
mirror of https://git.seedno.de/seednode/roulette.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entire 404 page is now clickable, and attempts to open a new random file

This commit is contained in:
Seednode 2022-10-28 19:09:05 -05:00
parent 0434353942
commit 5c7bb60dcb
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/files.go
View File

@ -105,15 +105,11 @@ func humanReadableSize(bytes int) string {
}
func getImageDimensions(path string) (string, error) {
fmt.Println("Opening path " + path)
file, err := os.Open(path)
defer file.Close()
fmt.Println("Getting file dimensions")
myImage, _, err := image.DecodeConfig(file)
if errors.Is(err, image.ErrFormat) {
fmt.Println("File not image")
return "", nil
} else if err != nil {
return "", err

2
cmd/version.go
View File

@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
)
var Version = "0.20.0"
var Version = "0.20.1"
func init() {
rootCmd.AddCommand(versionCmd)

42
cmd/web.go
View File

@ -69,6 +69,32 @@ func (fn appHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
}
func notFound(w http.ResponseWriter, r *http.Request) error {
w.WriteHeader(404)
w.Header().Add("Content-Type", "text/html")
htmlBody := `<html lang="en">
<head>
<style>
a{display:block;height:100%;width:100%;text-decoration:none;color:inherit;cursor:auto;}
</style>
<title>
Not Found
</title>
</head>
<body>
<a href="/">404 page not found</a>
</body>
</html>`
_, err := io.WriteString(w, htmlBody)
if err != nil {
return err
}
return nil
}
func splitQueryParams(query string) []string {
if query == "" {
return []string{}
@ -194,7 +220,7 @@ func serveStaticFile(w http.ResponseWriter, r *http.Request, paths []string) err
}
if !pathIsValid(filePath, paths) {
http.NotFound(w, r)
notFound(w, r)
}
exists, err := fileExists(filePath)
@ -203,7 +229,7 @@ func serveStaticFile(w http.ResponseWriter, r *http.Request, paths []string) err
}
if !exists {
http.NotFound(w, r)
notFound(w, r)
return nil
}
@ -307,7 +333,7 @@ func serveHtmlHandler(paths []string, re regexp.Regexp, fileCache *[]string) app
case r.URL.Path == "/" && sortOrder == "asc" && refererUri == "":
filePath, err := pickFile(paths, &filters, sortOrder, fileCache)
if err != nil && err == ErrNoImagesFound {
http.NotFound(w, r)
notFound(w, r)
return nil
} else if err != nil {
@ -350,7 +376,7 @@ func serveHtmlHandler(paths []string, re regexp.Regexp, fileCache *[]string) app
filePath, err = pickFile(paths, &filters, sortOrder, fileCache)
switch {
case err != nil && err == ErrNoImagesFound:
http.NotFound(w, r)
notFound(w, r)
return nil
case err != nil:
@ -377,7 +403,7 @@ func serveHtmlHandler(paths []string, re regexp.Regexp, fileCache *[]string) app
case r.URL.Path == "/" && sortOrder == "desc" && refererUri == "":
filePath, err := pickFile(paths, &filters, sortOrder, fileCache)
if err != nil && err == ErrNoImagesFound {
http.NotFound(w, r)
notFound(w, r)
return nil
} else if err != nil {
@ -403,7 +429,7 @@ func serveHtmlHandler(paths []string, re regexp.Regexp, fileCache *[]string) app
case r.URL.Path == "/":
filePath, err := pickFile(paths, &filters, sortOrder, fileCache)
if err != nil && err == ErrNoImagesFound {
http.NotFound(w, r)
notFound(w, r)
return nil
} else if err != nil {
@ -429,7 +455,7 @@ func serveHtmlHandler(paths []string, re regexp.Regexp, fileCache *[]string) app
}
if !exists {
http.NotFound(w, r)
notFound(w, r)
return nil
}
@ -439,7 +465,7 @@ func serveHtmlHandler(paths []string, re regexp.Regexp, fileCache *[]string) app
return err
}
if !image {
http.NotFound(w, r)
notFound(w, r)
return nil
}