hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only calculate SHA when there's no pack json

Browse source
This commit is contained in:
Ekaterina Vaartis 2025-08-07 11:22:51 +03:00
commit 8d0b29d718
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/emoji/pack.ex
View file

@ -252,9 +252,6 @@ defmodule Pleroma.Emoji.Pack do
{_, {:ok, _}} <- {_, {:ok, _}} <-
{"Could not unzip pack", {"Could not unzip pack",
:zip.unzip(binary_archive, cwd: String.to_charlist(pack_path))} do :zip.unzip(binary_archive, cwd: String.to_charlist(pack_path))} do
# Get the pack SHA
archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
pack_json_path = Path.join([pack_path, "pack.json"]) pack_json_path = Path.join([pack_path, "pack.json"])
# Make a json if it does not exist # Make a json if it does not exist
if not File.exists?(pack_json_path) do if not File.exists?(pack_json_path) do
@ -265,6 +262,9 @@ defmodule Pleroma.Emoji.Pack do
Map.get(opts, :exts, [".png", ".gif", ".jpg"]) Map.get(opts, :exts, [".png", ".gif", ".jpg"])
) )
# Calculate the pack SHA. Only needed when there's no pack.json, as it would already include a hash
archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
pack_json = %{ pack_json = %{
pack: %{ pack: %{
license: Map.get(opts, :license, ""), license: Map.get(opts, :license, ""),