from_json should not recognize empty strings as a match

helldivers-2 · Mar 3, 2024 · 2797595 · 2797595
1 parent df221ff
commit 2797595
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/helldivers_2/macros/from_json.ex b/lib/helldivers_2/macros/from_json.ex
@@ -15,8 +15,14 @@ defmodule Helldivers2.Macros.FromJson do
       |> Jason.decode!()
 
     for {key, value} <- mappings do
-      quote do
-        defp lookup("#{unquote(key)}"), do: unquote(value)
+      if String.length(value) > 0 do
+        quote do
+          defp lookup("#{unquote(key)}"), do: unquote(value)
+        end
+      else
+        quote do
+          defp lookup("#{unquote(key)}"), do: unquote(key)
+        end
       end
     end ++
       [

diff --git a/lib/helldivers_2/models/war_info/sector.ex b/lib/helldivers_2/models/war_info/sector.ex
@@ -9,5 +9,5 @@ defmodule Helldivers2.Models.WarInfo.Sector do
   @spec parse(non_neg_integer() | String.t()) :: t()
   def parse(index) when is_number(index), do: parse(to_string(index))
   def parse(name), do: lookup(name)
-  defp lookup(_), do: "Unknown"
+  defp lookup(index), do: index
 end