Merge remote-tracking branch 'origin/master' into feat-sdfonts-ui

# Conflicts: # assets/sd-fonts/sd-fonts.yaml # assets/sd-fonts/sd-fonts.yaml~HEAD
2026-05-02 23:21:54 +02:00
parent ab8e7ef108 62a3ab0d66
commit 7f7b98b66c
17 changed files with 707 additions and 476 deletions
@@ -398,7 +398,7 @@ void OpdsBookBrowserActivity::chooseBookFormat(const OpdsEntry& book) {

  selectedBookIndex = selectorIndex;
  formatSelectorIndex = 0;
-  formatSelectionLabels = buildOpdsFormatSelectionLabels(book.acquisitionLinks, SETTINGS.opdsServerUrl);
+  formatSelectionLabels = buildOpdsFormatSelectionLabels(book.acquisitionLinks, server.url);
  state = BrowserState::FORMAT_SELECTION;
  requestUpdate();
 }
@@ -411,9 +411,8 @@ void OpdsBookBrowserActivity::downloadBook(const OpdsEntry& book, const OpdsAcqu
  downloadTotal = 0;
  requestUpdate(true);

-  std::string downloadUrl = (acquisition.href.rfind("http", 0) == 0)
-                                ? acquisition.href
-                                : UrlUtils::buildUrl(SETTINGS.opdsServerUrl, acquisition.href);
+  std::string downloadUrl =
+      (acquisition.href.rfind("http", 0) == 0) ? acquisition.href : UrlUtils::buildUrl(server.url, acquisition.href);
  std::string filename = "/" +
                         StringUtils::sanitizeFilename((book.author.empty() ? "" : book.author + " - ") + book.title) +
                         acquisition.fileExtension;