Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion internal/bootstrap/data/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ func InitialSettings() []model.SettingItem {
"Google":"https://docs.google.com/gview?url=$e_url&embedded=true"
},
"pdf": {
"PDF.js":"https://res.oplist.org/pdf.js/web/viewer.html?file=$e_url"
"PDF.js":"https://res.oplist.org/pdf.js/web/viewer.html?file=$e_url",
"Browser":"$url?inline_preview=true"
},
"epub": {
"EPUB.js":"https://res.oplist.org/epub.js/viewer.html?url=$e_url"
Expand Down
16 changes: 11 additions & 5 deletions server/common/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ import (
)

func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.Obj) error {

// check if query param "inline_preview" is true
inlinePreview := r.URL.Query().Get("inline_preview") == "true"

if link.MFile != nil {
attachHeader(w, file, link)
attachHeader(w, file, link, inlinePreview)
http.ServeContent(w, r, file.GetName(), file.ModTime(), link.MFile)
return nil
}

if link.Concurrency > 0 || link.PartSize > 0 {
attachHeader(w, file, link)
attachHeader(w, file, link, inlinePreview)
size := link.ContentLength
if size <= 0 {
size = file.GetSize()
Expand All @@ -40,7 +44,7 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
}

if link.RangeReader != nil {
attachHeader(w, file, link)
attachHeader(w, file, link, inlinePreview)
size := link.ContentLength
if size <= 0 {
size = file.GetSize()
Expand Down Expand Up @@ -70,9 +74,11 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
})
return err
}
func attachHeader(w http.ResponseWriter, file model.Obj, link *model.Link) {
func attachHeader(w http.ResponseWriter, file model.Obj, link *model.Link, inlinePreview bool) {
fileName := file.GetName()
w.Header().Set("Content-Disposition", utils.GenerateContentDisposition(fileName))
if !inlinePreview {
w.Header().Set("Content-Disposition", utils.GenerateContentDisposition(fileName))
}
w.Header().Set("Content-Type", utils.GetMimeType(fileName))
size := link.ContentLength
if size <= 0 {
Expand Down