Introduce FS.CompressRoot #1331

mojatter · 2022-07-01T01:23:37Z

I want to serve files on read-only Root with FS.Compress.

This may be one of solution, could you review it?

fs := &fasthttp.FS {
    Root: "/read-only/html",
    Compress: true,
    CompressRoot: "/tmp/compressed",
}

erikdubbelboer · 2022-07-02T20:39:45Z

fs.go

+	if h.root == h.compressRoot {
+		compressedFilePath = filePath
+	} else {
+		compressedFilePath = filepath.FromSlash(h.compressRoot + path)


Why is filepath.FromSlash needed here while it isn't for h.root?

You are right. 5f432d9

erikdubbelboer · 2022-07-03T20:07:38Z

fs.go

@@ -1130,7 +1147,7 @@ const (
 	fsMaxCompressibleFileSize = 8 * 1024 * 1024
 )

-func (h *fsHandler) compressAndOpenFSFile(filePath string, fileEncoding string) (*fsFile, error) {
+func (h *fsHandler) compressAndOpenFSFile(path, filePath string, fileEncoding string) (*fsFile, error) {


Can you come up wit ha better name for path here?

Which do you think better?

pathStr

fasthttp/fs.go

Line 833 in b23c5e9

pathStr := string(path)

pathOrig

uri

erikdubbelboer · 2022-07-03T20:07:45Z

fs.go

@@ -1232,7 +1259,7 @@ func (h *fsHandler) newCompressedFSFile(filePath string, fileEncoding string) (*
 	return h.newFSFile(f, fileInfo, true, fileEncoding)
 }

-func (h *fsHandler) openFSFile(filePath string, mustCompress bool, fileEncoding string) (*fsFile, error) {
+func (h *fsHandler) openFSFile(path string, filePath string, mustCompress bool, fileEncoding string) (*fsFile, error) {


Can you come up wit ha better name for path here?

erikdubbelboer · 2022-07-06T12:10:37Z

fs.go

+	if h.root == h.compressRoot {
+		compressedFilePath = filePath
+	} else {
+		compressedFilePath = h.compressRoot + path


Isn't it possible here instead to do something like if h.root != h.compressRoot { compressedFilePath = strings.Replace(filePath, h.root, h.compressedRoot, 1) }? That way you don't have to pass the original path in each function.

Introduce pathToFilePath and filePathToCompressed 3dd25f3

I found unnecessary changes, reverted them. fa6652b

erikdubbelboer · 2022-07-09T13:25:16Z

fs.go

@@ -780,6 +796,20 @@ func cleanCacheNolock(cache map[string]*fsFile, pendingFiles, filesToRelease []*
 	return pendingFiles, filesToRelease
 }

+func (h *fsHandler) pathToFilePath(path string) string {
+	return h.root + filepath.FromSlash(path)


Shouldn't this be filepath.FromSlash(h.root + path) like it was in the code where you call this function now?

And then strings.HasPrefix(filePath, h.root) should also use filepath.FromSlash( I guess.

OK. Join root and path, and then calls filepath.FromSlash 38b41a8

root and compressRoot are passed through filepath.FromSlash in normalizeRoot. (eg. C:\path\to\root)
The path is part of the URL, that is separated by slashes. (eg. /path/to/file)
The path needs filepath.FromSlash to join root. (eg. C:\path\to\root + \path\to\file)

I think the best way is to use "filepath.Join", but I used "+" and "filepath.FromSlash" to respect the original code.

func (h *fsHandler) pathToFilePath(path string) string { return filepath.Join(h.root, path) } func (h *fsHandler) filePathToCompressed(filePath string) string { if h.root == h.compressRoot { return filePath } if !strings.HasPrefix(filePath, h.root) { return filePath } return filepath.Join(h.compressRoot, filePath[len(h.root):]) }

erikdubbelboer · 2022-07-10T08:07:22Z

Thanks!

* Introduce FS.CompressRoot * Avoid duplicated filepath.FromSlash * Introduce filePathToCompressed * Revert openIndexFile manually * Join root and path, and then calls filepath.FromSlash

Introduce FS.CompressRoot

a77d382

erikdubbelboer requested changes Jul 3, 2022

View reviewed changes

Avoid duplicated filepath.FromSlash

5f432d9

erikdubbelboer requested changes Jul 6, 2022

View reviewed changes

Introduce filePathToCompressed

3dd25f3

mojatter requested a review from erikdubbelboer July 7, 2022 06:18

Revert openIndexFile manually

fa6652b

mojatter force-pushed the fs-compress-root branch from 89043cd to fa6652b Compare July 8, 2022 08:14

erikdubbelboer requested changes Jul 9, 2022

View reviewed changes

Join root and path, and then calls filepath.FromSlash

38b41a8

mojatter requested a review from erikdubbelboer July 10, 2022 07:08

erikdubbelboer merged commit f3513cc into valyala:master Jul 10, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introduce FS.CompressRoot #1331

Introduce FS.CompressRoot #1331

mojatter commented Jul 1, 2022 •

edited

erikdubbelboer Jul 2, 2022

mojatter Jul 5, 2022

erikdubbelboer Jul 3, 2022

mojatter Jul 5, 2022

erikdubbelboer Jul 3, 2022

erikdubbelboer Jul 6, 2022

mojatter Jul 7, 2022 •

edited

mojatter Jul 8, 2022

erikdubbelboer Jul 9, 2022

mojatter Jul 10, 2022

erikdubbelboer commented Jul 10, 2022

Introduce FS.CompressRoot #1331

Introduce FS.CompressRoot #1331

Conversation

mojatter commented Jul 1, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mojatter Jul 7, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

erikdubbelboer commented Jul 10, 2022

mojatter commented Jul 1, 2022 •

edited

mojatter Jul 7, 2022 •

edited