Swap TOML for YAML to get YAML generation for packs from fallbacks
If fallback url doesn't have a pack.yml file, one from the source will be used
This commit is contained in:
Ekaterina Vaartis
parent
b791a08656
commit
54b8e683bc
@ -143,12 +143,12 @@ defmodule Pleroma.Emoji do
|
||||
defp load_pack(pack_dir, emoji_groups) do
|
||||
pack_name = Path.basename(pack_dir)
|
||||
|
||||
pack_toml = Path.join(pack_dir, "pack.toml")
|
||||
pack_yaml = Path.join(pack_dir, "pack.yml")
|
||||
|
||||
if File.exists?(pack_toml) do
|
||||
toml = Toml.decode_file!(pack_toml)
|
||||
if File.exists?(pack_yaml) do
|
||||
yaml = RelaxYaml.Decoder.read_from_file(pack_yaml)
|
||||
|
||||
toml["files"]
|
||||
yaml["files"]
|
||||
|> Enum.map(fn {name, rel_file} ->
|
||||
filename = Path.join("/emoji/#{pack_name}", rel_file)
|
||||
{name, filename, pack_name}
|
||||
|
||||
@ -22,14 +22,14 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIController do
|
||||
results
|
||||
|> Enum.filter(fn file ->
|
||||
dir_path = Path.join(@emoji_dir_path, file)
|
||||
# Filter to only use the pack.toml packs
|
||||
File.dir?(dir_path) and File.exists?(Path.join(dir_path, "pack.toml"))
|
||||
# Filter to only use the pack.yml packs
|
||||
File.dir?(dir_path) and File.exists?(Path.join(dir_path, "pack.yml"))
|
||||
end)
|
||||
|> Enum.map(fn pack_name ->
|
||||
pack_path = Path.join(@emoji_dir_path, pack_name)
|
||||
pack_file = Path.join(pack_path, "pack.toml")
|
||||
pack_file = Path.join(pack_path, "pack.yml")
|
||||
|
||||
{pack_name, Toml.decode_file!(pack_file)}
|
||||
{pack_name, RelaxYaml.Decoder.read_from_file(pack_file)}
|
||||
end)
|
||||
# Transform into a map of pack-name => pack-data
|
||||
# Check if all the files are in place and can be sent
|
||||
@ -62,7 +62,7 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIController do
|
||||
|
||||
defp make_archive(name, pack, pack_dir) do
|
||||
files =
|
||||
['pack.toml'] ++
|
||||
['pack.yml'] ++
|
||||
(pack["files"] |> Enum.map(fn {_, path} -> to_charlist(path) end))
|
||||
|
||||
{:ok, {_, zip_result}} = :zip.zip('#{name}.zip', files, [:memory, cwd: to_charlist(pack_dir)])
|
||||
@ -72,10 +72,10 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIController do
|
||||
|
||||
def download_shared(conn, %{"name" => name}) do
|
||||
pack_dir = Path.join(@emoji_dir_path, name)
|
||||
pack_toml = Path.join(pack_dir, "pack.toml")
|
||||
pack_yaml = Path.join(pack_dir, "pack.yml")
|
||||
|
||||
if File.exists?(pack_toml) do
|
||||
pack = Toml.decode_file!(pack_toml)
|
||||
if File.exists?(pack_yaml) do
|
||||
pack = RelaxYaml.Decoder.read_from_file(pack_yaml)
|
||||
|
||||
if can_download?(pack, pack_dir) do
|
||||
zip_result = make_archive(name, pack, pack_dir)
|
||||
@ -139,25 +139,21 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIController do
|
||||
File.mkdir_p!(pack_dir)
|
||||
|
||||
files =
|
||||
['pack.toml'] ++
|
||||
['pack.yml'] ++
|
||||
(pfiles |> Enum.map(fn {_, path} -> to_charlist(path) end))
|
||||
|
||||
{:ok, _} = :zip.unzip(emoji_archive, cwd: to_charlist(pack_dir), file_list: files)
|
||||
|
||||
# Fallback URL might not contain a pack.toml file, if that happens - fail (for now)
|
||||
# FIXME: there seems to be a lack of any kind of encoders besides JSON.
|
||||
erres =
|
||||
if pinfo[:fallback] do
|
||||
toml_path = Path.join(pack_dir, "pack.toml")
|
||||
# Fallback URL might not contain a pack.yml file. Put on we have if there's none
|
||||
if pinfo[:fallback] do
|
||||
yaml_path = Path.join(pack_dir, "pack.yml")
|
||||
|
||||
unless File.exists?(toml_path) do
|
||||
conn
|
||||
|> put_status(:internal_server_error)
|
||||
|> text("No pack.toml in falblack source")
|
||||
end
|
||||
unless File.exists?(yaml_path) do
|
||||
File.write!(yaml_path, RelaxYaml.Encoder.encode(full_pack, []))
|
||||
end
|
||||
end
|
||||
|
||||
if not is_nil(erres), do: erres, else: conn |> text("ok")
|
||||
conn |> text("ok")
|
||||
else
|
||||
conn
|
||||
|> put_status(:internal_server_error)
|
||||
|
||||
@ -225,7 +225,6 @@ defmodule Pleroma.Web.Router do
|
||||
# Pack info / downloading
|
||||
get("/list", EmojiAPIController, :list_packs)
|
||||
get("/download_shared/:name", EmojiAPIController, :download_shared)
|
||||
get("/sha_of_shared/:name", EmojiAPIController, :sha_of_shared)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
2
mix.exs
2
mix.exs
@ -157,7 +157,7 @@ defmodule Pleroma.Mixfile do
|
||||
{:ex_rated, "~> 1.3"},
|
||||
{:ex_const, "~> 0.2"},
|
||||
{:plug_static_index_html, "~> 1.0.0"},
|
||||
{:toml, "~> 0.5"},
|
||||
{:relax_yaml, "~> 0.1"},
|
||||
{:excoveralls, "~> 0.11.1", only: :test},
|
||||
{:mox, "~> 0.5", only: :test}
|
||||
] ++ oauth_deps()
|
||||
|
||||
3
mix.lock
3
mix.lock
@ -84,6 +84,7 @@
|
||||
"quantum": {:hex, :quantum, "2.3.4", "72a0e8855e2adc101459eac8454787cb74ab4169de6ca50f670e72142d4960e9", [:mix], [{:calendar, "~> 0.17", [hex: :calendar, repo: "hexpm", optional: true]}, {:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.12", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:swarm, "~> 3.3", [hex: :swarm, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: true]}], "hexpm"},
|
||||
"ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"},
|
||||
"recon": {:git, "https://github.com/ferd/recon.git", "75d70c7c08926d2f24f1ee6de14ee50fe8a52763", [tag: "2.4.0"]},
|
||||
"relax_yaml": {:hex, :relax_yaml, "0.1.4", "99e55ae80b3bd1135f4288e1ba77b816ad7de05bcb4618a1a9f983ce7c89ff32", [:mix], [{:yamerl, "~> 0.4.0", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"},
|
||||
"swarm": {:hex, :swarm, "3.4.0", "64f8b30055d74640d2186c66354b33b999438692a91be275bb89cdc7e401f448", [:mix], [{:gen_state_machine, "~> 2.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:libring, "~> 1.0", [hex: :libring, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"sweet_xml": {:hex, :sweet_xml, "0.6.6", "fc3e91ec5dd7c787b6195757fbcf0abc670cee1e4172687b45183032221b66b8", [:mix], [], "hexpm"},
|
||||
@ -92,7 +93,6 @@
|
||||
"telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"},
|
||||
"tesla": {:hex, :tesla, "1.3.0", "f35d72f029e608f9cdc6f6d6fcc7c66cf6d6512a70cfef9206b21b8bd0203a30", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 0.4", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.3", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
|
||||
"timex": {:hex, :timex, "3.6.1", "efdf56d0e67a6b956cc57774353b0329c8ab7726766a11547e529357ffdc1d56", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5 or ~> 1.0.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"toml": {:hex, :toml, "0.5.2", "e471388a8726d1ce51a6b32f864b8228a1eb8edc907a0edf2bb50eab9321b526", [:mix], [], "hexpm"},
|
||||
"trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"tzdata": {:hex, :tzdata, "0.5.21", "8cbf3607fcce69636c672d5be2bbb08687fe26639a62bdcc283d267277db7cf0", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"ueberauth": {:hex, :ueberauth, "0.6.1", "9e90d3337dddf38b1ca2753aca9b1e53d8a52b890191cdc55240247c89230412", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
@ -100,4 +100,5 @@
|
||||
"unsafe": {:hex, :unsafe, "1.0.1", "a27e1874f72ee49312e0a9ec2e0b27924214a05e3ddac90e91727bc76f8613d8", [:mix], [], "hexpm"},
|
||||
"web_push_encryption": {:hex, :web_push_encryption, "0.2.1", "d42cecf73420d9dc0053ba3299cc8c8d6ff2be2487d67ca2a57265868e4d9a98", [:mix], [{:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:poison, "~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
|
||||
"websocket_client": {:git, "https://github.com/jeremyong/websocket_client.git", "9a6f65d05ebf2725d62fb19262b21f1805a59fbf", []},
|
||||
"yamerl": {:hex, :yamerl, "0.4.0", "ae215b1242810a9bc07716b88062f1bfe06f6bc7cf68372091f630baa536df79", [:rebar3], [], "hexpm"},
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user