projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate construction of Rich Media Parser HTTP requests
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
parser.ex
diff --git
a/lib/pleroma/web/rich_media/parser.ex
b/lib/pleroma/web/rich_media/parser.ex
index 40980def8198d134496ed429a3efd494352c4c95..ca592833f3d7574973eb5776126741de3bb42daf 100644
(file)
--- a/
lib/pleroma/web/rich_media/parser.ex
+++ b/
lib/pleroma/web/rich_media/parser.ex
@@
-3,11
+3,6
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Parser do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Parser do
- @options [
- pool: :media,
- max_body: 2_000_000
- ]
-
defp parsers do
Pleroma.Config.get([:rich_media, :parsers])
end
defp parsers do
Pleroma.Config.get([:rich_media, :parsers])
end
@@
-75,23
+70,13
@@
defmodule Pleroma.Web.RichMedia.Parser do
end
defp parse_url(url) do
end
defp parse_url(url) do
- opts =
- if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
- Keyword.merge(@options,
- recv_timeout: 2_000,
- with_body: true
- )
- else
- @options
- end
-
try do
try do
- {:ok, %Tesla.Env{body: html}} = Pleroma.
HTTP.get(url, [], adapter: opts
)
+ {:ok, %Tesla.Env{body: html}} = Pleroma.
Web.RichMedia.Helpers.rich_media_get(url
)
html
|> parse_html()
|> maybe_parse()
html
|> parse_html()
|> maybe_parse()
- |> Map.put(
:url
, url)
+ |> Map.put(
"url"
, url)
|> clean_parsed_data()
|> check_parsed_data()
rescue
|> clean_parsed_data()
|> check_parsed_data()
rescue
@@
-105,14
+90,14
@@
defmodule Pleroma.Web.RichMedia.Parser do
defp maybe_parse(html) do
Enum.reduce_while(parsers(), %{}, fn parser, acc ->
case parser.parse(html, acc) do
defp maybe_parse(html) do
Enum.reduce_while(parsers(), %{}, fn parser, acc ->
case parser.parse(html, acc) do
-
{:ok, data
} -> {:halt, data}
-
{:error, _msg}
-> {:cont, acc}
+
data when data != %{
} -> {:halt, data}
+
_
-> {:cont, acc}
end
end)
end
end
end)
end
- defp check_parsed_data(%{
title:
title} = data)
- when is_binary(title) and
byte_size(title) > 0
do
+ defp check_parsed_data(%{
"title" =>
title} = data)
+ when is_binary(title) and
title != ""
do
{:ok, data}
end
{:ok, data}
end
@@
-123,11
+108,7
@@
defmodule Pleroma.Web.RichMedia.Parser do
defp clean_parsed_data(data) do
data
|> Enum.reject(fn {key, val} ->
defp clean_parsed_data(data) do
data
|> Enum.reject(fn {key, val} ->
- with {:ok, _} <- Jason.encode(%{key => val}) do
- false
- else
- _ -> true
- end
+ not match?({:ok, _}, Jason.encode(%{key => val}))
end)
|> Map.new()
end
end)
|> Map.new()
end