containers
/
podman-compose
mirror of https://github.com/containers/podman-compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: remove comments and add annotation type

This commit is contained in:
arkhan 2025-07-09 17:15:43 -05:00
parent e26ced5e25
commit 3a39657c66
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
podman_compose.py
View File

@ -3204,7 +3204,6 @@ async def compose_up(compose: PodmanCompose, args: argparse.Namespace) -> int |
max_service_length = 0 max_service_length = 0
for cnt in compose.containers: for cnt in compose.containers:
# Saltar contenedores excluidos
if cnt["_service"] in excluded: if cnt["_service"] in excluded:
continue continue
@ -3212,17 +3211,12 @@ async def compose_up(compose: PodmanCompose, args: argparse.Namespace) -> int |
container_name = cnt["name"] container_name = cnt["name"]
if getattr(args, 'names', False): if getattr(args, 'names', False):
# Con -n: mostrar solo servicio_numero (sin prefijo de proyecto)
expected_name = compose.format_name(service_name, str(cnt["num"])) expected_name = compose.format_name(service_name, str(cnt["num"]))
if container_name == expected_name: if container_name == expected_name:
# Es un nombre generado automáticamente, mostrar solo servicio_numero
display_name = compose.join_name_parts(service_name, str(cnt["num"])) display_name = compose.join_name_parts(service_name, str(cnt["num"]))
else: else:
# Es un container_name personalizado, usarlo tal como está
display_name = container_name display_name = container_name
else: else:
# Sin -n: mostrar nombre completo del contenedor (comportamiento por defecto)
display_name = container_name display_name = container_name
curr_length = len(display_name) curr_length = len(display_name)
@ -3247,30 +3241,21 @@ async def compose_up(compose: PodmanCompose, args: argparse.Namespace) -> int |
loop.add_signal_handler(signal.SIGINT, lambda: asyncio.create_task(handle_sigint())) loop.add_signal_handler(signal.SIGINT, lambda: asyncio.create_task(handle_sigint()))
for i, cnt in enumerate(compose.containers): for i, cnt in enumerate(compose.containers):
# Add colored service prefix to output like docker-compose
color_idx = i % len(compose.console_colors) color_idx = i % len(compose.console_colors)
color = compose.console_colors[color_idx] color = compose.console_colors[color_idx]
# Determinar el nombre a mostrar
service_name = cnt["_service"] service_name = cnt["_service"]
container_name = cnt["name"] container_name = cnt["name"]
if getattr(args, 'names', False): if getattr(args, 'names', False):
# Con -n: mostrar solo servicio_numero (sin prefijo de proyecto)
expected_name = compose.format_name(service_name, str(cnt["num"])) expected_name = compose.format_name(service_name, str(cnt["num"]))
if container_name == expected_name: if container_name == expected_name:
# Es un nombre generado automáticamente, mostrar solo servicio_numero
display_name = compose.join_name_parts(service_name, str(cnt["num"])) display_name = compose.join_name_parts(service_name, str(cnt["num"]))
else: else:
# Es un container_name personalizado, usarlo tal como está
display_name = container_name display_name = container_name
else: else:
# Sin -n: mostrar nombre completo del contenedor (comportamiento por defecto)
display_name = container_name display_name = container_name
# Calcular espacios para alinear el | exactamente
# max_service_length + 1 espacio, menos la longitud del display_name actual
space_suffix = " " * (max_service_length + 1 - len(display_name)) space_suffix = " " * (max_service_length + 1 - len(display_name))
log_formatter = "{}{}{}|\x1b[0m".format(color, display_name, space_suffix) log_formatter = "{}{}{}|\x1b[0m".format(color, display_name, space_suffix)
@ -3646,7 +3631,6 @@ async def compose_logs(compose: PodmanCompose, args: argparse.Namespace) -> None
) )
if should_use_colors: if should_use_colors:
# Calcular la longitud máxima para alineación, igual que en compose_up
max_service_length = 0 max_service_length = 0
for target in targets: for target in targets:
cnt = compose.container_by_name[target] cnt = compose.container_by_name[target]
@ -3654,17 +3638,13 @@ async def compose_logs(compose: PodmanCompose, args: argparse.Namespace) -> None
container_name = cnt["name"] container_name = cnt["name"]
if getattr(args, 'names', False): if getattr(args, 'names', False):
# Con -n: mostrar solo servicio_numero (sin prefijo de proyecto)
expected_name = compose.format_name(service_name, str(cnt["num"])) expected_name = compose.format_name(service_name, str(cnt["num"]))
if container_name == expected_name: if container_name == expected_name:
# Es un nombre generado automáticamente, mostrar solo servicio_numero
display_name = compose.join_name_parts(service_name, str(cnt["num"])) display_name = compose.join_name_parts(service_name, str(cnt["num"]))
else: else:
# Es un container_name personalizado, usarlo tal como está
display_name = container_name display_name = container_name
else: else:
# Sin -n: mostrar nombre completo del contenedor (comportamiento por defecto)
display_name = container_name display_name = container_name
curr_length = len(display_name) curr_length = len(display_name)
@ -3673,37 +3653,28 @@ async def compose_logs(compose: PodmanCompose, args: argparse.Namespace) -> None
) )
tasks = [] tasks = []
service_colors = {} service_colors: dict[str, str] = {}
for target in targets: for target in targets:
cnt = compose.container_by_name[target] cnt = compose.container_by_name[target]
service_name = cnt["_service"] service_name = cnt["_service"]
container_name = cnt["name"] container_name = cnt["name"]
# Aplicar la misma lógica de display_name que en compose_up
if getattr(args, 'names', False): if getattr(args, 'names', False):
# Con -n: mostrar solo servicio_numero (sin prefijo de proyecto)
expected_name = compose.format_name(service_name, str(cnt["num"])) expected_name = compose.format_name(service_name, str(cnt["num"]))
if container_name == expected_name: if container_name == expected_name:
# Es un nombre generado automáticamente, mostrar solo servicio_numero
display_name = compose.join_name_parts(service_name, str(cnt["num"])) display_name = compose.join_name_parts(service_name, str(cnt["num"]))
else: else:
# Es un container_name personalizado, usarlo tal como está
display_name = container_name display_name = container_name
else: else:
# Sin -n: mostrar nombre completo del contenedor (comportamiento por defecto)
display_name = container_name display_name = container_name
# Asignar color por servicio (no por contenedor individual)
if service_name not in service_colors: if service_name not in service_colors:
color_idx = len(service_colors) % len(compose.console_colors) color_idx = len(service_colors) % len(compose.console_colors)
service_colors[service_name] = compose.console_colors[color_idx] service_colors[service_name] = compose.console_colors[color_idx]
color = service_colors[service_name] color = service_colors[service_name]
# Calcular espacios para alinear el | exactamente, igual que en compose_up
# max_service_length + 1 espacio, menos la longitud del display_name actual
space_suffix = " " * (max_service_length + 1 - len(display_name)) space_suffix = " " * (max_service_length + 1 - len(display_name))
log_formatter = "{}{}{}|\x1b[0m".format(color, display_name, space_suffix) log_formatter = "{}{}{}|\x1b[0m".format(color, display_name, space_suffix)