mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 14:20:58 +00:00
HanifKoh
e68694dbaf
* Percent-Encode Local File URLs for Embedded Web Pages The Home tab, setup wizard, Project tab and other embedded pages were loaded from file:// URLs built by pasting the resources path into a string. A '#', '%' or '?' in the install path was then read as a URL fragment, escape or query, so the pages failed to load, for example a portable install under D:\#OneDrive showed a directory listing instead of the setup wizard. Add file_url_from_path(), built on wxFileSystem::FileNameToURL, and use it wherever a local page or image URL is built from a path. Queries such as ?lang= are appended after the path is encoded. The wizard's printer cover images are passed to the page as file URLs too. * Encode the Login Error Page URL and Cover More Windows Path Forms The login dialog's error page was still loaded from a raw resources path; it now uses file_url_from_path like the other local pages. The Windows file URL tests now also cover a resources path joined with a forward-slash relative path, as the callers build them, and a UNC path. * Build the Flush Dialog Page URLs with the Shared Helper WipingDialog and NozzleListTable still called wxFileSystem::FileNameToURL directly. They now go through file_url_from_path like every other local page, so the URLs are built in one place. Adds a test for a resources directory with a '#' in its name, which the plugin page check did not recognise before.
75 lines
3.3 KiB
C++
75 lines
3.3 KiB
C++
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/generators/catch_generators.hpp>
|
|
|
|
#include "slic3r/GUI/GUI.hpp"
|
|
|
|
#include <boost/filesystem/path.hpp>
|
|
|
|
#include <wx/uri.h>
|
|
|
|
using namespace Slic3r::GUI;
|
|
|
|
#ifndef _WIN32
|
|
TEST_CASE("A file URL keeps characters special to URLs in its path", "[FileUrl]")
|
|
{
|
|
const std::string path = GENERATE(as<std::string>{},
|
|
"/opt/test#dir/resources/web/homepage/index.html",
|
|
"/opt/test%20x/resources/web/homepage/index.html",
|
|
"/opt/Orca Slicer/resources/web/homepage/index.html",
|
|
"/opt/what?/resources/web/homepage/index.html",
|
|
"/home/Jos\xC3\xA9/\xE8\xB5\x84\xE6\xBA\x90/resources/web/homepage/index.html");
|
|
|
|
const wxString url = file_url_from_path(boost::filesystem::path(path));
|
|
CAPTURE(path, url.utf8_string());
|
|
|
|
// WebView::CreateWebView() and WebView::LoadUrl() re-parse the URL before loading it.
|
|
const wxURI uri(wxURI(url).BuildURI());
|
|
CHECK(uri.GetScheme() == "file");
|
|
CHECK(!uri.HasQuery());
|
|
CHECK(!uri.HasFragment());
|
|
CHECK(wxURI::Unescape(uri.GetPath()).utf8_string() == path);
|
|
}
|
|
|
|
TEST_CASE("A file URL of a plain path is the path behind file://", "[FileUrl]")
|
|
{
|
|
const std::string path = "/opt/OrcaSlicer/resources/web/homepage/index.html";
|
|
CHECK(file_url_from_path(boost::filesystem::path(path)) == "file://" + path);
|
|
}
|
|
|
|
TEST_CASE("A query appended to a file URL stays separate from its path", "[FileUrl]")
|
|
{
|
|
const std::string path = "/opt/test#dir%20x/resources/web/guide/0/index.html";
|
|
const wxURI uri(file_url_from_path(boost::filesystem::path(path)) + "?target=21&lang=de");
|
|
CHECK(wxURI::Unescape(uri.GetPath()).utf8_string() == path);
|
|
CHECK(uri.GetQuery() == "target=21&lang=de");
|
|
CHECK(!uri.HasFragment());
|
|
}
|
|
#else
|
|
TEST_CASE("A file URL of a Windows path has a drive letter and forward slashes", "[FileUrl]")
|
|
{
|
|
const auto [path, url] = GENERATE(table<std::wstring, std::string>({
|
|
{ L"C:\\Program Files\\OrcaSlicer\\resources\\web\\homepage\\index.html",
|
|
"file:///C:/Program%20Files/OrcaSlicer/resources/web/homepage/index.html" },
|
|
{ L"D:\\#OneDrive\\OrcaSlicer\\resources\\web\\guide\\0\\index.html",
|
|
"file:///D:/%23OneDrive/OrcaSlicer/resources/web/guide/0/index.html" },
|
|
{ L"D:\\100%\\OrcaSlicer\\resources\\web\\homepage\\index.html",
|
|
"file:///D:/100%25/OrcaSlicer/resources/web/homepage/index.html" },
|
|
// Callers join the resources directory with a forward-slash relative path.
|
|
{ L"D:\\#OneDrive\\OrcaSlicer\\resources/web/homepage/index.html",
|
|
"file:///D:/%23OneDrive/OrcaSlicer/resources/web/homepage/index.html" },
|
|
{ L"\\\\server\\share\\OrcaSlicer\\resources\\web\\homepage\\index.html",
|
|
"file://server/share/OrcaSlicer/resources/web/homepage/index.html" },
|
|
}));
|
|
CHECK(file_url_from_path(boost::filesystem::path(path)).utf8_string() == url);
|
|
}
|
|
|
|
TEST_CASE("A query appended to a Windows file URL stays separate from its path", "[FileUrl]")
|
|
{
|
|
const wxURI uri(file_url_from_path(boost::filesystem::path(L"D:\\#OneDrive\\OrcaSlicer\\resources\\web\\guide\\0\\index.html")) +
|
|
"?target=21&lang=de");
|
|
CHECK(wxURI::Unescape(uri.GetPath()) == "/D:/#OneDrive/OrcaSlicer/resources/web/guide/0/index.html");
|
|
CHECK(uri.GetQuery() == "target=21&lang=de");
|
|
CHECK(!uri.HasFragment());
|
|
}
|
|
#endif
|