yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed test_webui only failing in nix_sandbox

Browse Source
This commit is contained in:
Qubasa
2023-10-29 19:35:29 +01:00
parent 63a0adb678
commit 1fef2d1732
11 changed files with 146 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-cli/clan_cli/webui/api_inputs.py
View File

@@ -12,18 +12,18 @@ log = logging.getLogger(__name__)
class ClanDataPath(BaseModel):
dest: Path
directory: Path
@validator("dest")
def check_data_path(cls: Any, v: Path) -> Path: # noqa
@validator("directory")
def check_directory(cls: Any, v: Path) -> Path: # noqa
return validate_path(clan_data_dir(), v)
class ClanFlakePath(BaseModel):
dest: Path
flake_name: Path
@validator("dest")
def check_dest(cls: Any, v: Path) -> Path: # noqa
@validator("flake_name")
def check_flake_name(cls: Any, v: Path) -> Path: # noqa
return validate_path(clan_flakes_dir(), v)

4
pkgs/clan-cli/clan_cli/webui/routers/flake.py
View File

@@ -80,11 +80,11 @@ async def inspect_flake(
async def create_flake(
args: Annotated[FlakeCreateInput, Body()],
) -> FlakeCreateResponse:
if args.dest.exists():
if args.flake_name.exists():
raise HTTPException(
status_code=status.HTTP_409_CONFLICT,
detail="Flake already exists",
)
cmd_out = await create.create_flake(args.dest, args.url)
cmd_out = await create.create_flake(args.flake_name, args.url)
return FlakeCreateResponse(cmd_out=cmd_out)