From a1be4bbfacf28936224456a6c763b5a99d133ee3 Mon Sep 17 00:00:00 2001 From: Justin Mitchell Date: Sat, 3 Jan 2026 22:02:06 -0500 Subject: [PATCH] Apply clang-format fixes --- lib/KOReaderSync/KOReaderSyncClient.cpp | 3 ++- lib/KOReaderSync/KOReaderSyncClient.h | 22 ++++++------------- lib/KOReaderSync/ProgressMapper.h | 6 ++--- .../reader/KOReaderSyncActivity.cpp | 19 +++++++++------- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/lib/KOReaderSync/KOReaderSyncClient.cpp b/lib/KOReaderSync/KOReaderSyncClient.cpp index 028957f8..8fa7fc34 100644 --- a/lib/KOReaderSync/KOReaderSyncClient.cpp +++ b/lib/KOReaderSync/KOReaderSyncClient.cpp @@ -1,9 +1,10 @@ #include "KOReaderSyncClient.h" #include -#include #include +#include #include + #include #include "KOReaderCredentialStore.h" diff --git a/lib/KOReaderSync/KOReaderSyncClient.h b/lib/KOReaderSync/KOReaderSyncClient.h index 6a75843c..a9bc5c09 100644 --- a/lib/KOReaderSync/KOReaderSyncClient.h +++ b/lib/KOReaderSync/KOReaderSyncClient.h @@ -5,12 +5,12 @@ * Progress data from KOReader sync server. */ struct KOReaderProgress { - std::string document; // Document hash - std::string progress; // XPath-like progress string - float percentage; // Progress percentage (0.0 to 1.0) - std::string device; // Device name - std::string deviceId; // Device ID - int64_t timestamp; // Unix timestamp of last update + std::string document; // Document hash + std::string progress; // XPath-like progress string + float percentage; // Progress percentage (0.0 to 1.0) + std::string device; // Device name + std::string deviceId; // Device ID + int64_t timestamp; // Unix timestamp of last update }; /** @@ -29,15 +29,7 @@ struct KOReaderProgress { */ class KOReaderSyncClient { public: - enum Error { - OK = 0, - NO_CREDENTIALS, - NETWORK_ERROR, - AUTH_FAILED, - SERVER_ERROR, - JSON_ERROR, - NOT_FOUND - }; + enum Error { OK = 0, NO_CREDENTIALS, NETWORK_ERROR, AUTH_FAILED, SERVER_ERROR, JSON_ERROR, NOT_FOUND }; /** * Authenticate with the sync server (validate credentials). diff --git a/lib/KOReaderSync/ProgressMapper.h b/lib/KOReaderSync/ProgressMapper.h index d508ff01..694549da 100644 --- a/lib/KOReaderSync/ProgressMapper.h +++ b/lib/KOReaderSync/ProgressMapper.h @@ -8,9 +8,9 @@ * CrossPoint position representation. */ struct CrossPointPosition { - int spineIndex; // Current spine item (chapter) index - int pageNumber; // Current page within the spine item - int totalPages; // Total pages in the current spine item + int spineIndex; // Current spine item (chapter) index + int pageNumber; // Current page within the spine item + int totalPages; // Total pages in the current spine item }; /** diff --git a/src/activities/reader/KOReaderSyncActivity.cpp b/src/activities/reader/KOReaderSyncActivity.cpp index f267e124..80bb3b27 100644 --- a/src/activities/reader/KOReaderSyncActivity.cpp +++ b/src/activities/reader/KOReaderSyncActivity.cpp @@ -207,8 +207,8 @@ void KOReaderSyncActivity::onEnter() { // Launch WiFi selection subactivity Serial.printf("[%lu] [KOSync] Launching WifiSelectionActivity...\n", millis()); - enterNewActivity( - new WifiSelectionActivity(renderer, mappedInput, [this](const bool connected) { onWifiSelectionComplete(connected); })); + enterNewActivity(new WifiSelectionActivity(renderer, mappedInput, + [this](const bool connected) { onWifiSelectionComplete(connected); })); } void KOReaderSyncActivity::onExit() { @@ -275,10 +275,11 @@ void KOReaderSyncActivity::render() { // Get chapter names from TOC const int remoteTocIndex = epub->getTocIndexForSpineIndex(remotePosition.spineIndex); const int localTocIndex = epub->getTocIndexForSpineIndex(currentSpineIndex); - const std::string remoteChapter = - (remoteTocIndex >= 0) ? epub->getTocItem(remoteTocIndex).title : ("Section " + std::to_string(remotePosition.spineIndex + 1)); - const std::string localChapter = - (localTocIndex >= 0) ? epub->getTocItem(localTocIndex).title : ("Section " + std::to_string(currentSpineIndex + 1)); + const std::string remoteChapter = (remoteTocIndex >= 0) + ? epub->getTocItem(remoteTocIndex).title + : ("Section " + std::to_string(remotePosition.spineIndex + 1)); + const std::string localChapter = (localTocIndex >= 0) ? epub->getTocItem(localTocIndex).title + : ("Section " + std::to_string(currentSpineIndex + 1)); // Remote progress - chapter and page renderer.drawText(UI_10_FONT_ID, 20, 160, "Remote:", true); @@ -286,7 +287,8 @@ void KOReaderSyncActivity::render() { snprintf(remoteChapterStr, sizeof(remoteChapterStr), " %s", remoteChapter.c_str()); renderer.drawText(UI_10_FONT_ID, 20, 185, remoteChapterStr); char remotePageStr[64]; - snprintf(remotePageStr, sizeof(remotePageStr), " Page %d, %.0f%% overall", remotePosition.pageNumber + 1, remoteProgress.percentage * 100); + snprintf(remotePageStr, sizeof(remotePageStr), " Page %d, %.0f%% overall", remotePosition.pageNumber + 1, + remoteProgress.percentage * 100); renderer.drawText(UI_10_FONT_ID, 20, 210, remotePageStr); if (!remoteProgress.device.empty()) { @@ -301,7 +303,8 @@ void KOReaderSyncActivity::render() { snprintf(localChapterStr, sizeof(localChapterStr), " %s", localChapter.c_str()); renderer.drawText(UI_10_FONT_ID, 20, 295, localChapterStr); char localPageStr[64]; - snprintf(localPageStr, sizeof(localPageStr), " Page %d/%d, %.0f%% overall", currentPage + 1, totalPagesInSpine, localProgress.percentage * 100); + snprintf(localPageStr, sizeof(localPageStr), " Page %d/%d, %.0f%% overall", currentPage + 1, totalPagesInSpine, + localProgress.percentage * 100); renderer.drawText(UI_10_FONT_ID, 20, 320, localPageStr); // Options