LibWeb+Base: Use AK::SourceGenerator for error pages

Instead of storing a format string in a file, let's be reasonable and use SourceGenerator's template functionality. :^)
abyesilyurt · Apr 21, 2021 · 3857148 · 3857148
1 parent edf0b14
commit 3857148
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Base/res/html/error.html b/Base/res/html/error.html
@@ -14,8 +14,8 @@
  <body>
  <header>
  <img src="file:https:///res/icons/32x32/msgbox-warning.png" alt="Warning" width="24" height="24">
- <h1>Failed to load {}</h1>
+ <h1>Failed to load @failed_url@</h1>
  </header>
- <p>Error: {}</p>
+ <p>Error: @error@</p>
  </body>
 </html>
diff --git a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
@@ -26,6 +26,7 @@
 
 #include <AK/Debug.h>
 #include <AK/LexicalPath.h>
+#include <AK/SourceGenerator.h>
 #include <LibGemini/Document.h>
 #include <LibGfx/ImageDecoder.h>
 #include <LibMarkdown/Document.h>
@@ -226,13 +227,12 @@ void FrameLoader::load_error_page(const URL& failed_url, const String& error)
  error_page_url,
  [this, failed_url, error](auto data, auto&, auto) {
  VERIFY(!data.is_null());
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- auto html = String::formatted(
- data,
- escape_html_entities(failed_url.to_string()),
- escape_html_entities(error));
-#pragma GCC diagnostic pop
- auto document = HTML::parse_html_document(html, failed_url, "utf-8");
+ StringBuilder builder;
+ SourceGenerator generator { builder };
+ generator.set("failed_url", failed_url.to_string());
+ generator.set("error", error);
+ generator.append(data);
+ auto document = HTML::parse_html_document(generator.as_string_view(), failed_url, "utf-8");
  VERIFY(document);
  frame().set_document(document);
  },