mirror of
https://github.com/wizarrrr/wizarr.git
synced 2026-07-31 15:27:35 -04:00
1723e876b6
- Updated `InvitationCreateRequest` model to change `server_ids` from required to optional with improved description. - Enhanced `library_model` to include `external_id`, `server_name`, and `enabled` fields. - Modified `InvitationFlowManager` to prioritize new many-to-many relationship checks for invitations. - Created a new migration file to merge branches related to API key and foreign key improvements. - Added comprehensive tests for API endpoints, including status, users, invitations, libraries, servers, and API key management. - Implemented error handling tests for malformed JSON and inactive API keys.
101 lines
3.2 KiB
Python
101 lines
3.2 KiB
Python
"""Service for resolving server names for invitations.
|
|
|
|
This module handles the logic for determining what name to display in invitations,
|
|
falling back from global Display Name to actual server names when needed.
|
|
"""
|
|
|
|
from app.models import MediaServer, Settings
|
|
|
|
|
|
def resolve_invitation_server_name(servers: list[MediaServer]) -> str:
|
|
"""
|
|
Resolve the server name to display for an invitation.
|
|
|
|
Priority:
|
|
1. Global "Display Name" setting (if set and not default)
|
|
2. Actual server name(s) from the invitation
|
|
- Single server: "Server Name"
|
|
- Multiple servers: "Server 1, Server 2, Server 3"
|
|
|
|
Args:
|
|
servers: List of MediaServer instances associated with the invitation
|
|
|
|
Returns:
|
|
str: The resolved server name to display
|
|
"""
|
|
# Check if there's a global Display Name setting
|
|
display_name_setting = Settings.query.filter_by(key="server_name").first()
|
|
|
|
if (
|
|
display_name_setting
|
|
and display_name_setting.value
|
|
and display_name_setting.value.strip()
|
|
and display_name_setting.value != "Wizarr"
|
|
):
|
|
# If there's a non-empty Display Name setting and it's not the default "Wizarr",
|
|
# use it (this preserves the existing behavior when explicitly set)
|
|
return display_name_setting.value
|
|
|
|
# Fall back to actual server name(s)
|
|
if not servers:
|
|
return "Unknown Server"
|
|
|
|
if len(servers) == 1:
|
|
# Single server: use its name
|
|
return servers[0].name
|
|
|
|
# Multiple servers: list all names
|
|
server_names = [server.name for server in servers]
|
|
return ", ".join(server_names)
|
|
|
|
|
|
def get_server_names_for_api(servers: list[MediaServer]) -> list[str]:
|
|
"""
|
|
Get a list of server names for API responses.
|
|
|
|
Args:
|
|
servers: List of MediaServer instances
|
|
|
|
Returns:
|
|
List[str]: List of server names
|
|
"""
|
|
return [server.name for server in servers] if servers else []
|
|
|
|
|
|
def get_display_name_info(servers: list[MediaServer]) -> dict:
|
|
"""
|
|
Get comprehensive display name information for API responses.
|
|
|
|
Args:
|
|
servers: List of MediaServer instances associated with the invitation
|
|
|
|
Returns:
|
|
dict: Information about display names including:
|
|
- display_name: The resolved display name to show
|
|
- server_names: List of individual server names
|
|
- uses_global_setting: Whether global setting is being used
|
|
- global_setting_value: Current global setting value
|
|
"""
|
|
display_name_setting = Settings.query.filter_by(key="server_name").first()
|
|
global_setting_value = display_name_setting.value if display_name_setting else None
|
|
|
|
# Check if we're using the global setting
|
|
uses_global_setting = bool(
|
|
global_setting_value
|
|
and global_setting_value.strip()
|
|
and global_setting_value != "Wizarr"
|
|
)
|
|
|
|
# Get the resolved display name
|
|
display_name = resolve_invitation_server_name(servers)
|
|
|
|
# Get individual server names
|
|
server_names = get_server_names_for_api(servers)
|
|
|
|
return {
|
|
"display_name": display_name,
|
|
"server_names": server_names,
|
|
"uses_global_setting": uses_global_setting,
|
|
"global_setting_value": global_setting_value,
|
|
}
|