Skip to content

Commit

Permalink
Move some regexp out of functions (#25430) (#25445)
Browse files Browse the repository at this point in the history
Partial backport of #25430

Not a bug, but worth backporting for efficiency.

Signed-off-by: jolheiser <[email protected]>
  • Loading branch information
jolheiser authored Jun 22, 2023
1 parent 203fe28 commit 734fd93
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions modules/util/path.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ func isOSWindows() bool {
return runtime.GOOS == "windows"
}

var driveLetterRegexp = regexp.MustCompile("/[A-Za-z]:/")

// FileURLToPath extracts the path information from a file://... url.
func FileURLToPath(u *url.URL) (string, error) {
if u.Scheme != "file" {
Expand All @@ -235,8 +237,7 @@ func FileURLToPath(u *url.URL) (string, error) {
}

// If it looks like there's a Windows drive letter at the beginning, strip off the leading slash.
re := regexp.MustCompile("/[A-Za-z]:/")
if re.MatchString(path) {
if driveLetterRegexp.MatchString(path) {
return path[1:], nil
}
return path, nil
Expand Down
5 changes: 3 additions & 2 deletions services/lfs/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ func CheckAcceptMediaType(ctx *context.Context) {
}
}

var rangeHeaderRegexp = regexp.MustCompile(`bytes=(\d+)\-(\d*).*`)

// DownloadHandler gets the content from the content store
func DownloadHandler(ctx *context.Context) {
rc := getRequestContext(ctx)
Expand All @@ -92,8 +94,7 @@ func DownloadHandler(ctx *context.Context) {
toByte = meta.Size - 1
statusCode := http.StatusOK
if rangeHdr := ctx.Req.Header.Get("Range"); rangeHdr != "" {
regex := regexp.MustCompile(`bytes=(\d+)\-(\d*).*`)
match := regex.FindStringSubmatch(rangeHdr)
match := rangeHeaderRegexp.FindStringSubmatch(rangeHdr)
if len(match) > 1 {
statusCode = http.StatusPartialContent
fromByte, _ = strconv.ParseInt(match[1], 10, 32)
Expand Down

0 comments on commit 734fd93

Please sign in to comment.