comparison mercurial/hgweb/hgwebdir_mod.py @ 36873:98baf8dea553

hgweb: port static file handling to new response API

hgwebdir_mod hasn't received as much porting effort. So we had to
do some minor plumbing to get it to match hgweb_mod and to support
the new response object.

Differential Revision: https://phab.mercurial-scm.org/D2789

36872:89002d07a114

            for r in self._runwsgi(wsgireq):
                yield r

    def _runwsgi(self, wsgireq):
        req = wsgireq.req

        try:
            self.refresh()

            csp, nonce = cspvalues(self.ui)
            if csp:
                wsgireq.headers.append(('Content-Security-Policy', csp))

            virtual = wsgireq.env.get("PATH_INFO", "").strip('/')
            tmpl = self.templater(wsgireq, nonce)
            ctype = tmpl('mimetype', encoding=encoding.encoding)
            ctype = templater.stringify(ctype)

            # a static file
            if virtual.startswith('static/') or 'static' in req.qsparams:
                if virtual.startswith('static/'):
                    fname = virtual[7:]

                if not static:
                    tp = self.templatepath or templater.templatepaths()
                    if isinstance(tp, str):
                        tp = [tp]
                    static = [os.path.join(p, 'static') for p in tp]
                staticfile(static, fname, wsgireq)
                return []

            # top-level index

            repos = dict(self.repos)

36873:98baf8dea553

            for r in self._runwsgi(wsgireq):
                yield r

    def _runwsgi(self, wsgireq):
        req = wsgireq.req
        res = wsgireq.res

        try:
            self.refresh()

            csp, nonce = cspvalues(self.ui)
            if csp:
                res.headers['Content-Security-Policy'] = csp
                wsgireq.headers.append(('Content-Security-Policy', csp))

            virtual = wsgireq.env.get("PATH_INFO", "").strip('/')
            tmpl = self.templater(wsgireq, nonce)
            ctype = tmpl('mimetype', encoding=encoding.encoding)
            ctype = templater.stringify(ctype)

            # Global defaults. These can be overridden by any handler.
            res.status = '200 Script output follows'
            res.headers['Content-Type'] = ctype

            # a static file
            if virtual.startswith('static/') or 'static' in req.qsparams:
                if virtual.startswith('static/'):
                    fname = virtual[7:]

                if not static:
                    tp = self.templatepath or templater.templatepaths()
                    if isinstance(tp, str):
                        tp = [tp]
                    static = [os.path.join(p, 'static') for p in tp]

                staticfile(static, fname, res)
                return res.sendresponse()

            # top-level index

            repos = dict(self.repos)