diff options
author | kaniini <ariadne@dereferenced.org> | 2019-09-16 07:37:54 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-09-16 07:37:54 +0000 |
commit | d1a84ceec88ddd1bc2538cae8a4b6e72cde4fe6f (patch) | |
tree | 74967e78cb128070531fc349c9dc1edddfc00e62 /lib | |
parent | 74eba5afe20124646366aace98c2e1b106712108 (diff) | |
parent | b4cf74c1067b866574a63fbd25ccb12cc1fed619 (diff) | |
download | pleroma-d1a84ceec88ddd1bc2538cae8a4b6e72cde4fe6f.tar.gz |
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex index f5f9e358c..c06b0a0f2 100644 --- a/lib/pleroma/web/rich_media/parser.ex +++ b/lib/pleroma/web/rich_media/parser.ex @@ -81,6 +81,7 @@ defmodule Pleroma.Web.RichMedia.Parser do {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options) html + |> parse_html |> maybe_parse() |> Map.put(:url, url) |> clean_parsed_data() @@ -91,6 +92,8 @@ defmodule Pleroma.Web.RichMedia.Parser do end end + defp parse_html(html), do: Floki.parse(html) + defp maybe_parse(html) do Enum.reduce_while(parsers(), %{}, fn parser, acc -> case parser.parse(html, acc) do @@ -100,7 +103,8 @@ defmodule Pleroma.Web.RichMedia.Parser do 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 byte_size(title) > 0 do {:ok, data} end |