sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fallback can't have pack.json, reflect that in code

Browse Source 
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
This commit is contained in:
Ekaterina Vaartis 2019-08-15 11:46:03 +03:00
parent 2a94eca096
commit b78973d27f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/emoji_api/emoji_api_controller.ex
View File

@ -184,20 +184,20 @@ def download_from(conn, %{"instance_address" => address, "pack_name" => name} =
pack_dir = Path.join(@emoji_dir_path, local_name) pack_dir = Path.join(@emoji_dir_path, local_name)
File.mkdir_p!(pack_dir) File.mkdir_p!(pack_dir)
# Fallback cannot contain a pack.json file
files = files =
['pack.json'] ++ unless(pinfo[:fallback], do: ['pack.json'], else: []) ++
(pfiles |> Enum.map(fn {_, path} -> to_charlist(path) end)) (pfiles |> Enum.map(fn {_, path} -> to_charlist(path) end))
{:ok, _} = :zip.unzip(emoji_archive, cwd: to_charlist(pack_dir), file_list: files) {:ok, _} = :zip.unzip(emoji_archive, cwd: to_charlist(pack_dir), file_list: files)
# Fallback URL might not contain a pack.json file. Put on we have if there's none # Fallback can't contain a pack.json file, since that would cause the fallback-src-sha256
# in it to depend on itself
if pinfo[:fallback] do if pinfo[:fallback] do
pack_file_path = Path.join(pack_dir, "pack.json") pack_file_path = Path.join(pack_dir, "pack.json")
unless File.exists?(pack_file_path) do
File.write!(pack_file_path, Jason.encode!(full_pack)) File.write!(pack_file_path, Jason.encode!(full_pack))
end end
end
conn |> text("ok") conn |> text("ok")
else else