Skip to content

Commit

Permalink
Fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tenfire committed Mar 15, 2024
1 parent ee9e967 commit d15b00a
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 9 deletions.
30 changes: 24 additions & 6 deletions music_assistant/server/providers/plex/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

import asyncio
import logging
import requests
from asyncio import TaskGroup
from typing import TYPE_CHECKING, Any

import plexapi.exceptions
import requests
from aiohttp import ClientTimeout
from plexapi.audio import Album as PlexAlbum
from plexapi.audio import Artist as PlexArtist
Expand Down Expand Up @@ -117,7 +117,9 @@ async def get_config_entries(
values[CONF_LOCAL_SERVER_IP] = "Discovery failed, please add IP manually"
values[CONF_LOCAL_SERVER_PORT] = "Discovery failed, please add Port manually"
values[CONF_LOCAL_SERVER_SSL] = "Discovery failed, please set SSL manually"
values[CONF_LOCAL_SERVER_VERIFY_CERT] = "Discovery failed, please set Verify certificate manually"
values[CONF_LOCAL_SERVER_VERIFY_CERT] = (
"Discovery failed, please set " "Verify certificate manually"
)
else:
values[CONF_LOCAL_SERVER_IP] = server_details[0]
values[CONF_LOCAL_SERVER_PORT] = server_details[1]
Expand Down Expand Up @@ -154,7 +156,16 @@ async def get_config_entries(
server_http_port = values.get(CONF_LOCAL_SERVER_PORT)
server_http_ssl = values.get(CONF_LOCAL_SERVER_SSL)
server_http_verify_cert = values.get(CONF_LOCAL_SERVER_VERIFY_CERT)
if not (libraries := await get_libraries(mass, token, server_http_ssl, server_http_ip, server_http_port, server_http_verify_cert)):
if not (
libraries := await get_libraries(
mass,
token,
server_http_ssl,
server_http_ip,
server_http_port,
server_http_verify_cert,
)
):
msg = "Unable to retrieve Servers and/or Music Libraries"
raise LoginFailed(msg)
conf_libraries.options = tuple(
Expand Down Expand Up @@ -234,11 +245,18 @@ async def handle_async_init(self) -> None:
def connect() -> PlexServer:
try:
session = requests.Session()
session.verify = self.config.get_value(CONF_LOCAL_SERVER_VERIFY_CERT) if self.config.get_value(CONF_LOCAL_SERVER_SSL) else False
local_server_protocol = "https" if self.config.get_value(CONF_LOCAL_SERVER_SSL) else "http"
session.verify = (
self.config.get_value(CONF_LOCAL_SERVER_VERIFY_CERT)
if self.config.get_value(CONF_LOCAL_SERVER_SSL)
else False
)
local_server_protocol = (
"https" if self.config.get_value(CONF_LOCAL_SERVER_SSL) else "http"
)
plex_server = PlexServer(
f"{local_server_protocol}://{self.config.get_value(CONF_LOCAL_SERVER_IP)}:{self.config.get_value(CONF_LOCAL_SERVER_PORT)}",
token=self.config.get_value(CONF_AUTH_TOKEN), session=session,
token=self.config.get_value(CONF_AUTH_TOKEN),
session=session,
)
except plexapi.exceptions.BadRequest as err:
if "Invalid token" in str(err):
Expand Down
13 changes: 10 additions & 3 deletions music_assistant/server/providers/plex/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from __future__ import annotations

import asyncio
import requests
from typing import TYPE_CHECKING

import requests
from plexapi.gdm import GDM
from plexapi.library import LibrarySection as PlexLibrarySection
from plexapi.library import MusicSection as PlexMusicSection
Expand All @@ -16,7 +16,12 @@


async def get_libraries(
mass: MusicAssistant, auth_token: str, local_server_ssl: bool, local_server_ip: str, local_server_port: str, local_server_verify_cert: bool
mass: MusicAssistant,
auth_token: str,
local_server_ssl: bool,
local_server_ip: str,
local_server_port: str,
local_server_verify_cert: bool,
) -> list[str]:
"""
Get all music libraries for all plex servers.
Expand All @@ -32,7 +37,9 @@ def _get_libraries():
session.verify = local_server_verify_cert
local_server_protocol = "https" if local_server_ssl else "http"
plex_server: PlexServer = PlexServer(
f"{local_server_protocol}://{local_server_ip}:{local_server_port}", auth_token, session=session
f"{local_server_protocol}://{local_server_ip}:{local_server_port}",
auth_token,
session=session,
)
for media_section in plex_server.library.sections():
media_section: PlexLibrarySection
Expand Down

0 comments on commit d15b00a

Please sign in to comment.