Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-04-20 16:59:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove tr_url_query_view (#8049)

Browse Source 
replace bespoke struct with std:: container
This commit is contained in:
Charles Kerr
2026-01-02 15:38:00 -06:00
parent 3a4e115c52
commit d7d0d87f78
4 changed files with 24 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libtransmission/web-utils.h
View File

@@ -10,6 +10,7 @@
#include <string>
#include <string_view>
#include <utility>
#include <vector>
#include <fmt/format.h>
@@ -38,6 +39,10 @@ struct tr_url_parsed_t
std::string_view fragment; // "nose"
std::string_view full; // "http://example.com:80/over/there?name=ferret#nose"
uint16_t port = 0;
// returns a vector of key,val pairs, e.g.
// `first=hello&second=world` -> [<"first","hello">,<"second","world">]
[[nodiscard]] std::vector<std::pair<std::string_view, std::string_view>> query_entries() const;
};
[[nodiscard]] std::optional<tr_url_parsed_t> tr_urlParse(std::string_view url);
@@ -50,52 +55,6 @@ struct tr_url_parsed_t
// This is to avoid logging sensitive info, e.g. a personal announcer id in the URL.
[[nodiscard]] std::string tr_urlTrackerLogName(std::string_view url);
// example use: `for (auto const [key, val] : tr_url_query_view{ querystr })`
struct tr_url_query_view
{
std::string_view const query;
explicit tr_url_query_view(std::string_view query_in)
: query{ query_in }
{
}
struct iterator
{
std::pair<std::string_view, std::string_view> keyval;
std::string_view remain;
iterator& operator++();
[[nodiscard]] constexpr auto const& operator*() const
{
return keyval;
}
[[nodiscard]] constexpr auto const* operator->() const
{
return &keyval;
}
[[nodiscard]] constexpr bool operator==(iterator const& that) const
{
return this->remain == that.remain && this->keyval == that.keyval;
}
[[nodiscard]] constexpr bool operator!=(iterator const& that) const
{
return !(*this == that);
}
};
[[nodiscard]] iterator begin() const;
[[nodiscard]] static constexpr iterator end()
{
return iterator{};
}
};
template<typename BackInsertIter>
constexpr void tr_urlPercentEncode(BackInsertIter out, std::string_view input, bool escape_reserved = true)
{