From 2d97fd2a5aafce1c66fc903c6d248d978aac5d15 Mon Sep 17 00:00:00 2001 From: spfenwick Date: Fri, 1 May 2026 20:31:05 +1200 Subject: [PATCH 1/2] fix: use correct server name for opds download --- src/activities/browser/OpdsBookBrowserActivity.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/activities/browser/OpdsBookBrowserActivity.cpp b/src/activities/browser/OpdsBookBrowserActivity.cpp index b2be357c..f1ebd98d 100644 --- a/src/activities/browser/OpdsBookBrowserActivity.cpp +++ b/src/activities/browser/OpdsBookBrowserActivity.cpp @@ -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(); } @@ -413,7 +413,7 @@ void OpdsBookBrowserActivity::downloadBook(const OpdsEntry& book, const OpdsAcqu std::string downloadUrl = (acquisition.href.rfind("http", 0) == 0) ? acquisition.href - : UrlUtils::buildUrl(SETTINGS.opdsServerUrl, acquisition.href); + : UrlUtils::buildUrl(server.url, acquisition.href); std::string filename = "/" + StringUtils::sanitizeFilename((book.author.empty() ? "" : book.author + " - ") + book.title) + acquisition.fileExtension; From 7f121defa80c5e553dee6b43cf6a51f8dba57b60 Mon Sep 17 00:00:00 2001 From: spfenwick Date: Fri, 1 May 2026 21:23:37 +1200 Subject: [PATCH 2/2] Remove legacy opds settings from web page --- src/SettingsList.h | 9 --------- src/activities/browser/OpdsBookBrowserActivity.cpp | 5 ++--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/SettingsList.h b/src/SettingsList.h index f57fe0f6..ed1c4269 100644 --- a/src/SettingsList.h +++ b/src/SettingsList.h @@ -277,15 +277,6 @@ inline const std::vector list = { SettingInfo::Toggle(StrId::STR_KO_SYNC_ON_BOOK_CLOSE, &CrossPointSettings::koSyncOnBookClose, "koSyncOnBookClose", StrId::STR_KOREADER_SYNC), - // --- OPDS Browser (web-only, uses CrossPointSettings char arrays) --- - SettingInfo::String(StrId::STR_OPDS_SERVER_URL, SETTINGS.opdsServerUrl, sizeof(SETTINGS.opdsServerUrl), - "opdsServerUrl", StrId::STR_OPDS_BROWSER), - SettingInfo::String(StrId::STR_USERNAME, SETTINGS.opdsUsername, sizeof(SETTINGS.opdsUsername), "opdsUsername", - StrId::STR_OPDS_BROWSER), - SettingInfo::String(StrId::STR_PASSWORD, SETTINGS.opdsPassword, sizeof(SETTINGS.opdsPassword), "opdsPassword", - StrId::STR_OPDS_BROWSER) - .withObfuscated(), - // --- Status Bar Settings (web-only, uses StatusBarSettingsActivity) --- SettingInfo::Toggle(StrId::STR_CHAPTER_PAGE_COUNT, &CrossPointSettings::statusBarChapterPageCount, "statusBarChapterPageCount", StrId::STR_CUSTOMISE_STATUS_BAR), diff --git a/src/activities/browser/OpdsBookBrowserActivity.cpp b/src/activities/browser/OpdsBookBrowserActivity.cpp index f1ebd98d..2035217c 100644 --- a/src/activities/browser/OpdsBookBrowserActivity.cpp +++ b/src/activities/browser/OpdsBookBrowserActivity.cpp @@ -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(server.url, 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;