This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8935

hgweb: ignore web.templates config when guessing mime type for static content
ClosedPublic

Authored by martinvonz on Aug 19 2020, 12:42 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGec2fc4d038c2: hgweb: ignore web.templates config when guessing mime type for static content
Summary

Frozen binaries won't have a file-system path for static content, so
I'd like to remove dependence on that. From the documentation, it
seems like mimetypes.guess_type() only cares about the suffix, so I
think it should be enough to pass in just path under the
web.templates directory.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/common.py (2 lines)

Diff 22420

mercurial/hgweb/common.py

if tp is not None: if tp is not None:
directory = os.path.join(tp, b'static') directory = os.path.join(tp, b'static')
fpath = os.path.join(*fname.split(b'/')) fpath = os.path.join(*fname.split(b'/'))
path = os.path.join(directory, fpath) path = os.path.join(directory, fpath)
try: try:
os.stat(path) os.stat(path)
ct = pycompat.sysbytes( ct = pycompat.sysbytes(
mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain" mimetypes.guess_type(pycompat.fsdecode(fpath))[0] or r"text/plain"
) )
with open(path, b'rb') as fh: with open(path, b'rb') as fh:
data = fh.read() data = fh.read()
res.headers[b'Content-Type'] = ct res.headers[b'Content-Type'] = ct
res.setbodybytes(data) res.setbodybytes(data)
return res return res
except TypeError: except TypeError: