forked from github.com/pypiserver
use case insensitive matching when removing archive suffixes
that removes things like .ZIP
This commit is contained in:
parent
f8818e2d9e
commit
175911fc6d
@ -24,12 +24,14 @@ def guess_pkgname(path):
|
|||||||
pkgname = re.split(r"-\d+", os.path.basename(path))[0]
|
pkgname = re.split(r"-\d+", os.path.basename(path))[0]
|
||||||
return pkgname
|
return pkgname
|
||||||
|
|
||||||
|
_archive_suffix_rx = re.compile(r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2)$", re.IGNORECASE)
|
||||||
|
|
||||||
|
|
||||||
def guess_pkgname_and_version(path):
|
def guess_pkgname_and_version(path):
|
||||||
path = os.path.basename(path)
|
path = os.path.basename(path)
|
||||||
pkgname = re.split(r"-\d+", path, 1)[0]
|
pkgname = re.split(r"-\d+", path, 1)[0]
|
||||||
version = path[len(pkgname) + 1:]
|
version = path[len(pkgname) + 1:]
|
||||||
version = re.sub(r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2)$", "", version)
|
version = _archive_suffix_rx.sub("", version)
|
||||||
return pkgname, version
|
return pkgname, version
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user