Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert by only cwebp when .webp ext filepath requested #6

Merged
merged 10 commits into from
Oct 13, 2023
+11 −10
Merged

Convert by only cwebp when .webp ext filepath requested #6

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bbed1c1
add debug log
takutakahashi Oct 12, 2023
503bcf5
Merge branch 'webp' of ssh://github.com/takutakahashi/oyaki into webp
takutakahashi Oct 12, 2023
7cd232e
Revert "Delete .github/workflows/build_webp.yaml"
takutakahashi Oct 12, 2023
248a083
add log
takutakahashi Oct 12, 2023
d8d7ce4
only cwebp
takutakahashi Oct 13, 2023
a809ad5
Merge branch 'master' of github.com:pepabo/oyaki into webp
takutakahashi Oct 13, 2023
f750bf1
rm build yaml
takutakahashi Oct 13, 2023
881acf5
Revert "add log"
takutakahashi Oct 13, 2023
3f6daf2
Revert "add debug log"
takutakahashi Oct 13, 2023
b961560
add buf reset
takutakahashi Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"bytes"
"errors"
"flag"
"fmt"
Expand Down Expand Up @@ -133,24 +134,24 @@ func proxy(w http.ResponseWriter, r *http.Request) {
}
return
}

buf, err := convert(orgRes.Body, quality)
if err != nil {
http.Error(w, "Image convert failed", http.StatusInternalServerError)
log.Printf("Image convert failed. %v\n", err)
return
}
defer buf.Reset()
var buf *bytes.Buffer
if pathExt == ".webp" {
buf, err = convWebp(buf, []string{})
buf, err = convWebp(orgRes.Body, []string{})
if err != nil {
http.Error(w, "image convert failed", http.StatusInternalServerError)
log.Printf("Read origin body failed. %v\n", err)
return

}
defer buf.Reset()
w.Header().Set("Content-Type", "image/webp")
} else {
buf, err = convert(orgRes.Body, quality)
if err != nil {
http.Error(w, "Image convert failed", http.StatusInternalServerError)
log.Printf("Image convert failed. %v\n", err)
return
}
defer buf.Reset()
w.Header().Set("Content-Type", "image/jpeg")
}
w.Header().Set("Content-Length", strconv.Itoa(buf.Len()))
Expand Down