Fixes

Author: ericmj

lib/diff_web/live/components/diff_component.ex

@@ -76,7 +76,7 @@ defmodule DiffWeb.DiffComponent do
   defp line_id(diff, line) do
     hash = :erlang.phash2({diff.from, diff.to})
     ln = "-#{line.from_line_number}-#{line.to_line_number}"
-    [to_string(hash), ln]
+    "#{hash}#{ln}"
   end
 
   defp line_type(line), do: to_string(line.type)

lib/diff_web/live/diff_live_view.ex

@@ -227,7 +227,7 @@ defmodule DiffWeb.DiffLiveView do
 
             diff_data =
               Jason.encode!(%{
-                "diff" => DiffWeb.LiveView.sanitize_utf8(raw_diff),
+                "diff" => sanitize_utf8(raw_diff),
                 "path_from" => path_from,
                 "path_to" => path_to
               })
@@ -336,4 +336,45 @@ defmodule DiffWeb.DiffLiveView do
   end
 
   defp build_url(app, from, to), do: "/diff/#{app}/#{from}..#{to}"
+
+  # UTF-8 sanitization functions
+  defp sanitize_utf8(content) when is_binary(content) do
+    case String.valid?(content) do
+      true ->
+        content
+
+      false ->
+        # Multiple fallback strategies for invalid UTF-8
+        content
+        |> sanitize_invalid_bytes()
+    end
+  end
+
+  defp sanitize_utf8(content), do: content
+
+  defp sanitize_invalid_bytes(content) do
+    # Try different encoding conversions and fallbacks
+    cond do
+      # Try converting from Latin-1/ISO-8859-1 encoding
+      latin1_result = safe_unicode_convert(content, :latin1, :utf8) ->
+        latin1_result
+
+      # Last resort: replace invalid bytes with replacement character
+      true ->
+        content
+        |> :binary.bin_to_list()
+        # Replace high bytes with '?'
+        |> Enum.map(fn byte -> if byte > 127, do: 63, else: byte end)
+        |> :binary.list_to_bin()
+    end
+  end
+
+  defp safe_unicode_convert(content, from, to) do
+    case :unicode.characters_to_binary(content, from, to) do
+      result when is_binary(result) -> result
+      _ -> nil
+    end
+  rescue
+    _ -> nil
+  end
 end

lib/diff_web/live/search_view.ex

@@ -2,7 +2,60 @@ defmodule DiffWeb.SearchLiveView do
   use DiffWeb, :live_view
 
   def render(assigns) do
-    DiffWeb.SearchView.render("search.html", assigns)
+    ~H"""
+    <div class="search-area">
+      <form phx-change="search" phx-submit="go" class="search-form">
+        <input
+          autocomplete="off"
+          autofocus
+          class="search-input"
+          type="text"
+          name="q"
+          value={@query}
+          placeholder="Search..."
+        />
+        <div class="suggestions">
+          <%= if length(@suggestions) > 0 do %>
+            Did you mean:
+            <%= for suggestion <- @suggestions do %>
+              <span class="suggestion" phx-click={"search_#{suggestion}"} onclick=""><%= suggestion %></span>
+            <% end %>
+          <% end %>
+        </div>
+      </form>
+      <%= if length(@releases) == 1 do %>
+        The package only has one version so there's nothing to diff with.
+      <% else %>
+        <%= if @result do %>
+          <form phx-change="select_version" class="version-form">
+            <div class="version-area">
+              <div class="select-area">
+                <label for="from">From</label>
+                <select name="from">
+                  <%= for release_from <- @from_releases do %>
+                    <option selected={selected(@from, release_from)} value={release_from}><%= release_from %></option>
+                  <% end %>
+                </select>
+                <label for="to">To</label>
+                <select name="to">
+                  <%= for release_to <- @to_releases do %>
+                    <option selected={selected(@to, release_to)} value={release_to}><%= release_to %></option>
+                  <% end %>
+                </select>
+              </div>
+              <button
+                class="diff-button"
+                type="button"
+                disabled={disabled([@from, @to])}
+                phx-click="go"
+              >Diff</button>
+            </div>
+          </form>
+        <% end %>
+      <% end %>
+      <%= @not_found %>
+    </div>
+    """
   end
 
   def mount(_params, _session, socket) do
@@ -110,6 +163,16 @@ defmodule DiffWeb.SearchLiveView do
 
   defp build_url(app, from, to), do: "/diff/#{app}/#{from}..#{to}"
 
+  # Helper functions for template
+  defp disabled(things) when is_list(things) do
+    Enum.any?(things, &(!&1))
+  end
+
+  defp disabled(thing), do: disabled([thing])
+
+  defp selected(x, x), do: true
+  defp selected(_, _), do: false
+
   defp get_suggestions(query, number) do
     package_names = Diff.Package.Store.get_names()
     starts_with = package_starts_with(package_names, query)

lib/diff_web/templates/search/search.html.leex

@@ -8,10 +8,8 @@ defmodule DiffWeb.LiveView do
         # Parse the stored content based on format
         case Jason.decode(raw_content) do
           {:ok, %{"type" => "too_large", "file" => file_path}} ->
-            rendered = DiffWeb.TooLargeComponent.render(%{file: file_path})
-
-            rendered.static
-            |> Enum.zip_with(rendered.dynamic.(true), fn static, dynamic -> [static, dynamic] end)
+            DiffWeb.TooLargeComponent.render(%{file: file_path})
+            |> Phoenix.HTML.Safe.to_iodata()
             |> IO.iodata_to_binary()
             |> sanitize_utf8()
 
@@ -24,12 +22,8 @@ defmodule DiffWeb.LiveView do
                 # Take the first diff (should only be one per file)
                 diff = List.first(diffs)
 
-                rendered = DiffWeb.DiffComponent.render(%{diff: diff})
-
-                rendered.static
-                |> Enum.zip_with(rendered.dynamic.(true), fn static, dynamic ->
-                  [static, dynamic]
-                end)
+                DiffWeb.DiffComponent.render(%{diff: diff})
+                |> Phoenix.HTML.Safe.to_iodata()
                 |> IO.iodata_to_binary()
                 |> sanitize_utf8()
 
@@ -44,7 +38,7 @@ defmodule DiffWeb.LiveView do
     end
   end
 
-  def sanitize_utf8(content) when is_binary(content) do
+  defp sanitize_utf8(content) when is_binary(content) do
     case String.valid?(content) do
       true ->
         content
@@ -55,7 +49,7 @@ defmodule DiffWeb.LiveView do
     end
   end
 
-  def sanitize_utf8(content), do: content
+  defp sanitize_utf8(content), do: content
 
   defp sanitize_invalid_bytes(content) do
     # Try different encoding conversions and fallbacks

lib/diff_web/views/live_view.ex

@@ -45,6 +45,16 @@ defmodule Diff.Storage.LocalTest do
         assert :ok = Local.put_diff("phoenix", "1.4.5", "1.4.9", diff_id, content)
       end
 
+      # Store metadata (required for list_diffs to work)
+      metadata = %{
+        total_diffs: 3,
+        total_additions: 10,
+        total_deletions: 5,
+        files_changed: 3
+      }
+
+      assert :ok = Local.put_metadata("phoenix", "1.4.5", "1.4.9", metadata)
+
       # List diffs
       assert {:ok, diff_ids} = Local.list_diffs("phoenix", "1.4.5", "1.4.9")
       assert Enum.sort(diff_ids) == ["diff-0", "diff-1", "diff-2"]

lib/diff_web/views/search_view.ex

@@ -42,9 +42,9 @@ defmodule DiffWeb.SearchLiveViewTest do
       send(view.pid, {:search, "phoenix"})
       rendered = render(view)
       assert rendered =~ ~s(<select name="from")
-      assert rendered =~ ~s(<option selected="selected" value="1.4.10">1.4.10</option>)
+      assert rendered =~ ~s(<option selected="" value="1.4.10">1.4.10</option>)
       assert rendered =~ ~s(<select name="to")
-      assert rendered =~ ~s(<option selected="selected" value="1.4.11">1.4.11</option>)
+      assert rendered =~ ~s(<option selected="" value="1.4.11">1.4.11</option>)
       assert rendered =~ ~s(Did you mean:)
 
       assert rendered =~