Skip to content

Commit 3ea5c38

Browse files
committed
Allow '+' signs when validating MSYS2 package names
1 parent 9643b0f commit 3ea5c38

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/murfey/server/api/bootstrap.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
bootstrap = APIRouter(prefix="/bootstrap", tags=["bootstrap"])
4444
cygwin = APIRouter(prefix="/cygwin", tags=["bootstrap"])
4545
msys2 = APIRouter(prefix="/msys2", tags=["bootstrap"])
46-
win_terminal = APIRouter(prefix="/win_terminal", tags=["bootstrap"])
46+
windows_terminal = APIRouter(prefix="/microsoft/terminal", tags=["bootstrap"])
4747
pypi = APIRouter(prefix="/pypi", tags=["bootstrap"])
4848
plugins = APIRouter(prefix="/plugins", tags=["bootstrap"])
4949

@@ -534,7 +534,7 @@ def get_msys2_package_file(
534534
# Validate package name
535535
## MSYS2 package names contain alphanumerics (includes "_"; \w), periods (\.),
536536
## dashes (\-), and tildes (~)
537-
if bool(re.fullmatch(r"^[\w\.\-~]+$", package)) is False:
537+
if bool(re.fullmatch(r"^[\w\.\-\+~]+$", package)) is False:
538538
raise ValueError(f"{package!r} is not a valid package name")
539539

540540
# Construct URL to main MSYS repo and get response
@@ -555,21 +555,25 @@ def get_msys2_package_file(
555555
WINDOWS TERMINAL-RELATED FUNCTIONS AND ENDPOINTS
556556
"""
557557

558-
@win_terminal.get("/releases", response_class=Response)
558+
559+
@windows_terminal.get("/releases", response_class=Response)
559560
def get_windows_terminal_repository():
560561
pass
561562

562-
@win_terminal.get("/releases/{version}", response_class=Response)
563+
564+
@windows_terminal.get("/releases/{version}", response_class=Response)
563565
def get_windows_terminal_version_packages(version=str):
564566
pass
565567

566-
@win_terminal.get("/releases/{version}/{file_name}", response_class=Response)
568+
569+
@windows_terminal.get("/releases/{version}/{file_name}", response_class=Response)
567570
def get_windows_terminal_package_file(
568571
version: str,
569572
file_name: str,
570573
):
571574
pass
572575

576+
573577
"""
574578
PYPI-RELATED FUNCTIONS AND ENDPOINTS
575579
"""

0 commit comments

Comments
 (0)