snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-07 16:17:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix clang-format issues

Browse Source
This commit is contained in:
Katie Paxton-Fear 2026-01-13 13:25:15 +00:00
parent fbc8af0dba
commit 50f9a701e1
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/activities/browser/OpdsBookBrowserActivity.cpp
View File

@ -261,9 +261,7 @@ void OpdsBookBrowserActivity::fetchFeed(const std::string& path) {
return; return;
} }
std::string url = UrlUtils::buildUrlWithAuth(serverUrl, path, std::string url = UrlUtils::buildUrlWithAuth(serverUrl, path, SETTINGS.calibreUsername, SETTINGS.calibrePassword);
SETTINGS.calibreUsername,
SETTINGS.calibrePassword);
Serial.printf("[%lu] [OPDS] Fetching: %s\n", millis(), url.c_str()); Serial.printf("[%lu] [OPDS] Fetching: %s\n", millis(), url.c_str());
std::string content; std::string content;
@ -337,9 +335,8 @@ void OpdsBookBrowserActivity::downloadBook(const OpdsEntry& book) {
updateRequired = true; updateRequired = true;
// Build full download URL // Build full download URL
std::string downloadUrl = UrlUtils::buildUrlWithAuth(SETTINGS.opdsServerUrl, book.href, std::string downloadUrl =
SETTINGS.calibreUsername, UrlUtils::buildUrlWithAuth(SETTINGS.opdsServerUrl, book.href, SETTINGS.calibreUsername, SETTINGS.calibrePassword);
SETTINGS.calibrePassword);
// Create Calibre-style folder structure: /Books/AuthorName/BookName/BookFile.epub // Create Calibre-style folder structure: /Books/AuthorName/BookName/BookFile.epub
std::string authorFolder = book.author.empty() ? "Unknown Author" : StringUtils::sanitizeFilename(book.author); std::string authorFolder = book.author.empty() ? "Unknown Author" : StringUtils::sanitizeFilename(book.author);

8
src/util/UrlUtils.cpp
View File

@ -1,7 +1,7 @@
#include "UrlUtils.h" #include "UrlUtils.h"
#include <sstream>
#include <iomanip> #include <iomanip>
#include <sstream>
namespace UrlUtils { namespace UrlUtils {
@ -61,15 +61,15 @@ std::string urlEncode(const std::string& value) {
return escaped.str(); return escaped.str();
} }
std::string buildUrlWithAuth(const std::string& serverUrl, const std::string& path, std::string buildUrlWithAuth(const std::string& serverUrl, const std::string& path, const std::string& username,
const std::string& username, const std::string& password) { const std::string& password) {
// If no credentials, use regular buildUrl // If no credentials, use regular buildUrl
if (username.empty() && password.empty()) { if (username.empty() && password.empty()) {
return buildUrl(serverUrl, path); return buildUrl(serverUrl, path);
} }
std::string urlWithProtocol = ensureProtocol(serverUrl); std::string urlWithProtocol = ensureProtocol(serverUrl);
// Find protocol end // Find protocol end
const size_t protocolEnd = urlWithProtocol.find("://"); const size_t protocolEnd = urlWithProtocol.find("://");
if (protocolEnd == std::string::npos) { if (protocolEnd == std::string::npos) {

4
src/util/UrlUtils.h
View File

@ -30,7 +30,7 @@ std::string urlEncode(const std::string& value);
* If username and password are provided, adds them to the URL. * If username and password are provided, adds them to the URL.
* Example: https://username:password@example.com/path * Example: https://username:password@example.com/path
*/ */
std::string buildUrlWithAuth(const std::string& serverUrl, const std::string& path, std::string buildUrlWithAuth(const std::string& serverUrl, const std::string& path, const std::string& username,
const std::string& username, const std::string& password); const std::string& password);
} // namespace UrlUtils } // namespace UrlUtils