X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Femoji.ex;h=6ef0a635d083ad2788b0cc3afdb69f2bc6f6c9af;hb=8eff05d4c62c4d3300fee173cad84f75a0aafb4d;hp=4fb383b61a13c346dc6a960908d244562f4f0919;hpb=a141f0807bc84868fb84e3d628ab8f99f429d5c0;p=akkoma
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex
index 4fb383b61..6ef0a635d 100644
--- a/lib/mix/tasks/pleroma/emoji.ex
+++ b/lib/mix/tasks/pleroma/emoji.ex
@@ -1,15 +1,12 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Emoji do
use Mix.Task
- @shortdoc "Manages Pleroma instance"
- @moduledoc """
- """
-
- @default_manifest "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
+ @shortdoc "Manages emoji packs"
+ @moduledoc File.read!("docs/administration/CLI_tasks/emoji.md")
def run(["ls-packs" | args]) do
Application.ensure_all_started(:hackney)
@@ -17,7 +14,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
{options, [], []} = parse_global_opts(args)
manifest =
- fetch_manifest(if options[:manifest], do: options[:manifest], else: @default_manifest)
+ fetch_manifest(if options[:manifest], do: options[:manifest], else: default_manifest())
Enum.each(manifest, fn {name, info} ->
to_print = [
@@ -31,6 +28,9 @@ defmodule Mix.Tasks.Pleroma.Emoji do
for {param, value} <- to_print do
IO.puts(IO.ANSI.format([:bright, param, :normal, ": ", value]))
end
+
+ # A newline
+ IO.puts("")
end)
end
@@ -39,7 +39,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
{options, pack_names, []} = parse_global_opts(args)
- manifest_url = if options[:manifest], do: options[:manifest], else: @default_manifest
+ manifest_url = if options[:manifest], do: options[:manifest], else: default_manifest()
manifest = fetch_manifest(manifest_url)
@@ -60,16 +60,17 @@ defmodule Mix.Tasks.Pleroma.Emoji do
])
)
- binary_archive = Tesla.get!(src_url).body
- archive_md5 = :crypto.hash(:md5, binary_archive) |> Base.encode16()
+ binary_archive = Tesla.get!(client(), src_url).body
+ archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
+
+ sha_status_text = ["SHA256 of ", :bright, pack_name, :normal, " source file is ", :bright]
- md5_status_text = ["MD5 of ", :bright, pack_name, :normal, " source file is ", :bright]
- if archive_md5 == String.upcase(pack["src_md5"]) do
- IO.puts(IO.ANSI.format(md5_status_text ++ [:green, "OK"]))
+ if archive_sha == String.upcase(pack["src_sha256"]) do
+ IO.puts(IO.ANSI.format(sha_status_text ++ [:green, "OK"]))
else
- IO.puts(IO.ANSI.format(md5_status_text ++ [:red, "BAD"]))
+ IO.puts(IO.ANSI.format(sha_status_text ++ [:red, "BAD"]))
- raise "Bad MD5 for #{pack_name}"
+ raise "Bad SHA256 for #{pack_name}"
end
# The url specified in files should be in the same directory
@@ -87,15 +88,12 @@ defmodule Mix.Tasks.Pleroma.Emoji do
])
)
- files = Tesla.get!(files_url).body |> Poison.decode!()
+ files = Tesla.get!(client(), files_url).body |> Jason.decode!()
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
- static_path = Path.join(:code.priv_dir(:pleroma), "static")
-
pack_path =
Path.join([
- static_path,
Pleroma.Config.get!([:instance, :static_dir]),
"emoji",
pack_name
@@ -115,14 +113,12 @@ defmodule Mix.Tasks.Pleroma.Emoji do
IO.puts(IO.ANSI.format(["Writing emoji.txt for ", :bright, pack_name]))
- common_pack_path = Path.join([
- "/", Pleroma.Config.get!([:instance, :static_dir]), "emoji", pack_name
- ])
emoji_txt_str =
Enum.map(
files,
fn {shortcode, path} ->
- "#{shortcode}, #{Path.join(common_pack_path, path)}"
+ emojo_path = Path.join("/emoji/#{pack_name}", path)
+ "#{shortcode}, #{emojo_path}"
end
)
|> Enum.join("\n")
@@ -152,20 +148,26 @@ defmodule Mix.Tasks.Pleroma.Emoji do
default_exts = [".png", ".gif"]
default_exts_str = Enum.join(default_exts, " ")
+
exts =
- String.trim(IO.gets("Emoji file extensions (separated with spaces) [#{default_exts_str}]: "))
- exts = if String.length(exts) > 0 do
- String.split(exts, " ") |> Enum.filter(fn e -> (e |> String.trim() |> String.length()) > 0 end)
- else
- default_exts
- end
+ String.trim(
+ IO.gets("Emoji file extensions (separated with spaces) [#{default_exts_str}]: ")
+ )
+
+ exts =
+ if String.length(exts) > 0 do
+ String.split(exts, " ")
+ |> Enum.filter(fn e -> e |> String.trim() |> String.length() > 0 end)
+ else
+ default_exts
+ end
- IO.puts "Downloading the pack and generating MD5"
+ IO.puts("Downloading the pack and generating SHA256")
- binary_archive = Tesla.get!(src).body
- archive_md5 = :crypto.hash(:md5, binary_archive) |> Base.encode16()
+ binary_archive = Tesla.get!(client(), src).body
+ archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
- IO.puts "MD5 is #{archive_md5}"
+ IO.puts("SHA256 is #{archive_sha}")
pack_json = %{
name => %{
@@ -173,35 +175,35 @@ defmodule Mix.Tasks.Pleroma.Emoji do
homepage: homepage,
description: description,
src: src,
- src_md5: archive_md5,
+ src_sha256: archive_sha,
files: files_name
}
}
tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}")
+
{:ok, _} =
:zip.unzip(
binary_archive,
cwd: tmp_pack_dir
)
- emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts)
-
+ emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts)
- File.write!(files_name, Poison.encode!(emoji_map, pretty: true))
+ File.write!(files_name, Jason.encode!(emoji_map, pretty: true))
- IO.puts """
+ IO.puts("""
#{files_name} has been created and contains the list of all found emojis in the pack.
Please review the files in the remove those not needed.
- """
+ """)
if File.exists?("index.json") do
- existing_data = File.read!("index.json") |> Poison.decode!()
+ existing_data = File.read!("index.json") |> Jason.decode!()
File.write!(
"index.json",
- Poison.encode!(
+ Jason.encode!(
Map.merge(
existing_data,
pack_json
@@ -210,17 +212,22 @@ defmodule Mix.Tasks.Pleroma.Emoji do
)
)
- IO.puts "index.json file has been update with the #{name} pack"
+ IO.puts("index.json file has been update with the #{name} pack")
else
- File.write!("index.json", Poison.encode!(pack_json, pretty: true))
+ File.write!("index.json", Jason.encode!(pack_json, pretty: true))
- IO.puts "index.json has been created with the #{name} pack"
+ IO.puts("index.json has been created with the #{name} pack")
end
-
end
defp fetch_manifest(from) do
- Tesla.get!(from).body |> Poison.decode!()
+ Jason.decode!(
+ if String.starts_with?(from, "http") do
+ Tesla.get!(client(), from).body
+ else
+ File.read!(from)
+ end
+ )
end
defp parse_global_opts(args) do
@@ -234,4 +241,14 @@ defmodule Mix.Tasks.Pleroma.Emoji do
]
)
end
+
+ defp client do
+ middleware = [
+ {Tesla.Middleware.FollowRedirects, [max_redirects: 3]}
+ ]
+
+ Tesla.client(middleware)
+ end
+
+ defp default_manifest, do: Pleroma.Config.get!([:emoji, :default_manifest])
end