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

Compile regex at start, instead of each page load

This commit is contained in:
Seednode 2022-10-23 13:45:49 -05:00
parent 76109342ed
commit aa2413eafc
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/files.go
View File

@ -192,12 +192,10 @@ func getPreviousFile(p *Path) (string, error) {
return fileName, err return fileName, err
} }
func splitPath(path string) (*Path, error) { func splitPath(path string, re regexp.Regexp) (*Path, error) {
p := Path{} p := Path{}
var err error var err error
re := regexp.MustCompile(`(.+)([0-9]{3})(\..+)`)
split := re.FindAllStringSubmatch(path, -1) split := re.FindAllStringSubmatch(path, -1)
if len(split) < 1 || len(split[0]) < 3 { if len(split) < 1 || len(split[0]) < 3 {

19
cmd/web.go
View File

@ -11,6 +11,7 @@ import (
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
"regexp"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -227,7 +228,7 @@ func serveStaticFileHandler(paths []string) appHandler {
} }
} }
func serveHtmlHandler(paths []string) appHandler { func serveHtmlHandler(paths []string, re regexp.Regexp) appHandler {
return func(w http.ResponseWriter, r *http.Request) error { return func(w http.ResponseWriter, r *http.Request) error {
refererUri, err := stripQueryParams(refererToUri(r.Referer())) refererUri, err := stripQueryParams(refererToUri(r.Referer()))
if err != nil { if err != nil {
@ -254,7 +255,7 @@ func serveHtmlHandler(paths []string) appHandler {
return err return err
} }
path, err := splitPath(query) path, err := splitPath(query, re)
if err != nil { if err != nil {
return err return err
} }
@ -275,7 +276,7 @@ func serveHtmlHandler(paths []string) appHandler {
return err return err
} }
path, err := splitPath(filePath) path, err := splitPath(filePath, re)
if err != nil { if err != nil {
return err return err
} }
@ -302,7 +303,7 @@ func serveHtmlHandler(paths []string) appHandler {
return err return err
} }
path, err := splitPath(filePath) path, err := splitPath(filePath, re)
if err != nil { if err != nil {
return err return err
} }
@ -324,7 +325,7 @@ func serveHtmlHandler(paths []string) appHandler {
return err return err
} }
path, err := splitPath(query) path, err := splitPath(query, re)
if err != nil { if err != nil {
return err return err
} }
@ -345,7 +346,7 @@ func serveHtmlHandler(paths []string) appHandler {
return err return err
} }
path, err := splitPath(filePath) path, err := splitPath(filePath, re)
if err != nil { if err != nil {
return err return err
} }
@ -372,7 +373,7 @@ func serveHtmlHandler(paths []string) appHandler {
return err return err
} }
path, err := splitPath(filePath) path, err := splitPath(filePath, re)
if err != nil { if err != nil {
return err return err
} }
@ -450,7 +451,9 @@ func ServePage(args []string) error {
fmt.Println("Paths: " + i) fmt.Println("Paths: " + i)
} }
http.Handle("/", serveHtmlHandler(paths)) re := regexp.MustCompile(`(.+)([0-9]{3})(\..+)`)
http.Handle("/", serveHtmlHandler(paths, *re))
http.Handle(PREFIX+"/", http.StripPrefix(PREFIX, serveStaticFileHandler(paths))) http.Handle(PREFIX+"/", http.StripPrefix(PREFIX, serveStaticFileHandler(paths)))
http.HandleFunc("/favicon.ico", doNothing) http.HandleFunc("/favicon.ico", doNothing)