fnexe.com
/
pypiserver
forked from github.com/pypiserver
1
0
Fork 0
Code Pull Requests Activity

support changing the prefix of the path of the url

This commit is contained in:
swe-jaeyoungpark 2019-04-16 15:46:59 +09:00
parent 537034eb43
commit 569929c95b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pypiserver/_app.py
View File

@ -80,8 +80,6 @@ def favicon():
@app.route('/') @app.route('/')
def root(): def root():
fp = request.fullpath
try: try:
numpkgs = len(list(packages())) numpkgs = len(list(packages()))
except: except:
@ -93,8 +91,8 @@ def root():
URL=request.url, URL=request.url,
VERSION=__version__, VERSION=__version__,
NUMPKGS=numpkgs, NUMPKGS=numpkgs,
PACKAGES=urljoin(fp, "packages/"), PACKAGES=urljoin(request.url, "packages/"),
SIMPLE=urljoin(fp, "simple/") SIMPLE=urljoin(request.url, "simple/")
) )
_bottle_upload_filename_re = re.compile(r'^[a-z0-9_.!+-]+$', re.I) _bottle_upload_filename_re = re.compile(r'^[a-z0-9_.!+-]+$', re.I)
@ -197,7 +195,7 @@ def update():
@app.route('/packages') @app.route('/packages')
@auth("list") @auth("list")
def pep_503_redirects(prefix=None): def pep_503_redirects(prefix=None):
return redirect(request.fullpath + "/", 301) return redirect(request.url + "/", 301)
@app.post('/RPC2') @app.post('/RPC2')
@ -261,9 +259,8 @@ def simple(prefix=""):
return redirect("%s/%s/" % (config.fallback_url.rstrip("/"), prefix)) return redirect("%s/%s/" % (config.fallback_url.rstrip("/"), prefix))
return HTTPError(404, 'Not Found (%s does not exist)\n\n' % normalized) return HTTPError(404, 'Not Found (%s does not exist)\n\n' % normalized)
fp = request.fullpath
links = [(os.path.basename(f.relfn), links = [(os.path.basename(f.relfn),
urljoin(fp, "../../packages/%s" % f.fname_and_hash(config.hash_algo))) urljoin(request.url, "../../packages/%s" % f.fname_and_hash(config.hash_algo)))
for f in files] for f in files]
tmpl = """\ tmpl = """\
<html> <html>
@ -284,12 +281,11 @@ def simple(prefix=""):
@app.route('/packages/') @app.route('/packages/')
@auth("list") @auth("list")
def list_packages(): def list_packages():
fp = request.fullpath
files = sorted(core.find_packages(packages()), files = sorted(core.find_packages(packages()),
key=lambda x: (os.path.dirname(x.relfn), key=lambda x: (os.path.dirname(x.relfn),
x.pkgname, x.pkgname,
x.parsed_version)) x.parsed_version))
links = [(f.relfn_unix, urljoin(fp, f.fname_and_hash(config.hash_algo))) links = [(f.relfn_unix, urljoin(request.url, f.fname_and_hash(config.hash_algo)))
for f in files] for f in files]
tmpl = """\ tmpl = """\
<html> <html>

2
pypiserver/core.py
View File

@ -285,7 +285,7 @@ def store(root, filename, save_method):
def get_bad_url_redirect_path(request, prefix): def get_bad_url_redirect_path(request, prefix):
"""Get the path for a bad root url.""" """Get the path for a bad root url."""
p = request.fullpath p = request.url
if p.endswith("/"): if p.endswith("/"):
p = p[:-1] p = p[:-1]
p = p.rsplit('/', 1)[0] p = p.rsplit('/', 1)[0]