From 5b94d6bdcf1d9c77b2f47d7d28e6876f71ade956 Mon Sep 17 00:00:00 2001 From: Claudio Ortolina Date: Sun, 26 Apr 2026 07:57:40 +0100 Subject: [PATCH] Avoid intermediate variables, and use consistent names --- lib/discogs.ex | 8 ++------ lib/last_fm.ex | 14 ++++---------- lib/open_ai.ex | 8 ++++---- lib/wikipedia.ex | 9 +++++---- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/lib/discogs.ex b/lib/discogs.ex index ccdf0d1b..2ce120e8 100644 --- a/lib/discogs.ex +++ b/lib/discogs.ex @@ -7,16 +7,12 @@ defmodule Discogs do @spec get_artist(integer() | String.t()) :: {:ok, map()} | {:error, term()} def get_artist(id) do - discogs_config = discogs_config() - - API.get_artist(id, discogs_config) + API.get_artist(id, discogs_config()) end @spec get_artist_image(String.t()) :: {:ok, binary()} | {:error, :cover_not_available} def get_artist_image(url) do - discogs_config = discogs_config() - - API.get_artist_image(url, discogs_config) + API.get_artist_image(url, discogs_config()) end defp discogs_config, do: Discogs.Config.resolve(:music_library) diff --git a/lib/last_fm.ex b/lib/last_fm.ex index e242a9a7..c396997f 100644 --- a/lib/last_fm.ex +++ b/lib/last_fm.ex @@ -7,8 +7,7 @@ defmodule LastFm do @spec get_tracks(keyword()) :: {:ok, [Track.t()]} | {:error, term()} def get_tracks(opts) do - last_fm_config = last_fm_config() - API.get_recent_tracks(opts, last_fm_config) + API.get_recent_tracks(opts, last_fm_config()) end @spec get_artist_info(String.t(), String.t()) :: {:ok, LastFm.Artist.t()} | {:error, term()} @@ -69,24 +68,19 @@ defmodule LastFm do @spec get_session(String.t()) :: {:ok, LastFm.Session.t()} | {:error, term()} def get_session(token) do - last_fm_config = last_fm_config() - - API.get_session(token, last_fm_config) + API.get_session(token, last_fm_config()) end @spec scrobble([Scrobble.t()], String.t()) :: {:ok, map()} | {:error, term()} def scrobble(scrobbles, session_key) do - last_fm_config = last_fm_config() - scrobbles |> Enum.map(&Scrobble.encode/1) - |> API.scrobble(session_key, last_fm_config) + |> API.scrobble(session_key, last_fm_config()) end @spec get_profile(String.t()) :: {:ok, String.t()} | {:error, term()} def get_profile(session_key) do - last_fm_config = last_fm_config() - API.get_user_info(session_key, last_fm_config) + API.get_user_info(session_key, last_fm_config()) end @spec auth_url() :: String.t() diff --git a/lib/open_ai.ex b/lib/open_ai.ex index 91fbdc61..4c88a6d3 100644 --- a/lib/open_ai.ex +++ b/lib/open_ai.ex @@ -14,7 +14,7 @@ defmodule OpenAI do @spec gpt(OpenAI.Completion.t()) :: {:ok, map()} | {:error, term()} def gpt(completion) do - API.gpt(completion, config()) + API.gpt(completion, open_ai_config()) end @spec chat_stream([map()], chat_stream_opts()) :: :ok | {:error, term()} @@ -24,7 +24,7 @@ defmodule OpenAI do instructions = Keyword.get(opts, :instructions, "") on_chunk = Keyword.fetch!(opts, :on_chunk) - case API.chat_stream(messages, instructions, model, temperature, config(), on_chunk) do + case API.chat_stream(messages, instructions, model, temperature, open_ai_config(), on_chunk) do :ok -> :ok {:error, _reason} = error -> error end @@ -32,8 +32,8 @@ defmodule OpenAI do @spec embeddings(String.t()) :: {:ok, [float()]} | {:error, term()} def embeddings(text) do - API.get_embeddings(text, config()) + API.get_embeddings(text, open_ai_config()) end - defp config, do: OpenAI.Config.resolve(:music_library) + defp open_ai_config, do: OpenAI.Config.resolve(:music_library) end diff --git a/lib/wikipedia.ex b/lib/wikipedia.ex index e16f5a88..c1aba549 100644 --- a/lib/wikipedia.ex +++ b/lib/wikipedia.ex @@ -7,11 +7,12 @@ defmodule Wikipedia do @spec get_artist_summary(String.t()) :: {:ok, map()} | {:error, :no_english_wikipedia | term()} def get_artist_summary(wikidata_id) do - config = wikipedia_config() + wikipedia_config = wikipedia_config() - with {:ok, title} when not is_nil(title) <- API.get_wikipedia_title(wikidata_id, config), - {:ok, summary} <- API.get_article_summary(title, config), - {:ok, intro_html} <- API.get_article_extract(title, config) do + with {:ok, title} when not is_nil(title) <- + API.get_wikipedia_title(wikidata_id, wikipedia_config), + {:ok, summary} <- API.get_article_summary(title, wikipedia_config), + {:ok, intro_html} <- API.get_article_extract(title, wikipedia_config) do {:ok, Map.put(summary, "intro_html", intro_html)} else {:ok, nil} -> {:error, :no_english_wikipedia}