Separate emoji pack file lists in a different file

The file should be in the same directory as the manifest file
This commit is contained in:
Ekaterina Vaartis 2019-04-18 15:32:18 +03:00
parent 21b39c54a3
commit af5494f942

View File

@ -55,8 +55,9 @@ defmodule Mix.Tasks.Pleroma.Emoji do
{options, pack_names, []} = parse_global_opts(args) {options, pack_names, []} = parse_global_opts(args)
manifest = manifest_url = if options[:manifest], do: options[:manifest], else: @default_manifest
fetch_manifest(if options[:manifest], do: options[:manifest], else: @default_manifest)
manifest = fetch_manifest(manifest_url)
for pack_name <- pack_names do for pack_name <- pack_names do
if Map.has_key?(manifest, pack_name) do if Map.has_key?(manifest, pack_name) do
@ -77,6 +78,23 @@ defmodule Mix.Tasks.Pleroma.Emoji do
binary_archive = Tesla.get!(src_url).body binary_archive = Tesla.get!(src_url).body
# The url specified in files should be in the same directory
files_url = Path.join(Path.dirname(manifest_url), pack["files"])
IO.puts(
IO.ANSI.format([
"Fetching the file list for ",
:bright,
pack_name,
:normal,
" from ",
:underline,
files_url
])
)
files = Tesla.get!(files_url).body |> Poison.decode!()
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name])) IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
static_path = Path.join(:code.priv_dir(:pleroma), "static") static_path = Path.join(:code.priv_dir(:pleroma), "static")
@ -91,7 +109,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
files_to_unzip = files_to_unzip =
Enum.map( Enum.map(
pack["files"], files,
fn {_, f} -> to_charlist(f) end fn {_, f} -> to_charlist(f) end
) )
@ -105,7 +123,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
emoji_txt_str = emoji_txt_str =
Enum.map( Enum.map(
pack["files"], files,
fn {shortcode, path} -> fn {shortcode, path} ->
"#{shortcode}, /instance/static/emoji/#{pack_name}/#{path}" "#{shortcode}, /instance/static/emoji/#{pack_name}/#{path}"
end end