From 0e9ceb9569d7a7082396e92fbee1cba2dcf9c1a5 Mon Sep 17 00:00:00 2001 From: codebude Date: Fri, 4 Sep 2026 23:13:38 +0200 Subject: [PATCH 01/50] Fix calendar-day splits in daily page statistics (instead of 24h slots) --- backend/app/routers/statistics.py | 27 ++++++++++++++++----------- backend/tests/test_statistics.py | 24 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/backend/app/routers/statistics.py b/backend/app/routers/statistics.py index 900f25a0..1f33f345 100644 --- a/backend/app/routers/statistics.py +++ b/backend/app/routers/statistics.py @@ -130,17 +130,22 @@ def _extract_progress_daily_pages( book_entries.sort(key=lambda e: (e.created_at, e.page)) for prev, curr in zip(book_entries, book_entries[1:]): delta = curr.page - prev.page - if delta > 0: - day_diff = (curr.created_at - prev.created_at).days + 1 - if day_diff > 0: - daily_avg = delta / day_diff - start, end = _clamp_window(prev.created_at, curr.created_at, window_start, window_end) - if start is None or end is None: - continue - while start <= end: - date_key = start.astimezone(tz).strftime("%Y-%m-%d") - daily[date_key] += daily_avg - start += timedelta(days=1) + if delta <= 0: + continue + prev_day = prev.created_at.astimezone(tz).date() + curr_day = curr.created_at.astimezone(tz).date() + day_diff = (curr_day - prev_day).days + 1 + if day_diff <= 0: + continue + daily_avg = delta / day_diff + start, end = _clamp_window(prev.created_at, curr.created_at, window_start, window_end) + if start is None or end is None: + continue + day = start.astimezone(tz).date() + last = end.astimezone(tz).date() + while day <= last: + daily[day.isoformat()] += daily_avg + day += timedelta(days=1) return daily diff --git a/backend/tests/test_statistics.py b/backend/tests/test_statistics.py index f44a9769..5c1b4589 100644 --- a/backend/tests/test_statistics.py +++ b/backend/tests/test_statistics.py @@ -630,6 +630,30 @@ def test_extract_progress_daily_pages_skips_outside_window() -> None: assert result == {} +def test_extract_progress_daily_pages_splits_delta_across_calendar_days() -> None: + """A delta spanning two calendar days must be split, even when the span is <24h.""" + from app.routers.statistics import _extract_progress_daily_pages + + entries = [ + SimpleNamespace(book_id=1, page=202, created_at=datetime(2026, 9, 2, 21, 16, tzinfo=timezone.utc)), + SimpleNamespace(book_id=1, page=320, created_at=datetime(2026, 9, 3, 20, 54, tzinfo=timezone.utc)), + ] + result = _extract_progress_daily_pages(entries, ZoneInfo("Europe/Berlin")) + assert result == {"2026-09-02": 59.0, "2026-09-03": 59.0} + + +def test_extract_progress_daily_pages_keeps_last_day_of_partial_span() -> None: + """The final calendar day must not be dropped when prev is later in the day than curr.""" + from app.routers.statistics import _extract_progress_daily_pages + + entries = [ + SimpleNamespace(book_id=1, page=10, created_at=datetime(2026, 5, 1, 23, 0, tzinfo=timezone.utc)), + SimpleNamespace(book_id=1, page=30, created_at=datetime(2026, 5, 2, 22, 0, tzinfo=timezone.utc)), + ] + result = _extract_progress_daily_pages(entries, ZoneInfo("UTC")) + assert result == {"2026-05-01": 10.0, "2026-05-02": 10.0} + + def test_extract_book_level_daily_pages_skips_outside_window() -> None: from app.routers.statistics import _extract_book_level_daily_pages From 73fdf1218d66a5635fbf769454205dc757a16680 Mon Sep 17 00:00:00 2001 From: codebude Date: Sat, 5 Sep 2026 00:10:38 +0200 Subject: [PATCH 02/50] Fixed user timezone input and improved usability --- .../lib/components/SearchableSelect.svelte | 237 ++++++++++++++++++ .../lib/components/SearchableSelect.test.ts | 93 +++++++ frontend/src/lib/i18n/locales/de.json | 1 + frontend/src/lib/i18n/locales/en.json | 1 + frontend/src/lib/i18n/locales/es.json | 1 + frontend/src/lib/i18n/locales/fr.json | 1 + frontend/src/lib/i18n/locales/zh.json | 1 + frontend/src/routes/profile/+page.svelte | 16 +- 8 files changed, 341 insertions(+), 10 deletions(-) create mode 100644 frontend/src/lib/components/SearchableSelect.svelte create mode 100644 frontend/src/lib/components/SearchableSelect.test.ts diff --git a/frontend/src/lib/components/SearchableSelect.svelte b/frontend/src/lib/components/SearchableSelect.svelte new file mode 100644 index 00000000..39ad2f5e --- /dev/null +++ b/frontend/src/lib/components/SearchableSelect.svelte @@ -0,0 +1,237 @@ + + +
+ + + {#if isOpen} +
+
+
+ + +
+
+
    + {#if filtered.length === 0} +
  • {noResultsText}
    • + {:else} + {#each filtered as option, i (option)} +
  • selectOption(option)} + onmouseenter={() => (highlightedIndex = i)} + > + {option} +
    • + {/each} + {/if} +
+
+ {/if} +
\ No newline at end of file diff --git a/frontend/src/lib/components/SearchableSelect.test.ts b/frontend/src/lib/components/SearchableSelect.test.ts new file mode 100644 index 00000000..839d1049 --- /dev/null +++ b/frontend/src/lib/components/SearchableSelect.test.ts @@ -0,0 +1,93 @@ +import { describe, it, expect, afterEach } from 'vitest'; +import { render, screen, fireEvent, cleanup } from '@testing-library/svelte'; +import SearchableSelect from './SearchableSelect.svelte'; + +describe('SearchableSelect', () => { + const options = ['Europe/Berlin', 'Europe/London', 'Asia/Tokyo']; + + afterEach(() => { + cleanup(); + }); + + it('renders the current value on the trigger', () => { + render(SearchableSelect, { props: { value: 'Europe/Berlin', options, ariaLabel: 'timezone' } }); + expect(screen.getByRole('button', { name: 'timezone' })).toHaveTextContent('Europe/Berlin'); + }); + + it('shows the placeholder when no value is selected', () => { + render(SearchableSelect, { + props: { value: '', options, placeholder: 'Pick one', ariaLabel: 'timezone' }, + }); + expect(screen.getByRole('button', { name: 'timezone' })).toHaveTextContent('Pick one'); + }); + + it('opens the dropdown on click and lists all options', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.click(screen.getByRole('button', { name: 'timezone' })); + expect(screen.getAllByRole('option')).toHaveLength(3); + expect(screen.getByRole('combobox')).toBeInTheDocument(); + }); + + it('filters options while typing', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.click(screen.getByRole('button', { name: 'timezone' })); + + const search = screen.getByRole('combobox'); + await fireEvent.input(search, { target: { value: 'Lon' } }); + + const remaining = screen.getAllByRole('option'); + expect(remaining).toHaveLength(1); + expect(remaining[0]).toHaveTextContent('Europe/London'); + }); + + it('selects an option on mousedown and closes the dropdown', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.click(screen.getByRole('button', { name: 'timezone' })); + + await fireEvent.mouseDown(screen.getByText('Europe/London')); + + expect(screen.queryByRole('listbox')).not.toBeInTheDocument(); + expect(screen.getByRole('button', { name: 'timezone' })).toHaveTextContent('Europe/London'); + }); + + it('closes the dropdown on Escape', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.click(screen.getByRole('button', { name: 'timezone' })); + + await fireEvent.keyDown(screen.getByRole('combobox'), { key: 'Escape' }); + + expect(screen.queryByRole('listbox')).not.toBeInTheDocument(); + }); + + it('closes the dropdown when clicking outside', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.click(screen.getByRole('button', { name: 'timezone' })); + expect(screen.getByRole('listbox')).toBeInTheDocument(); + + await fireEvent.click(document.body); + + expect(screen.queryByRole('listbox')).not.toBeInTheDocument(); + }); + + it('selects the highlighted option with ArrowDown and Enter', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.click(screen.getByRole('button', { name: 'timezone' })); + + const search = screen.getByRole('combobox'); + await fireEvent.keyDown(search, { key: 'ArrowDown' }); + await fireEvent.keyDown(search, { key: 'Enter' }); + + expect(screen.queryByRole('listbox')).not.toBeInTheDocument(); + expect(screen.getByRole('button', { name: 'timezone' })).toHaveTextContent('Europe/Berlin'); + }); + + it('opens the dropdown and starts filtering when a character is typed', async () => { + render(SearchableSelect, { props: { value: '', options, ariaLabel: 'timezone' } }); + await fireEvent.keyDown(screen.getByRole('button', { name: 'timezone' }), { key: 'L' }); + + expect(screen.getByRole('combobox')).toBeInTheDocument(); + expect(screen.getAllByRole('option')).toHaveLength(2); + expect(screen.getAllByRole('option')[0]).toHaveTextContent('Europe/Berlin'); + expect(screen.getAllByRole('option')[1]).toHaveTextContent('Europe/London'); + }); +}); \ No newline at end of file diff --git a/frontend/src/lib/i18n/locales/de.json b/frontend/src/lib/i18n/locales/de.json index c092f1fe..4b82a691 100644 --- a/frontend/src/lib/i18n/locales/de.json +++ b/frontend/src/lib/i18n/locales/de.json @@ -270,6 +270,7 @@ "themeCustom": "Anpassen", "themeSelect": "Wähle ein benutzerdefiniertes Design", "timezonePlaceholder": "Zeitzone suchen...", + "timezoneNoResults": "Keine passende Zeitzone", "apiDocsTitle": "API-Dokumentation", "apiDocsHelp": "Erkunde und teste Backend-Endpunkte direkt in der App.", "apiDocsViewLabel": "Ansicht", diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json index fdcf470d..306dfaaa 100644 --- a/frontend/src/lib/i18n/locales/en.json +++ b/frontend/src/lib/i18n/locales/en.json @@ -270,6 +270,7 @@ "themeCustom": "Customize", "themeSelect": "Select a custom theme", "timezonePlaceholder": "Search timezone...", + "timezoneNoResults": "No matching timezone", "apiDocsTitle": "API Documentation", "apiDocsHelp": "Explore and test backend endpoints directly from the app.", "apiDocsViewLabel": "View", diff --git a/frontend/src/lib/i18n/locales/es.json b/frontend/src/lib/i18n/locales/es.json index 90396b04..1b9d8a00 100644 --- a/frontend/src/lib/i18n/locales/es.json +++ b/frontend/src/lib/i18n/locales/es.json @@ -270,6 +270,7 @@ "themeCustom": "Personalizar", "themeSelect": "Selecciona un tema personalizado", "timezonePlaceholder": "Buscar zona horaria...", + "timezoneNoResults": "No hay ninguna zona horaria coincidente", "apiDocsTitle": "Documentación de la API", "apiDocsHelp": "Explora y prueba los endpoints del backend directamente desde la app.", "apiDocsViewLabel": "Ver", diff --git a/frontend/src/lib/i18n/locales/fr.json b/frontend/src/lib/i18n/locales/fr.json index 8f5fb132..60607a65 100644 --- a/frontend/src/lib/i18n/locales/fr.json +++ b/frontend/src/lib/i18n/locales/fr.json @@ -270,6 +270,7 @@ "themeCustom": "Personnaliser", "themeSelect": "Choisir un thème personnalisé", "timezonePlaceholder": "Rechercher un fuseau horaire...", + "timezoneNoResults": "Aucun fuseau horaire correspondant", "apiDocsTitle": "Documentation de l'API", "apiDocsHelp": "Explore et teste les points d'accès du backend directement depuis l'application.", "apiDocsViewLabel": "Voir", diff --git a/frontend/src/lib/i18n/locales/zh.json b/frontend/src/lib/i18n/locales/zh.json index e2b49813..aeb25769 100644 --- a/frontend/src/lib/i18n/locales/zh.json +++ b/frontend/src/lib/i18n/locales/zh.json @@ -270,6 +270,7 @@ "themeCustom": "自定义", "themeSelect": "选择自定义主题", "timezonePlaceholder": "搜索时区...", + "timezoneNoResults": "没有匹配的时区", "apiDocsTitle": "API 文档", "apiDocsHelp": "直接在应用中探索和测试后端接口。", "apiDocsViewLabel": "查看", diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte index 083cdaad..df53091b 100644 --- a/frontend/src/routes/profile/+page.svelte +++ b/frontend/src/routes/profile/+page.svelte @@ -10,6 +10,7 @@ import { getTimezone, setTimezone, detectTimezone } from '$lib/stores/timezone'; import { getThemeMode, setThemeMode, getCustomTheme, setCustomTheme, applyThemeToDocument, saveThemeToStorage, sanitizeThemeMode, restoreFromPoint, saveRestorePoint, clearRestorePoint, DAISYUI_THEMES } from '$lib/stores/theme'; import Alert from '$lib/components/Alert.svelte'; + import SearchableSelect from '$lib/components/SearchableSelect.svelte'; import { toasts } from '$lib/toasts'; import { localizeError } from '$lib/errors'; import { toDateInputValue, today } from '$lib/date'; @@ -580,19 +581,14 @@ {timezoneMessage.text} {/if} - - - {#each allTimezones as tz} - - {/each} -

{$_('settings.timezoneDetected', { values: { tz: browserTz } })}

{$_('settings.timezoneSelected', { values: { tz: timezone } })}

From 12b8758eeee4bff84c3c053b71c5c7256bf89843 Mon Sep 17 00:00:00 2001 From: codebude Date: Sat, 5 Sep 2026 08:20:20 +0200 Subject: [PATCH 03/50] Improved visibility of selected item in suggestion input --- .../src/lib/components/SuggestionInput.svelte | 28 +++++++++---------- frontend/src/lib/components/TagInput.svelte | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/src/lib/components/SuggestionInput.svelte b/frontend/src/lib/components/SuggestionInput.svelte index 0b412fb8..eef57dd7 100644 --- a/frontend/src/lib/components/SuggestionInput.svelte +++ b/frontend/src/lib/components/SuggestionInput.svelte @@ -112,7 +112,7 @@ const before = text.slice(0, idx); const match = text.slice(idx, idx + query.length); const after = text.slice(idx + query.length); - return `${before}${match}${after}`; + return `${before}${match}${after}`; } @@ -150,19 +150,19 @@ class="z-50 bg-base-100 border border-base-300 rounded-lg shadow-lg max-h-48 overflow-y-auto" style={dropdownStyle || 'position:absolute;left:0;right:0;margin-top:0.25rem'} > - {#each suggestions as suggestion, i} -
  • selectSuggestion(suggestion)} - onmouseenter={() => (highlightedIndex = i)} - > - {@html highlightMatch(suggestion, inputValue)} -
    • - {/each} + {#each suggestions as suggestion, i} +
  • selectSuggestion(suggestion)} + onmouseenter={() => (highlightedIndex = i)} + > + {@html highlightMatch(suggestion, inputValue)} +
    • + {/each} {/if} diff --git a/frontend/src/lib/components/TagInput.svelte b/frontend/src/lib/components/TagInput.svelte index ad3fe682..26cfb664 100644 --- a/frontend/src/lib/components/TagInput.svelte +++ b/frontend/src/lib/components/TagInput.svelte @@ -290,7 +290,7 @@ aria-selected={i === highlightedIndex} class="px-3 py-2 cursor-pointer text-sm" class:bg-base-200={i !== highlightedIndex} - style={i === highlightedIndex ? 'background-color: oklch(var(--p) / 0.1); color: oklch(var(--p));' : ''} + style={i === highlightedIndex ? 'background-color: oklch(var(--p) / 0.2); color: oklch(var(--p)); font-weight: 600; border: 1px solid oklch(var(--p) / 0.4);' : ''} onmousedown={() => selectSuggestion(suggestion)} onmouseenter={() => (highlightedIndex = i)} > From d61156adac59746824097c820544e3e707f23671 Mon Sep 17 00:00:00 2001 From: codebude Date: Sat, 5 Sep 2026 08:33:11 +0200 Subject: [PATCH 04/50] fix(#79): improve contrast and add visual border to selected dropdown items - Increase background opacity from 0.1 to 0.2 for selected items in TagInput and SuggestionInput - Add font-weight: 600 (semibold) for better text prominence - Add inset box-shadow (2px solid) as visual border indicator for accessibility - Use consistent color palette: primary opacity 0.6 for border, 0.2 for background This resolves GitHub issue #79 by making the selection indicator clearly visible while maintaining consistent styling across both dropdown components. --- frontend/src/lib/components/SuggestionInput.svelte | 2 +- frontend/src/lib/components/TagInput.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/components/SuggestionInput.svelte b/frontend/src/lib/components/SuggestionInput.svelte index eef57dd7..760c367e 100644 --- a/frontend/src/lib/components/SuggestionInput.svelte +++ b/frontend/src/lib/components/SuggestionInput.svelte @@ -156,7 +156,7 @@ aria-selected={i === highlightedIndex} class="px-3 py-2 cursor-pointer text-sm" class:bg-base-200={i !== highlightedIndex} - style={i === highlightedIndex ? 'background-color: oklch(var(--p) / 0.2); color: oklch(var(--p)); font-weight: 600; border: 1px solid oklch(var(--p) / 0.4);' : ''} + style={i === highlightedIndex ? 'background-color: oklch(var(--p) / 0.2); color: oklch(var(--p)); font-weight: 600; box-shadow: inset 0 0 0 2px oklch(var(--p) / 0.6);' : ''} onmousedown={() => selectSuggestion(suggestion)} onmouseenter={() => (highlightedIndex = i)} > diff --git a/frontend/src/lib/components/TagInput.svelte b/frontend/src/lib/components/TagInput.svelte index 26cfb664..1b22d13a 100644 --- a/frontend/src/lib/components/TagInput.svelte +++ b/frontend/src/lib/components/TagInput.svelte @@ -290,7 +290,7 @@ aria-selected={i === highlightedIndex} class="px-3 py-2 cursor-pointer text-sm" class:bg-base-200={i !== highlightedIndex} - style={i === highlightedIndex ? 'background-color: oklch(var(--p) / 0.2); color: oklch(var(--p)); font-weight: 600; border: 1px solid oklch(var(--p) / 0.4);' : ''} + style={i === highlightedIndex ? 'background-color: oklch(var(--p) / 0.2); color: oklch(var(--p)); font-weight: 600; box-shadow: inset 0 0 0 2px oklch(var(--p) / 0.6);' : ''} onmousedown={() => selectSuggestion(suggestion)} onmouseenter={() => (highlightedIndex = i)} > From 875cdfd86112033acbd9dd02fb1aa9e6c2729801 Mon Sep 17 00:00:00 2001 From: codebude Date: Sat, 5 Sep 2026 09:11:51 +0200 Subject: [PATCH 05/50] Better border for selected tag/author items --- frontend/src/lib/components/SuggestionInput.svelte | 11 +++++++++-- frontend/src/lib/components/TagInput.svelte | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/frontend/src/lib/components/SuggestionInput.svelte b/frontend/src/lib/components/SuggestionInput.svelte index 760c367e..19b01352 100644 --- a/frontend/src/lib/components/SuggestionInput.svelte +++ b/frontend/src/lib/components/SuggestionInput.svelte @@ -154,9 +154,16 @@
  • selectSuggestion(suggestion)} onmouseenter={() => (highlightedIndex = i)} > diff --git a/frontend/src/lib/components/TagInput.svelte b/frontend/src/lib/components/TagInput.svelte index 1b22d13a..e7429d6b 100644 --- a/frontend/src/lib/components/TagInput.svelte +++ b/frontend/src/lib/components/TagInput.svelte @@ -288,9 +288,16 @@
  • selectSuggestion(suggestion)} onmouseenter={() => (highlightedIndex = i)} > From f2d5c7d1feb28ccc3440ebf696d8f6549a4bb3d0 Mon Sep 17 00:00:00 2001 From: codebude Date: Sat, 5 Sep 2026 12:47:16 +0200 Subject: [PATCH 06/50] Adaptive date input with additional validation --- .../lib/components/AdaptiveDateInput.svelte | 81 ++++ frontend/src/lib/components/BookDrawer.svelte | 40 +- .../src/lib/components/BookDrawer.test.ts | 33 +- .../lib/components/SegmentedDateInput.svelte | 415 ++++++++++++++++++ .../lib/components/SegmentedDateInput.test.ts | 130 ++++++ frontend/src/lib/i18n/locales/de.json | 3 +- frontend/src/lib/i18n/locales/en.json | 3 +- frontend/src/lib/i18n/locales/es.json | 3 +- frontend/src/lib/i18n/locales/fr.json | 3 +- frontend/src/lib/i18n/locales/zh.json | 3 +- frontend/src/routes/profile/+page.svelte | 41 +- 11 files changed, 738 insertions(+), 17 deletions(-) create mode 100644 frontend/src/lib/components/AdaptiveDateInput.svelte create mode 100644 frontend/src/lib/components/SegmentedDateInput.svelte create mode 100644 frontend/src/lib/components/SegmentedDateInput.test.ts diff --git a/frontend/src/lib/components/AdaptiveDateInput.svelte b/frontend/src/lib/components/AdaptiveDateInput.svelte new file mode 100644 index 00000000..a1719e9c --- /dev/null +++ b/frontend/src/lib/components/AdaptiveDateInput.svelte @@ -0,0 +1,81 @@ + + +
    +
    + +
    + + + + +
    diff --git a/frontend/src/lib/components/BookDrawer.svelte b/frontend/src/lib/components/BookDrawer.svelte index 455d198a..acc2b4ad 100644 --- a/frontend/src/lib/components/BookDrawer.svelte +++ b/frontend/src/lib/components/BookDrawer.svelte @@ -10,6 +10,7 @@ import CoverPicker from './CoverPicker.svelte'; import SuggestionInput from './SuggestionInput.svelte'; import TagInput from './TagInput.svelte'; + import AdaptiveDateInput from './AdaptiveDateInput.svelte'; import DateConflictDialog from './DateConflictDialog.svelte'; import AutoSearchCoverModal from './AutoSearchCoverModal.svelte'; import BarcodeScanner from './BarcodeScanner.svelte'; @@ -61,6 +62,10 @@ let tags = $state(''); let date_started = $state(''); let date_finished = $state(''); + let dateStartedInvalid = $state(false); + let dateFinishedInvalid = $state(false); + let dateStartedHasInput = $state(false); + let dateFinishedHasInput = $state(false); let cover_url = $state(null); // ── Android back button: close drawer instead of navigating away ────────── @@ -216,6 +221,14 @@ toasts.add($_('error.pageCountRequired'), 'error'); return; } + if (dateStartedInvalid && dateStartedHasInput) { + toasts.add($_('error.invalidDate'), 'error'); + return; + } + if (dateFinishedInvalid && dateFinishedHasInput) { + toasts.add($_('error.invalidDate'), 'error'); + return; + } const ds = date_started.trim(); const df = date_finished.trim(); if (ds && df && ds > df) { @@ -501,12 +514,30 @@
  • {$_('profile.goals.title')}
  • {$_('user.apiKeys')}
  • {$_('user.embedTokens')}
    • +
  • {$_('profile.shareProfile.title')}
  • {$_('profile.dataManagement.title')}
    • {#if oidcConfig.enabled}
  • {$_('oidc.profileTitle')}
    • diff --git a/frontend/src/routes/statistics/page.test.ts b/frontend/src/routes/statistics/page.test.ts index 0503d774..0153e192 100644 --- a/frontend/src/routes/statistics/page.test.ts +++ b/frontend/src/routes/statistics/page.test.ts @@ -27,6 +27,7 @@ function createMockStats(overrides?: Partial): StatisticsRes language_distribution: [{ language: 'EN', count: 3 }], status_distribution: { want_to_read: 1, currently_reading: 0, read: 2, did_not_finish: 0 }, acquisition_status_distribution: { owned: 2, borrowed: 1, digital_access: 0, to_acquire: 1 }, + medium_distribution: [], page_buckets: { pages_to_read: 100, pages_read: 200, pages_wasted: 0 }, pages_read_per_month: [], books_finished_per_month: [], From 0dc71dc38a07008458e3acbe3dcdb11bb08a9b5b Mon Sep 17 00:00:00 2001 From: codebude Date: Thu, 10 Sep 2026 12:26:00 +0200 Subject: [PATCH 26/50] Add copy and open actions for share links --- ...a7_add_raw_token_to_public_profile_link.py | 29 ++++++++++ backend/app/models.py | 1 + backend/app/routers/share_links.py | 16 ++++++ backend/app/schemas.py | 6 ++ backend/librislog.db | 0 backend/tests/test_public_profile.py | 57 ++++++++++++++++++- frontend/src/lib/api.ts | 7 +++ frontend/src/lib/types.ts | 4 ++ frontend/src/routes/profile/+page.svelte | 45 ++++++++++++++- 9 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 backend/alembic/versions/b2c3d4e5f6a7_add_raw_token_to_public_profile_link.py create mode 100644 backend/librislog.db diff --git a/backend/alembic/versions/b2c3d4e5f6a7_add_raw_token_to_public_profile_link.py b/backend/alembic/versions/b2c3d4e5f6a7_add_raw_token_to_public_profile_link.py new file mode 100644 index 00000000..5e8c3584 --- /dev/null +++ b/backend/alembic/versions/b2c3d4e5f6a7_add_raw_token_to_public_profile_link.py @@ -0,0 +1,29 @@ +"""add raw token to public_profile_link + +Revision ID: b2c3d4e5f6a7 +Revises: c9a4b7d8e3f1 +Create Date: 2026-09-10 12:00:00.000000 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = "b2c3d4e5f6a7" +down_revision: Union[str, Sequence[str], None] = "c9a4b7d8e3f1" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + with op.batch_alter_table("public_profile_link") as batch_op: + batch_op.add_column(sa.Column("token", sa.String(length=255), nullable=True)) + + +def downgrade() -> None: + with op.batch_alter_table("public_profile_link") as batch_op: + batch_op.drop_column("token") diff --git a/backend/app/models.py b/backend/app/models.py index b346f65b..419db6b0 100644 --- a/backend/app/models.py +++ b/backend/app/models.py @@ -329,6 +329,7 @@ class PublicProfileLink(SQLModel, table=True): user_id: int = Field(foreign_key="user.id", index=True) name: str = Field(max_length=255) token_prefix: str = Field(index=True) + token: Optional[str] = Field(default=None, nullable=True) token_hash: str = Field(index=True, unique=True) audience: PublicProfileAudience = Field(default=PublicProfileAudience.public) visibility_config_json: str = Field( diff --git a/backend/app/routers/share_links.py b/backend/app/routers/share_links.py index e4f26fee..27d62c83 100644 --- a/backend/app/routers/share_links.py +++ b/backend/app/routers/share_links.py @@ -19,6 +19,7 @@ PublicProfileLinkRead, PublicProfileLinkUpdate, PublicProfileVisibilityConfig, + ShareLinkRevealResponse, ) from app.services.public_profile import ( parse_visibility_config, @@ -93,6 +94,7 @@ def create_share_link( user_id=current_user.id, name=body.name, token_prefix=get_public_profile_token_prefix(plain_token), + token=plain_token, token_hash=hash_public_profile_token(plain_token), audience=audience, visibility_config_json=serialize_visibility_config(body.visibility_config), @@ -107,6 +109,20 @@ def create_share_link( ) +@router.post("/{link_id}/reveal", response_model=ShareLinkRevealResponse) +def reveal_share_link( + link_id: int, + current_user: User = Depends(require_user), + session: Session = Depends(get_session), +) -> ShareLinkRevealResponse: + """Return the raw token for a share link owned by the current user.""" + assert current_user.id is not None + link = _get_owned_link(link_id, current_user.id, session) + if not link.token: + raise HTTPException(status_code=404, detail="Token not available for legacy link") + return ShareLinkRevealResponse(token=link.token) + + @router.patch("/{link_id}", response_model=PublicProfileLinkRead) def update_share_link( link_id: int, diff --git a/backend/app/schemas.py b/backend/app/schemas.py index 133b2a25..08631ee4 100644 --- a/backend/app/schemas.py +++ b/backend/app/schemas.py @@ -848,6 +848,12 @@ class PublicProfileLinkCreateResponse(SQLModel): link: PublicProfileLinkRead +class ShareLinkRevealResponse(SQLModel): + """Response for the reveal endpoint, returning the raw token.""" + + token: str + + class PublicProfileUserInfo(SQLModel): """Public-safe owner identity shown on a public profile. diff --git a/backend/librislog.db b/backend/librislog.db new file mode 100644 index 00000000..e69de29b diff --git a/backend/tests/test_public_profile.py b/backend/tests/test_public_profile.py index ef7ea42a..52c85c79 100644 --- a/backend/tests/test_public_profile.py +++ b/backend/tests/test_public_profile.py @@ -404,4 +404,59 @@ def test_public_profile_rejects_past_expiry_on_update(client: Any) -> None: json={"expires_at": None}, ) assert resp.status_code == 200 - assert resp.json()["expires_at"] is None \ No newline at end of file + assert resp.json()["expires_at"] is None + + +def test_reveal_share_link_returns_raw_token(client: Any) -> None: + data = _create_share_link(client) + link_id = data["link"]["id"] + resp = client.post(f"/api/profile/share-links/{link_id}/reveal") + assert resp.status_code == 200 + body = resp.json() + assert body["token"] == data["token"] + assert body["token"].startswith("lp_") + + +def test_reveal_share_link_404_for_other_user( + client: Any, create_user_with_key: Any +) -> None: + data = _create_share_link(client) + link_id = data["link"]["id"] + + user_b, key_b = create_user_with_key(email="other@example.com") + resp = client.post( + f"/api/profile/share-links/{link_id}/reveal", + headers={"X-API-Key": key_b}, + ) + assert resp.status_code == 404 + + +def test_reveal_share_link_404_for_revoked(client: Any) -> None: + data = _create_share_link(client) + link_id = data["link"]["id"] + + # Revoke + client.delete(f"/api/profile/share-links/{link_id}") + + resp = client.post(f"/api/profile/share-links/{link_id}/reveal") + assert resp.status_code == 404 + + +def test_reveal_share_link_404_for_legacy_without_token(client: Any, session: Session) -> None: + """Legacy links with token=None cannot be revealed.""" + from app.auth import get_public_profile_token_prefix, hash_public_profile_token + from app.models import PublicProfileLink + + token_hash = hash_public_profile_token("lp_fake_legacy_token") + link = PublicProfileLink( + user_id=1, + name="Legacy", + token_prefix=get_public_profile_token_prefix("lp_fake_legacy_token"), + token_hash=token_hash, + ) + session.add(link) + session.commit() + session.refresh(link) + + resp = client.post(f"/api/profile/share-links/{link.id}/reveal") + assert resp.status_code == 404 \ No newline at end of file diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 13f621c7..5f383f35 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -46,6 +46,7 @@ import type { PublicProfileLinkCreateResponse, PublicProfileResponse, PublicProfileVisibilityConfig, + ShareLinkRevealResponse, User, UserCreateResponse, UserAdminUpdate, @@ -283,6 +284,12 @@ export const api = { return request(`/profile/share-links/${id}`, { method: 'DELETE' }); }, + revealShareLink(id: number): Promise { + return request(`/profile/share-links/${id}/reveal`, { + method: 'POST' + }); + }, + resetData(confirmation: string): Promise { return request('/profile/reset-data', { method: 'POST', diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts index ce13f92f..bb9f9fe5 100644 --- a/frontend/src/lib/types.ts +++ b/frontend/src/lib/types.ts @@ -514,6 +514,10 @@ export interface PublicProfileLinkCreateResponse { link: PublicProfileLink; } +export interface ShareLinkRevealResponse { + token: string; +} + export interface PublicProfileUserInfo { firstname: string; lastname: string; diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte index 59c71f95..5a6b045a 100644 --- a/frontend/src/routes/profile/+page.svelte +++ b/frontend/src/routes/profile/+page.svelte @@ -4,7 +4,7 @@ import { api } from '$lib/api'; import PasswordRequirements from '$lib/components/PasswordRequirements.svelte'; import { currentUser } from '$lib/stores/auth'; - import { Calendar, Info, Pencil, Trash2 } from '@lucide/svelte'; + import { Calendar, Check, Copy, ExternalLink, Info, Pencil, Trash2 } from '@lucide/svelte'; import { _, SUPPORTED_LOCALES, setLocale } from '$lib/i18n'; import { getPasswordChecks, passwordChecksPassed, passwordPattern } from '$lib/password'; import { getTimezone, setTimezone, detectTimezone } from '$lib/stores/timezone'; @@ -448,6 +448,8 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte'; let shareTokenCopied = $state(false); let pendingDeleteShareLinkId = $state(null); let shareLinkMessage = $state<{ type: 'success' | 'error'; text: string } | null>(null); + let revealedTokens = $state>({}); + let copiedShareLinkId = $state(null); async function loadShareLinks() { shareLinks = await api.profile.listShareLinks(); @@ -516,6 +518,31 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte'; } } + async function ensureRevealedToken(link: PublicProfileLink): Promise { + if (revealedTokens[link.id]) return revealedTokens[link.id]; + try { + const result = await api.profile.revealShareLink(link.id); + revealedTokens = { ...revealedTokens, [link.id]: result.token }; + return result.token; + } catch { + return null; + } + } + + async function copyShareLinkUrl(link: PublicProfileLink) { + const token = await ensureRevealedToken(link); + if (!token) return; + await navigator.clipboard.writeText(publicShareUrl(token)); + copiedShareLinkId = link.id; + setTimeout(() => { copiedShareLinkId = null; }, 1500); + } + + async function openShareLinkUrl(link: PublicProfileLink) { + const token = await ensureRevealedToken(link); + if (!token) return; + window.open(publicShareUrl(token), '_blank', 'noopener'); + } + async function startOidcLink() { oidcMessage = null; try { @@ -1034,7 +1061,11 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte'; {$_('publicProfile.active')} {/if}

    -

    {link.token_prefix}...

    + {#if revealedTokens[link.id]} +

    {publicShareUrl(revealedTokens[link.id])}

    + {:else} +

    {link.token_prefix}...

    + {/if}

    {#if link.expires_at} {$_('publicProfile.expiresAt')}: {new Date(link.expires_at).toLocaleDateString()} @@ -1044,6 +1075,16 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte';

    + + From a1594621cc4be86334d4e4aceeaaea17b1ad6633 Mon Sep 17 00:00:00 2001 From: codebude Date: Thu, 10 Sep 2026 12:27:59 +0200 Subject: [PATCH 27/50] Add backend database to .gitignore --- .gitignore | 3 ++- backend/librislog.db | 0 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 backend/librislog.db diff --git a/.gitignore b/.gitignore index 87c957de..ab13a837 100644 --- a/.gitignore +++ b/.gitignore @@ -219,6 +219,7 @@ __marimo__/ /ideas.txt /backend/data/ +/backend/librislog.db /data/ /data-e2e/ /backend/data/ @@ -235,4 +236,4 @@ node_modules/ /.playwright-mcp /.sverklo .plan/ -/.opencode \ No newline at end of file +/.opencodebackend/librislog.db diff --git a/backend/librislog.db b/backend/librislog.db deleted file mode 100644 index e69de29b..00000000 From 1ec7f12fe71f25680907c4fa21713049d814d8ac Mon Sep 17 00:00:00 2001 From: codebude Date: Thu, 10 Sep 2026 12:43:14 +0200 Subject: [PATCH 28/50] Add validation and scrolling to share link dialog --- .../src/lib/components/ShareLinkDialog.svelte | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/src/lib/components/ShareLinkDialog.svelte b/frontend/src/lib/components/ShareLinkDialog.svelte index 244eb894..8e0cdc28 100644 --- a/frontend/src/lib/components/ShareLinkDialog.svelte +++ b/frontend/src/lib/components/ShareLinkDialog.svelte @@ -46,6 +46,7 @@ let expiresHasInput = $state(false); let tz = $state('UTC'); let dialogEl = $state(null); + let nameTouched = $state(false); function resetFromLink(value: PublicProfileLink | null) { const defaults = defaultPublicProfileVisibilityConfig(); @@ -66,6 +67,7 @@ } expiresInvalid = false; expiresHasInput = false; + nameTouched = false; } $effect(() => { @@ -125,7 +127,10 @@ function setAllSections(checked: boolean) { sections = checked ? PUBLIC_PROFILE_SECTIONS.map((s) => s.key) - : sections.filter((s) => s === 'statistics'); + : []; + if (!checked) { + statistics = []; + } } function statsForGroup(group: PublicProfileStatisticsGroup) { @@ -168,7 +173,7 @@ aria-modal="true" aria-label={link ? $_('publicProfile.dialogTitleEdit') : $_('publicProfile.dialogTitleCreate')} > -
    +
    @@ -177,18 +182,22 @@
    { e.preventDefault(); handleSave(); }}>
    { nameTouched = true; }} /> + {#if nameTouched && !name.trim()} +

    {$_('common.required')}

    + {/if}
    From ddb14c3820dc3511c5f5f95d773dfba9b2c194a0 Mon Sep 17 00:00:00 2001 From: codebude Date: Thu, 10 Sep 2026 13:10:46 +0200 Subject: [PATCH 29/50] Add language selection to public profile share links --- ...7c8_add_language_to_public_profile_link.py | 29 +++++++++++++++ backend/app/models.py | 1 + backend/app/routers/public_profile.py | 1 + backend/app/routers/share_links.py | 2 + backend/app/schemas.py | 4 ++ backend/tests/test_public_profile.py | 18 +++++++++ frontend/e2e/specs/15-public-profile.spec.ts | 37 ++++++++++++++++++- frontend/src/lib/api.ts | 2 + .../src/lib/components/ShareLinkDialog.svelte | 33 +++++++++++++++-- .../lib/components/ShareLinkDialog.test.ts | 32 +++++++++++++++- frontend/src/lib/types.ts | 2 + frontend/src/routes/p/[token]/+page.svelte | 15 +++++++- frontend/src/routes/profile/+page.svelte | 2 + 13 files changed, 170 insertions(+), 8 deletions(-) create mode 100644 backend/alembic/versions/d3e4f5a6b7c8_add_language_to_public_profile_link.py diff --git a/backend/alembic/versions/d3e4f5a6b7c8_add_language_to_public_profile_link.py b/backend/alembic/versions/d3e4f5a6b7c8_add_language_to_public_profile_link.py new file mode 100644 index 00000000..83c54eb0 --- /dev/null +++ b/backend/alembic/versions/d3e4f5a6b7c8_add_language_to_public_profile_link.py @@ -0,0 +1,29 @@ +"""add language to public_profile_link + +Revision ID: d3e4f5a6b7c8 +Revises: b2c3d4e5f6a7 +Create Date: 2026-09-10 13:00:00.000000 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = "d3e4f5a6b7c8" +down_revision: Union[str, Sequence[str], None] = "b2c3d4e5f6a7" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + with op.batch_alter_table("public_profile_link") as batch_op: + batch_op.add_column(sa.Column("language", sa.String(length=10), nullable=True)) + + +def downgrade() -> None: + with op.batch_alter_table("public_profile_link") as batch_op: + batch_op.drop_column("language") diff --git a/backend/app/models.py b/backend/app/models.py index 419db6b0..81a7affc 100644 --- a/backend/app/models.py +++ b/backend/app/models.py @@ -332,6 +332,7 @@ class PublicProfileLink(SQLModel, table=True): token: Optional[str] = Field(default=None, nullable=True) token_hash: str = Field(index=True, unique=True) audience: PublicProfileAudience = Field(default=PublicProfileAudience.public) + language: Optional[str] = Field(default=None, nullable=True) visibility_config_json: str = Field( default="{}", sa_column=Column(sa.Text, default="{}"), diff --git a/backend/app/routers/public_profile.py b/backend/app/routers/public_profile.py index ee5582cb..86ca5c31 100644 --- a/backend/app/routers/public_profile.py +++ b/backend/app/routers/public_profile.py @@ -127,6 +127,7 @@ def get_public_profile( lastname=owner.lastname if show_name else None, ), audience=link.audience, + language=link.language, expires_at=link.expires_at, visibility_config=config, books=books, diff --git a/backend/app/routers/share_links.py b/backend/app/routers/share_links.py index 27d62c83..12cb3924 100644 --- a/backend/app/routers/share_links.py +++ b/backend/app/routers/share_links.py @@ -38,6 +38,7 @@ def _to_read_model(link: PublicProfileLink) -> PublicProfileLinkRead: name=link.name, token_prefix=link.token_prefix, audience=link.audience, + language=link.language, visibility_config=parse_visibility_config(link.visibility_config_json), expires_at=link.expires_at, created_at=link.created_at, @@ -97,6 +98,7 @@ def create_share_link( token=plain_token, token_hash=hash_public_profile_token(plain_token), audience=audience, + language=body.language, visibility_config_json=serialize_visibility_config(body.visibility_config), expires_at=body.expires_at, ) diff --git a/backend/app/schemas.py b/backend/app/schemas.py index 08631ee4..e3f600c6 100644 --- a/backend/app/schemas.py +++ b/backend/app/schemas.py @@ -816,6 +816,7 @@ class PublicProfileLinkCreate(SQLModel): name: str = Field(min_length=1, max_length=255) audience: Optional[PublicProfileAudience] = None + language: Optional[str] = Field(default=None, max_length=10) visibility_config: PublicProfileVisibilityConfig = Field(default_factory=PublicProfileVisibilityConfig) expires_at: Optional[datetime] = None @@ -825,6 +826,7 @@ class PublicProfileLinkUpdate(SQLModel): name: Optional[str] = Field(default=None, min_length=1, max_length=255) audience: Optional[PublicProfileAudience] = None + language: Optional[str] = Field(default=None, max_length=10) visibility_config: Optional[PublicProfileVisibilityConfig] = None expires_at: Optional[datetime] = None @@ -836,6 +838,7 @@ class PublicProfileLinkRead(SQLModel): name: str token_prefix: str audience: PublicProfileAudience + language: Optional[str] = None visibility_config: PublicProfileVisibilityConfig expires_at: Optional[datetime] = None created_at: datetime @@ -891,6 +894,7 @@ class PublicProfileResponse(SQLModel): owner: PublicProfileUserInfo audience: PublicProfileAudience + language: Optional[str] = None expires_at: Optional[datetime] = None visibility_config: PublicProfileVisibilityConfig books: list[PublicProfileBook] = Field(default_factory=list) diff --git a/backend/tests/test_public_profile.py b/backend/tests/test_public_profile.py index 52c85c79..da836fab 100644 --- a/backend/tests/test_public_profile.py +++ b/backend/tests/test_public_profile.py @@ -38,6 +38,24 @@ def _create_book(client: Any, title: str = "Book", **overrides: Any) -> dict[str return resp.json() +def test_share_link_language_roundtrip(client: Any) -> None: + """Language is set on create, appears in list, and survives an update.""" + data = _create_share_link(client, language="de") + assert data["link"]["language"] == "de" + + listed = client.get("/api/profile/share-links") + assert listed.json()[0]["language"] == "de" + + link_id = data["link"]["id"] + resp = client.patch(f"/api/profile/share-links/{link_id}", json={"language": "fr"}) + assert resp.status_code == 200 + assert resp.json()["language"] == "fr" + + public = _public_profile(client, data["token"]) + assert public.status_code == 200 + assert public.json()["language"] == "fr" + + def test_create_share_link_returns_token_once(client: Any) -> None: data = _create_share_link(client) assert data["token"].startswith("lp_") diff --git a/frontend/e2e/specs/15-public-profile.spec.ts b/frontend/e2e/specs/15-public-profile.spec.ts index 8d4232ab..4531ed29 100644 --- a/frontend/e2e/specs/15-public-profile.spec.ts +++ b/frontend/e2e/specs/15-public-profile.spec.ts @@ -3,7 +3,11 @@ import { loginViaUi } from '../fixtures/auth.fixture'; import { SEED_USER } from '../fixtures/seed-data'; import { seedBooks } from '../fixtures/seed.api'; -async function createShareLink(page: Page, name: string, options: { sections?: string[] } = {}) { +async function createShareLink( + page: Page, + name: string, + options: { sections?: string[]; language?: string } = {} +) { const section = page.locator('#section-share-profile'); await section.scrollIntoViewIfNeeded(); await page.waitForTimeout(500); @@ -21,6 +25,10 @@ async function createShareLink(page: Page, name: string, options: { sections?: s } } + if (options.language) { + await dialog.locator('select[name="share-link-language"]').selectOption(options.language); + } + await dialog.locator('button[type="submit"]').click(); await expect(dialog).not.toBeVisible(); @@ -150,4 +158,31 @@ test.describe('Public Profile', () => { await expect(publicPage.getByText('This public profile link is no longer valid.')).toBeVisible(); await publicPage.close(); }); + + test('15.4 share link language controls the public page locale', async ({ page, browser }) => { + await page.goto('/profile'); + await page.waitForTimeout(1000); + + await seedBooks(page, [ + { title: '1984', author: 'George Orwell', page_count: 328, reading_status: 'currently_reading', date_started: '2024-10-01' } + ]); + + const shareUrl = await createShareLink(page, 'German Profile Link', { language: 'de' }); + + // Default language of the dialog follows the profile language ('en'); a German + // share link renders the public page entirely in German for anonymous viewers. + const publicPage = await openIncognito(browser, shareUrl); + await expect(publicPage.getByText('Aktuell gelesen')).toBeVisible(); + await expect(publicPage.getByText('Currently Reading')).toHaveCount(0); + await publicPage.close(); + + const dialog = page.getByRole('dialog'); + await page.locator('#section-share-profile').scrollIntoViewIfNeeded(); + await page.waitForTimeout(500); + const row = page.locator('#section-share-profile li').filter({ hasText: 'German Profile Link' }); + await row.locator('button[aria-label="Edit"]').click(); + await expect(dialog).toBeVisible(); + await expect(dialog.locator('select[name="share-link-language"]')).toHaveValue('de'); + await dialog.locator('button[aria-label="Close"]').click(); + }); }); \ No newline at end of file diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 5f383f35..5a44e05f 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -256,6 +256,7 @@ export const api = { createShareLink(data: { name: string; audience: PublicProfileAudience; + language?: string | null; visibility_config: PublicProfileVisibilityConfig; expires_at?: string | null; }): Promise { @@ -270,6 +271,7 @@ export const api = { data: Partial<{ name: string; audience: PublicProfileAudience; + language: string | null; visibility_config: PublicProfileVisibilityConfig; expires_at: string | null; }> diff --git a/frontend/src/lib/components/ShareLinkDialog.svelte b/frontend/src/lib/components/ShareLinkDialog.svelte index 8e0cdc28..5a0e9d45 100644 --- a/frontend/src/lib/components/ShareLinkDialog.svelte +++ b/frontend/src/lib/components/ShareLinkDialog.svelte @@ -18,18 +18,22 @@ PublicProfileVisibilityConfig } from '$lib/types'; import { Globe, Info, Lock } from '@lucide/svelte'; + import { SUPPORTED_LOCALES } from '$lib/i18n'; let { open = $bindable(false), link = null, + defaultLanguage = 'en', onSave, onClose }: { open?: boolean; link?: PublicProfileLink | null; + defaultLanguage?: string; onSave: (payload: { name: string; audience: PublicProfileAudience; + language: string | null; visibility_config: PublicProfileVisibilityConfig; expires_at: string | null; }) => void; @@ -38,6 +42,7 @@ let name = $state(''); let audience = $state('public'); + let language = $state(null); let sections = $state([]); let statistics = $state([]); let unlimited = $state(true); @@ -47,12 +52,14 @@ let tz = $state('UTC'); let dialogEl = $state(null); let nameTouched = $state(false); + let previousStatistics = $state([]); function resetFromLink(value: PublicProfileLink | null) { const defaults = defaultPublicProfileVisibilityConfig(); if (value) { name = value.name; audience = value.audience; + language = value.language; sections = [...value.visibility_config.sections]; statistics = [...value.visibility_config.statistics]; unlimited = !value.expires_at; @@ -60,6 +67,7 @@ } else { name = ''; audience = 'public'; + language = defaultLanguage; sections = [...defaults.sections]; statistics = [...defaults.statistics]; unlimited = true; @@ -68,6 +76,7 @@ expiresInvalid = false; expiresHasInput = false; nameTouched = false; + previousStatistics = []; } $effect(() => { @@ -102,14 +111,19 @@ if (sections.includes(key)) { sections = sections.filter((s) => s !== key); if (key === 'statistics') { + previousStatistics = [...statistics]; statistics = []; } } else { sections = [...sections, key]; - if (key === 'statistics' && statistics.length === 0) { - statistics = [ - ...PUBLIC_PROFILE_STATISTICS.filter((s) => s.defaultOn).map((s) => s.key) - ]; + if (key === 'statistics') { + if (previousStatistics.length > 0) { + statistics = [...previousStatistics]; + } else if (statistics.length === 0) { + statistics = [ + ...PUBLIC_PROFILE_STATISTICS.filter((s) => s.defaultOn).map((s) => s.key) + ]; + } } } } @@ -130,6 +144,7 @@ : []; if (!checked) { statistics = []; + previousStatistics = []; } } @@ -159,6 +174,7 @@ onSave({ name: name.trim(), audience, + language, visibility_config: { sections, statistics }, expires_at }); @@ -222,6 +238,15 @@
    +
    + {$_('settings.languageTitle')} + +
    +
    {$_('publicProfile.contentGroup')}
    diff --git a/frontend/src/lib/components/ShareLinkDialog.test.ts b/frontend/src/lib/components/ShareLinkDialog.test.ts index 98b119a5..ad51be09 100644 --- a/frontend/src/lib/components/ShareLinkDialog.test.ts +++ b/frontend/src/lib/components/ShareLinkDialog.test.ts @@ -7,7 +7,7 @@ import type { PublicProfileLink } from '$lib/types'; vi.mock('$lib/i18n', () => { const t = (key: string) => `[${key}]`; - return { _: readable(t) }; + return { _: readable(t), SUPPORTED_LOCALES: ['en', 'de', 'zh', 'es', 'fr'] }; }); function createLink(overrides?: Partial): PublicProfileLink { @@ -17,6 +17,7 @@ function createLink(overrides?: Partial): PublicProfileLink { name: 'Friends & family', token_prefix: 'lp_9f2c81a4e7d3', audience: 'public', + language: null, visibility_config, expires_at: null, created_at: '2026-01-01T00:00:00Z', @@ -58,11 +59,13 @@ describe('ShareLinkDialog', () => { const payload = onSave.mock.calls[0][0] as { name: string; audience: string; + language: string | null; expires_at: string | null; visibility_config: { sections: string[]; statistics: string[] }; }; expect(payload.name).toBe('My profile'); expect(payload.audience).toBe('public'); + expect(payload.language).toBe('en'); expect(payload.visibility_config.sections).toEqual(defaultPublicProfileVisibilityConfig().sections); expect(payload.visibility_config.statistics).toEqual(defaultPublicProfileVisibilityConfig().statistics); expect(payload.expires_at).toBeNull(); @@ -128,4 +131,31 @@ describe('ShareLinkDialog', () => { }); expect(container.querySelector('dialog')).toBeNull(); }); + + it('uses the profile language as default and prefills the link language on edit', async () => { + const onSave = vi.fn(); + const onClose = vi.fn(); + const { container, unmount } = render(ShareLinkDialog, { + props: { open: true, link: null, defaultLanguage: 'de', onSave, onClose } + }); + const langSelect = container.querySelector('select[name="share-link-language"]')!; + expect(langSelect).toBeTruthy(); + expect(langSelect.value).toBe('de'); + + await fireEvent.input(container.querySelector('input[name="share-link-name"]')!, { + target: { value: 'German' } + }); + await fireEvent.click(container.querySelector('button[type="submit"]')!); + expect((onSave.mock.calls[0][0] as { language: string | null }).language).toBe('de'); + unmount(); + + const link = createLink({ language: 'fr' }); + const onSave2 = vi.fn(); + const { container: container2, unmount: unmount2 } = render(ShareLinkDialog, { + props: { open: true, link, defaultLanguage: 'de', onSave: onSave2, onClose } + }); + const langSelect2 = container2.querySelector('select[name="share-link-language"]')!; + expect(langSelect2.value).toBe('fr'); + unmount2(); + }); }); \ No newline at end of file diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts index bb9f9fe5..740832d6 100644 --- a/frontend/src/lib/types.ts +++ b/frontend/src/lib/types.ts @@ -504,6 +504,7 @@ export interface PublicProfileLink { name: string; token_prefix: string; audience: PublicProfileAudience; + language: string | null; visibility_config: PublicProfileVisibilityConfig; expires_at: string | null; created_at: string; @@ -540,6 +541,7 @@ export interface PublicProfileBook { export interface PublicProfileResponse { owner: PublicProfileUserInfo; audience: PublicProfileAudience; + language: string | null; expires_at: string | null; visibility_config: PublicProfileVisibilityConfig; books: PublicProfileBook[]; diff --git a/frontend/src/routes/p/[token]/+page.svelte b/frontend/src/routes/p/[token]/+page.svelte index a1526c26..a629d10f 100644 --- a/frontend/src/routes/p/[token]/+page.svelte +++ b/frontend/src/routes/p/[token]/+page.svelte @@ -1,8 +1,8 @@ + +
    + {#if basket.length === 0} +
    + +

    {$_('import.basketEmpty')}

    +
    + {:else} +
      + {#each basket as item} +
    • + {#if item.candidate.cover_url} + {$_('book.cover')} + {:else} +
      + {/if} +
      +

      {item.candidate.title}

      + {#if item.candidate.authors?.length} +

      {formatAuthors(item.candidate.authors, item.candidate.author)}

      + {/if} +
      + {item.candidate.source} + {#if item.candidate.published_year} + · + {item.candidate.published_year} + {/if} + {acquisitionLabel(item.acquisitionStatus)} + {#if item.medium} + {mediumLabel(item.medium)} + {/if} +
      +
      + +
      • + {/each} +
    +
    + + {$_('import.basketCount', { values: { count: basket.length } })} + + +
    + {/if} +
    \ No newline at end of file diff --git a/frontend/src/lib/components/ImportSearch.svelte b/frontend/src/lib/components/ImportSearch.svelte index 9f3d37d1..fffbf97c 100644 --- a/frontend/src/lib/components/ImportSearch.svelte +++ b/frontend/src/lib/components/ImportSearch.svelte @@ -1,5 +1,5 @@
    @@ -399,6 +423,7 @@ {@const selected = selectedCandidate(group)} {@const groupImported = isGroupAlreadyImported(group)} {@const importingKey = `${group.key}:${group.variants.indexOf(selected)}`} + {@const inBasket = isInBasket(selected)}
  • {#if group.coverUrl} @@ -444,7 +469,7 @@ class="btn btn-xs {groupImported ? 'btn-success btn-outline' : 'btn-primary'}" disabled={groupImported || importing === importingKey || !acquisitionStatus} title={groupImported ? $_('import.alreadyImported') : ''} - onclick={() => importBook(group, 'want_to_read')} + onclick={() => importBook(group, defaultStatus)} > {importing === importingKey ? $_('common.loadingEllipsis') @@ -452,6 +477,14 @@ ? $_('import.imported') : $_('app.add')} + {#if group.variants.length > 1}
    + {#if isSelected} + ✓ {$_('import.editionSelected')} + {/if} {#if variantImported} {$_('import.alreadyImported')} {/if} diff --git a/frontend/src/lib/components/ImportSearch.test.ts b/frontend/src/lib/components/ImportSearch.test.ts index b7dcba61..6a4f7c9e 100644 --- a/frontend/src/lib/components/ImportSearch.test.ts +++ b/frontend/src/lib/components/ImportSearch.test.ts @@ -532,7 +532,11 @@ describe('ImportSearch', () => { await waitFor(() => { expect(screen.getByRole('button', { name: /^hardcover/ })).toBeInTheDocument(); }); - await fireEvent.click(screen.getByRole('button', { name: /^hardcover/ })); + const hardcoverButton = screen.getByRole('button', { name: /^hardcover/ }); + await fireEvent.click(hardcoverButton); + expect(hardcoverButton).toHaveAttribute('aria-pressed', 'true'); + expect(hardcoverButton).toHaveClass('border-primary', 'bg-primary/10', 'cursor-pointer'); + expect(hardcoverButton).toHaveTextContent('Selected'); // Google supplement appends a third variant. await fireEvent.click(screen.getByRole('button', { name: 'Search Google Books too' })); diff --git a/frontend/src/lib/i18n/locales/de.json b/frontend/src/lib/i18n/locales/de.json index 6835fc1c..91b12dd2 100644 --- a/frontend/src/lib/i18n/locales/de.json +++ b/frontend/src/lib/i18n/locales/de.json @@ -254,6 +254,7 @@ "groupExpand": "Ausgaben anzeigen", "groupCollapse": "Ausgaben ausblenden", "groupChooseEdition": "Ausgabe wählen", + "editionSelected": "Ausgewählt", "addToBasket": "Zum Warenkorb hinzufügen", "inBasket": "Im Warenkorb", "basketEmpty": "Dein Warenkorb ist leer. Suche nach Büchern, um sie hinzuzufügen.", diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json index 5e87a6b2..bdd88a9b 100644 --- a/frontend/src/lib/i18n/locales/en.json +++ b/frontend/src/lib/i18n/locales/en.json @@ -254,6 +254,7 @@ "groupExpand": "Show editions", "groupCollapse": "Hide editions", "groupChooseEdition": "Choose edition", + "editionSelected": "Selected", "addToBasket": "Add to Basket", "inBasket": "In basket", "basketEmpty": "Your basket is empty. Search for books to add.", diff --git a/frontend/src/lib/i18n/locales/es.json b/frontend/src/lib/i18n/locales/es.json index 55cba34c..8d74fe30 100644 --- a/frontend/src/lib/i18n/locales/es.json +++ b/frontend/src/lib/i18n/locales/es.json @@ -254,6 +254,7 @@ "groupExpand": "Mostrar ediciones", "groupCollapse": "Ocultar ediciones", "groupChooseEdition": "Elegir edición", + "editionSelected": "Seleccionada", "addToBasket": "Añadir a la cesta", "inBasket": "En la cesta", "basketEmpty": "Tu cesta está vacía. Busca libros para añadirlos.", diff --git a/frontend/src/lib/i18n/locales/fr.json b/frontend/src/lib/i18n/locales/fr.json index 9f17f4f1..cdb6a4ef 100644 --- a/frontend/src/lib/i18n/locales/fr.json +++ b/frontend/src/lib/i18n/locales/fr.json @@ -254,6 +254,7 @@ "groupExpand": "Afficher les éditions", "groupCollapse": "Masquer les éditions", "groupChooseEdition": "Choisir l'édition", + "editionSelected": "Sélectionnée", "addToBasket": "Ajouter au panier", "inBasket": "Dans le panier", "basketEmpty": "Votre panier est vide. Recherchez des livres à ajouter.", diff --git a/frontend/src/lib/i18n/locales/zh.json b/frontend/src/lib/i18n/locales/zh.json index d01629a7..81980c4f 100644 --- a/frontend/src/lib/i18n/locales/zh.json +++ b/frontend/src/lib/i18n/locales/zh.json @@ -254,6 +254,7 @@ "groupExpand": "显示版本", "groupCollapse": "隐藏版本", "groupChooseEdition": "选择版本", + "editionSelected": "已选择", "addToBasket": "添加到购物篮", "inBasket": "已在购物篮", "basketEmpty": "购物篮为空。搜索图书以添加。", From c26e235786e1c4fa65b2b163090418936615dd3c Mon Sep 17 00:00:00 2001 From: codebude Date: Fri, 11 Sep 2026 14:41:32 +0200 Subject: [PATCH 37/50] Document import basket and selected edition highlight in release notes --- docs/releases.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/releases.md b/docs/releases.md index 1aa433e9..2079cac6 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -39,10 +39,10 @@ LibrisLog v1.8.0 brings camera selection and zoom control to the barcode scanner -**Summary:** Adds shareable read-only public profile pages with configurable access and content, groups duplicate import-search results into expandable edition groups, makes running searches cancelable, introduces an adaptive date input with a native picker, adds optional book media and medium statistics, supports localized medium and possession searches, detects insecure camera contexts, and fixes timezone handling in the daily page statistics and progress log editing. +**Summary:** Adds shareable read-only public profile pages with configurable access and content, groups duplicate import-search results into expandable edition groups, lets you collect search results in an import basket and import them all at once, makes running searches cancelable, introduces an adaptive date input with a native picker, adds optional book media and medium statistics, supports localized medium and possession searches, detects insecure camera contexts, and fixes timezone handling in the daily page statistics and progress log editing. **Features** -- 📚 **Edition groups in the import search**: results from different providers that describe the same book (same ISBN, or same title and authors) are now grouped into expandable entries with an "N results" badge. Compare the variants side by side and import the one you want; no result is dropped anymore. See the [Library guide](/guide/using-librislog/library#how-results-are-grouped) for the exact grouping rules +- 📚 **Edition groups in the import search**: results from different providers that describe the same book (same ISBN, or same title and authors) are now grouped into expandable entries with an "N results" badge. Compare the variants side by side and import the one you want; no result is dropped anymore. The selected edition is highlighted with a border and a "Selected" badge, and every edition row shows a pointer cursor, hover feedback, and a keyboard focus ring. See the [Library guide](/guide/using-librislog/library#how-results-are-grouped) for the exact grouping rules - 🗂️ **Optional book medium**: classify books as Print, eBook, Audiobook, Comic / Graphic Novel, or Magazine / Newspaper from manual entry, search import, and book editing. Mediums can be filtered in the library, searched with `medium:`, imported/exported, and reviewed in the statistics distribution - 🌍 **Localized search values**: `medium:` and `possession:` searches accept both their original enum keys and localized display values, such as `medium:Hörbuch` and `possession:Im Besitz` - 🛑 **Cancelable book search**: while an import search is running, the Search button becomes a Cancel button, so you can stop the request and refine your query @@ -53,6 +53,7 @@ LibrisLog v1.8.0 brings camera selection and zoom control to the barcode scanner - 🎥 **Active camera name in the scanner**: the barcode scanner now shows the name of the active camera in a badge next to the switch button, so you always know which lens is being used - 🔗 **Heimdall dashboard integration**: new documentation for the LibrisLog enhanced app, which shows your reading statistics directly on [Heimdall](https://github.com/linuxserver/Heimdall) tiles - 🔗 **Shareable public profile pages**: create named, read-only profile URLs from the Profile page. Configure each link independently for public or logged-in-only access, selected profile sections and statistics, language, and an optional expiration date. Shared pages include responsive book cards, a mobile-safe reading timeline with incremental loading and hidden-book hints, full-library search with incremental loading, selectable 12-month/3-year/all-time trend ranges with value tooltips, distribution and rating panels, and the owner's generated avatar. Existing links can be copied, opened, edited, or revoked. The full URL token is only revealed on demand and is shown once after creation. See the [Profile guide](/guide/using-librislog/profile#urlprofile-sharing) for setup and security details +- 🧺 **Import basket**: search results now offer an **Add to Basket** action next to the existing **Add** button. Collected books appear in a new **Basket** tab with a live count badge, where you can review them, remove individual entries, and import everything in one go. Each entry remembers the reading status, possession status, and medium that were selected when it was added. If some books fail during a basket import, the successful ones are imported and the failed ones stay in the basket so you can retry or remove them. The same book cannot be added twice **Bug fixes** - 🗓️ **Timezone-correct daily page statistics**: pages read between two progress updates are now attributed to calendar days in the user's timezone instead of fixed 24h slots, so the pages-per-day view matches your local days. Your heatmap may shift slightly after the upgrade From d7cc3c263e7c2312be5e0b5878cc47a1b6097f48 Mon Sep 17 00:00:00 2001 From: codebude Date: Sun, 13 Sep 2026 14:13:10 +0200 Subject: [PATCH 38/50] Improved dark theme contrast and improved spacing in share url list --- frontend/src/app.css | 8 +++++++ frontend/src/routes/profile/+page.svelte | 27 ++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/frontend/src/app.css b/frontend/src/app.css index fd4fd9c2..7c62b8cd 100644 --- a/frontend/src/app.css +++ b/frontend/src/app.css @@ -61,6 +61,14 @@ --noise: 0; } +/* Keep dark cards calm while giving the page and nested surfaces clearer depth. */ +html[data-theme="dark"] { + --color-base-100: oklch(25.5% 0.018 255); + --color-base-200: oklch(19.5% 0.016 255); + --color-base-300: oklch(15.5% 0.014 255); + --color-base-content: oklch(86% 0.012 255); +} + html { scroll-behavior: smooth; } diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte index 7d3c106e..0ae71149 100644 --- a/frontend/src/routes/profile/+page.svelte +++ b/frontend/src/routes/profile/+page.svelte @@ -452,7 +452,20 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte'; let copiedShareLinkId = $state(null); async function loadShareLinks() { - shareLinks = await api.profile.listShareLinks(); + const links = await api.profile.listShareLinks(); + shareLinks = links; + + const tokens = await Promise.all( + links.map(async (link) => { + try { + const result = await api.profile.revealShareLink(link.id); + return [link.id, result.token] as const; + } catch { + return null; + } + }) + ); + revealedTokens = Object.fromEntries(tokens.filter((entry): entry is [number, string] => entry !== null)); } function openCreateShareLink() { @@ -1030,14 +1043,14 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte'; (createdShareToken = null)} duration={0}>
    {$_('publicProfile.tokenShownOnce')} -
    +
    {publicShareUrl(createdShareToken)}
    - - + {$_('publicProfile.openLink')}
    @@ -1047,11 +1060,11 @@ import ShareLinkDialog from '$lib/components/ShareLinkDialog.svelte'; {#if shareLinks.length === 0}

    {$_('profile.shareProfile.empty')}

    {:else} -
      +
        {#each shareLinks as link}
      • -
        -

        +

        +

        {link.name} {link.audience === 'public' ? $_('publicProfile.audiencePublic') : $_('publicProfile.audienceAuthenticated')} From bc1f4fd7acca708bff8ff2ad420429b6848e1f88 Mon Sep 17 00:00:00 2001 From: codebude Date: Sun, 13 Sep 2026 14:24:02 +0200 Subject: [PATCH 39/50] Switch statistics ranges to calendar-based options --- ...a1b2c3d4e5f_normalize_statistics_ranges.py | 46 +++++++++++++++++++ backend/app/schemas.py | 5 +- backend/app/services/statistics.py | 39 ++++------------ backend/tests/test_statistics.py | 32 +++++++++++-- .../components/StatisticsRangeSelector.svelte | 5 +- .../StatisticsRangeSelector.test.ts | 5 +- frontend/src/lib/i18n/locales/de.json | 5 +- frontend/src/lib/i18n/locales/en.json | 5 +- frontend/src/lib/i18n/locales/es.json | 5 +- frontend/src/lib/i18n/locales/fr.json | 5 +- frontend/src/lib/i18n/locales/zh.json | 5 +- frontend/src/lib/types.ts | 2 +- 12 files changed, 101 insertions(+), 58 deletions(-) create mode 100644 backend/alembic/versions/0a1b2c3d4e5f_normalize_statistics_ranges.py diff --git a/backend/alembic/versions/0a1b2c3d4e5f_normalize_statistics_ranges.py b/backend/alembic/versions/0a1b2c3d4e5f_normalize_statistics_ranges.py new file mode 100644 index 00000000..2298c45a --- /dev/null +++ b/backend/alembic/versions/0a1b2c3d4e5f_normalize_statistics_ranges.py @@ -0,0 +1,46 @@ +"""normalize statistics range settings + +Revision ID: 0a1b2c3d4e5f +Revises: d3e4f5a6b7c8 +Create Date: 2026-09-13 00:00:00.000000 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = "0a1b2c3d4e5f" +down_revision: Union[str, Sequence[str], None] = "d3e4f5a6b7c8" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # The old rolling ranges have no direct equivalent in the calendar-based selector. + op.execute( + sa.text( + "UPDATE usersettings " + "SET statistics_range = 'alltime' " + "WHERE statistics_range IN ('6months', '30days')" + ) + ) + op.execute( + sa.text( + "UPDATE usersettings " + "SET statistics_range = 'this_year' " + "WHERE statistics_range = '1year'" + ) + ) + + +def downgrade() -> None: + op.execute( + sa.text( + "UPDATE usersettings " + "SET statistics_range = '1year' " + "WHERE statistics_range = 'this_year'" + ) + ) diff --git a/backend/app/schemas.py b/backend/app/schemas.py index e3f600c6..a06a2b06 100644 --- a/backend/app/schemas.py +++ b/backend/app/schemas.py @@ -262,10 +262,9 @@ class YearlyBooks(SQLModel): class StatisticsRange(str, Enum): """Shared statistics time-range selector options.""" alltime = "alltime" + this_year = "this_year" + last_year = "last_year" three_years = "3years" - one_year = "1year" - six_months = "6months" - thirty_days = "30days" custom = "custom" diff --git a/backend/app/services/statistics.py b/backend/app/services/statistics.py index bab3454a..da1a9c77 100644 --- a/backend/app/services/statistics.py +++ b/backend/app/services/statistics.py @@ -112,26 +112,6 @@ def _naive_utc(dt: datetime) -> datetime: return dt -def _subtract_months(dt: datetime, months: int) -> datetime: - """Return *dt* shifted back by *months*, clamping the day if needed.""" - year, month = dt.year, dt.month - months - while month <= 0: - month += 12 - year -= 1 - last_dom = calendar.monthrange(year, month)[1] - day = min(dt.day, last_dom) - return dt.replace(year=year, month=month, day=day) - - -def _subtract_years(dt: datetime, years: int) -> datetime: - """Return *dt* shifted back by *years*, handling Feb 29 gracefully.""" - year = dt.year - years - try: - return dt.replace(year=year) - except ValueError: - return dt.replace(year=year, month=2, day=28) - - def _statistics_window( range_value: StatisticsRange, custom_from: date | None, @@ -147,7 +127,9 @@ def _statistics_window( - Custom -> from start of the custom *from* day to end of the custom *to* day (inclusive) in *tz*. - - Predefined -> ``now - delta`` (inclusive) to ``now``. + - This year -> the start of the current calendar year to ``now``. + - Last year -> the complete previous calendar year. + - Last 3 years -> the start of the calendar year two years ago to ``now``. """ if range_value == StatisticsRange.alltime: return (None, None) @@ -164,14 +146,13 @@ def _statistics_window( return (_naive_utc(start), _naive_utc(end)) end = now - if range_value == StatisticsRange.thirty_days: - start = now - timedelta(days=30) - elif range_value == StatisticsRange.six_months: - start = _subtract_months(now, 6) - elif range_value == StatisticsRange.one_year: - start = _subtract_years(now, 1) + if range_value == StatisticsRange.this_year: + start = datetime(now.year, 1, 1, tzinfo=tz) + elif range_value == StatisticsRange.last_year: + start = datetime(now.year - 1, 1, 1, tzinfo=tz) + end = datetime(now.year - 1, 12, 31, 23, 59, 59, 999999, tzinfo=tz) elif range_value == StatisticsRange.three_years: - start = _subtract_years(now, 3) + start = datetime(now.year - 2, 1, 1, tzinfo=tz) else: start = now return (_naive_utc(start), _naive_utc(end)) @@ -944,4 +925,4 @@ def _rating_sort_key(book: Book) -> tuple[int, float]: average_rating=average_rating, top_rated_books=top_rated_books, worst_rated_books=worst_rated_books, - ) \ No newline at end of file + ) diff --git a/backend/tests/test_statistics.py b/backend/tests/test_statistics.py index c5552b78..f586e953 100644 --- a/backend/tests/test_statistics.py +++ b/backend/tests/test_statistics.py @@ -10,7 +10,8 @@ from sqlmodel import Session, select from app.models import Book, ReadingProgress, ReadingStatus, UserSettings -from app.services.statistics import _extract_book_level_daily_pages +from app.schemas import StatisticsRange +from app.services.statistics import _extract_book_level_daily_pages, _statistics_window def _create_book(client: Any, **overrides: Any) -> dict[str, Any]: @@ -718,8 +719,8 @@ def test_statistics_range_filters_finished_books(client: Any) -> None: client, title="Outside", reading_status="read", - date_started=(now - timedelta(days=45)).isoformat(), - date_finished=(now - timedelta(days=40)).isoformat(), + date_started=f"{now.year - 1}-01-01T10:00:00+00:00", + date_finished=f"{now.year - 1}-01-02T10:00:00+00:00", ) _create_book( client, @@ -729,13 +730,36 @@ def test_statistics_range_filters_finished_books(client: Any) -> None: date_finished=(now - timedelta(days=2)).isoformat(), ) - response = client.get("/api/statistics?range=30days") + response = client.get("/api/statistics?range=this_year") assert response.status_code == 200 data = response.json() assert sum(item["count"] for item in data["books_finished_per_month"]) == 1 assert sum(item["count"] for item in data["books_finished_per_year"]) == 1 +def test_statistics_calendar_range_windows() -> None: + now = datetime(2026, 9, 13, 12, 0, tzinfo=timezone.utc) + tz = ZoneInfo("UTC") + + this_year_start, this_year_end = _statistics_window( + StatisticsRange.this_year, None, None, tz, now + ) + assert this_year_start == datetime(2026, 1, 1) + assert this_year_end == datetime(2026, 9, 13, 12, 0) + + last_year_start, last_year_end = _statistics_window( + StatisticsRange.last_year, None, None, tz, now + ) + assert last_year_start == datetime(2025, 1, 1) + assert last_year_end == datetime(2025, 12, 31, 23, 59, 59, 999999) + + three_years_start, three_years_end = _statistics_window( + StatisticsRange.three_years, None, None, tz, now + ) + assert three_years_start == datetime(2024, 1, 1) + assert three_years_end == datetime(2026, 9, 13, 12, 0) + + def test_statistics_custom_range_and_validation(client: Any) -> None: _create_book( client, diff --git a/frontend/src/lib/components/StatisticsRangeSelector.svelte b/frontend/src/lib/components/StatisticsRangeSelector.svelte index fd3b03f0..9fdd56f1 100644 --- a/frontend/src/lib/components/StatisticsRangeSelector.svelte +++ b/frontend/src/lib/components/StatisticsRangeSelector.svelte @@ -21,10 +21,9 @@ const options: Array<[StatisticsRange, string]> = [ ['alltime', 'statistics.rangeAllTime'], + ['this_year', 'statistics.rangeThisYear'], + ['last_year', 'statistics.rangeLastYear'], ['3years', 'statistics.rangeLast3Years'], - ['1year', 'statistics.rangeLastYear'], - ['6months', 'statistics.rangeLast6Months'], - ['30days', 'statistics.rangeLast30Days'], ['custom', 'statistics.rangeCustom'] ]; diff --git a/frontend/src/lib/components/StatisticsRangeSelector.test.ts b/frontend/src/lib/components/StatisticsRangeSelector.test.ts index b89222e2..e91abc10 100644 --- a/frontend/src/lib/components/StatisticsRangeSelector.test.ts +++ b/frontend/src/lib/components/StatisticsRangeSelector.test.ts @@ -8,10 +8,9 @@ describe('StatisticsRangeSelector', () => { const options = screen.getByRole('combobox').querySelectorAll('option'); expect([...options].map((option) => option.textContent)).toEqual([ 'All time', - 'Last 3 years', + 'This year', 'Last year', - 'Last 6 months', - 'Last 30 days', + 'Last 3 years', 'Custom' ]); }); diff --git a/frontend/src/lib/i18n/locales/de.json b/frontend/src/lib/i18n/locales/de.json index 91b12dd2..6ff36826 100644 --- a/frontend/src/lib/i18n/locales/de.json +++ b/frontend/src/lib/i18n/locales/de.json @@ -39,10 +39,9 @@ "rangeLast12Months": "Letzte 12 Monate", "refreshing": "Statistiken werden aktualisiert", "rangeAllTime": "Gesamte Zeit", - "rangeLast3Years": "Letzte 3 Jahre", + "rangeThisYear": "Dieses Jahr", "rangeLastYear": "Letztes Jahr", - "rangeLast6Months": "Letzte 6 Monate", - "rangeLast30Days": "Letzte 30 Tage", + "rangeLast3Years": "Letzte 3 Jahre", "rangeCustom": "Benutzerdefiniert", "from": "Von", "to": "Bis", diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json index bdd88a9b..61c5dc8d 100644 --- a/frontend/src/lib/i18n/locales/en.json +++ b/frontend/src/lib/i18n/locales/en.json @@ -41,10 +41,9 @@ "rangeLast12Months": "Last 12 months", "refreshing": "Updating statistics", "rangeAllTime": "All time", - "rangeLast3Years": "Last 3 years", + "rangeThisYear": "This year", "rangeLastYear": "Last year", - "rangeLast6Months": "Last 6 months", - "rangeLast30Days": "Last 30 days", + "rangeLast3Years": "Last 3 years", "rangeCustom": "Custom", "from": "From", "to": "To", diff --git a/frontend/src/lib/i18n/locales/es.json b/frontend/src/lib/i18n/locales/es.json index 8d74fe30..cfb11c8b 100644 --- a/frontend/src/lib/i18n/locales/es.json +++ b/frontend/src/lib/i18n/locales/es.json @@ -39,10 +39,9 @@ "rangeLast12Months": "Últimos 12 meses", "refreshing": "Actualizando estadísticas", "rangeAllTime": "Todo el tiempo", + "rangeThisYear": "Este año", + "rangeLastYear": "El año pasado", "rangeLast3Years": "Últimos 3 años", - "rangeLastYear": "Último año", - "rangeLast6Months": "Últimos 6 meses", - "rangeLast30Days": "Últimos 30 días", "rangeCustom": "Personalizado", "from": "Desde", "to": "Hasta", diff --git a/frontend/src/lib/i18n/locales/fr.json b/frontend/src/lib/i18n/locales/fr.json index cdb6a4ef..034a7b93 100644 --- a/frontend/src/lib/i18n/locales/fr.json +++ b/frontend/src/lib/i18n/locales/fr.json @@ -39,10 +39,9 @@ "rangeLast12Months": "12 derniers mois", "refreshing": "Mise à jour des statistiques", "rangeAllTime": "Depuis toujours", + "rangeThisYear": "Cette année", + "rangeLastYear": "L'année dernière", "rangeLast3Years": "3 dernières années", - "rangeLastYear": "Dernière année", - "rangeLast6Months": "6 derniers mois", - "rangeLast30Days": "30 derniers jours", "rangeCustom": "Personnalisé", "from": "Du", "to": "Au", diff --git a/frontend/src/lib/i18n/locales/zh.json b/frontend/src/lib/i18n/locales/zh.json index 81980c4f..d6e0813f 100644 --- a/frontend/src/lib/i18n/locales/zh.json +++ b/frontend/src/lib/i18n/locales/zh.json @@ -39,10 +39,9 @@ "rangeLast12Months": "最近12个月", "refreshing": "正在更新统计数据", "rangeAllTime": "全部时间", + "rangeThisYear": "今年", + "rangeLastYear": "去年", "rangeLast3Years": "最近3年", - "rangeLastYear": "最近一年", - "rangeLast6Months": "最近6个月", - "rangeLast30Days": "最近30天", "rangeCustom": "自定义", "from": "从", "to": "到", diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts index 2a03e1a0..3598c385 100644 --- a/frontend/src/lib/types.ts +++ b/frontend/src/lib/types.ts @@ -214,7 +214,7 @@ export interface StatisticsResponse { worst_rated_books: TopRatedBook[]; } -export type StatisticsRange = 'alltime' | '3years' | '1year' | '6months' | '30days' | 'custom'; +export type StatisticsRange = 'alltime' | 'this_year' | 'last_year' | '3years' | 'custom'; export type UserRole = 'admin' | 'user'; From f730985dfa810bcf7e6e1881dc00fdd12ffebbb7 Mon Sep 17 00:00:00 2001 From: codebude Date: Sun, 13 Sep 2026 14:28:29 +0200 Subject: [PATCH 40/50] Disable telemetry in development environment --- docker-compose.dev.yml | 1 + docs/guide/developer-setup.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 8b4d093d..2b09470f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -13,6 +13,7 @@ services: - ./data:/app/data - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro # only needed if you use custom certificates in you environment environment: + TELEMETRY_DISABLED: "true" # Development runs must not send telemetry. REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt # only needed if you use custom certificates in you environment SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt # only needed if you use custom certificates in you environment restart: unless-stopped diff --git a/docs/guide/developer-setup.md b/docs/guide/developer-setup.md index fb96b6b3..5367b826 100644 --- a/docs/guide/developer-setup.md +++ b/docs/guide/developer-setup.md @@ -64,7 +64,7 @@ Steps: uv sync cd backend uv run alembic upgrade head -uv run uvicorn app.main:app --reload --port 8000 +TELEMETRY_DISABLED=true uv run uvicorn app.main:app --reload --port 8000 ``` The backend runs on http://localhost:8000 with auto-reload on code changes. From ce0ec9798cabfd5cd8094aa48b955af15e0d3257 Mon Sep 17 00:00:00 2001 From: codebude Date: Sun, 13 Sep 2026 16:12:11 +0200 Subject: [PATCH 41/50] Add medium to data hygiene missing attributes --- backend/app/schemas.py | 1 + backend/tests/test_hygiene.py | 16 +++++++++++++++- frontend/src/lib/i18n/locales/de.json | 3 ++- frontend/src/lib/i18n/locales/en.json | 3 ++- frontend/src/lib/i18n/locales/es.json | 3 ++- frontend/src/lib/i18n/locales/fr.json | 3 ++- frontend/src/lib/i18n/locales/zh.json | 3 ++- frontend/src/lib/types.ts | 3 ++- frontend/src/routes/data-hygiene/+page.svelte | 1 + frontend/src/routes/data-hygiene/page.test.ts | 10 +++++----- 10 files changed, 34 insertions(+), 12 deletions(-) diff --git a/backend/app/schemas.py b/backend/app/schemas.py index a06a2b06..4edaff95 100644 --- a/backend/app/schemas.py +++ b/backend/app/schemas.py @@ -572,6 +572,7 @@ class HygieneAttribute(str, Enum): subtitle = "subtitle" page_count = "page_count" cover_url = "cover_url" + medium = "medium" class HygieneMissingBook(SQLModel): diff --git a/backend/tests/test_hygiene.py b/backend/tests/test_hygiene.py index 8928b334..25defe0d 100644 --- a/backend/tests/test_hygiene.py +++ b/backend/tests/test_hygiene.py @@ -5,7 +5,7 @@ from pytest import MonkeyPatch from sqlmodel import Session, col, select -from app.models import Author, Book, BookAuthor, ReadingStatus, User +from app.models import Author, Book, BookAuthor, Medium, ReadingStatus, User from app.routers import hygiene as hygiene_router from app.services.authors import normalize_author_list @@ -28,6 +28,7 @@ def _create_book(session: Session, user_id: int, **overrides: object) -> Book: "blurb": "A test book.", "cover_url": None, "reading_status": ReadingStatus.want_to_read, + "medium": Medium.print, "user_id": user_id, } defaults.update(overrides) @@ -158,6 +159,19 @@ def test_missing_page_count_zero_treated_as_missing(self, client: TestClient, se assert data["total"] == 1 assert data["books"][0]["title"] == "Zero Pages" + def test_missing_medium(self, client: TestClient, session: Session) -> None: + """Medium is reported as missing when it has not been set.""" + user_id = 1 + _create_book(session, user_id, title="Print book", medium=Medium.print) + _create_book(session, user_id, title="Missing medium", medium=None) + + resp = client.get("/api/hygiene/missing?attributes=medium") + assert resp.status_code == 200 + data = resp.json() + assert data["total"] == 1 + assert data["books"][0]["title"] == "Missing medium" + assert data["total_missing_per_attribute"]["medium"] == 1 + class TestBatchUpdate: def test_batch_update_single_field(self, client: TestClient, session: Session) -> None: diff --git a/frontend/src/lib/i18n/locales/de.json b/frontend/src/lib/i18n/locales/de.json index 6ff36826..23d0437d 100644 --- a/frontend/src/lib/i18n/locales/de.json +++ b/frontend/src/lib/i18n/locales/de.json @@ -802,7 +802,8 @@ "language": "Sprache", "subtitle": "Untertitel", "page_count": "Seitenanzahl", - "cover_url": "Cover" + "cover_url": "Cover", + "medium": "Medium" }, "matchAny": "Beliebiges", "matchAll": "Alle", diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json index 61c5dc8d..8e3f5ba9 100644 --- a/frontend/src/lib/i18n/locales/en.json +++ b/frontend/src/lib/i18n/locales/en.json @@ -802,7 +802,8 @@ "language": "Language", "subtitle": "Subtitle", "page_count": "Page count", - "cover_url": "Cover" + "cover_url": "Cover", + "medium": "Medium" }, "matchAny": "Match any", "matchAll": "Match all", diff --git a/frontend/src/lib/i18n/locales/es.json b/frontend/src/lib/i18n/locales/es.json index cfb11c8b..da8bfb16 100644 --- a/frontend/src/lib/i18n/locales/es.json +++ b/frontend/src/lib/i18n/locales/es.json @@ -802,7 +802,8 @@ "language": "Idioma", "subtitle": "Subtítulo", "page_count": "Nº de páginas", - "cover_url": "Portada" + "cover_url": "Portada", + "medium": "Medio" }, "matchAny": "Coincidir cualquiera", "matchAll": "Coincidir todos", diff --git a/frontend/src/lib/i18n/locales/fr.json b/frontend/src/lib/i18n/locales/fr.json index 034a7b93..284e3948 100644 --- a/frontend/src/lib/i18n/locales/fr.json +++ b/frontend/src/lib/i18n/locales/fr.json @@ -802,7 +802,8 @@ "language": "Langue", "subtitle": "Sous-titre", "page_count": "Nombre de pages", - "cover_url": "Couverture" + "cover_url": "Couverture", + "medium": "Support" }, "matchAny": "Correspond à l'un", "matchAll": "Correspond à tous", diff --git a/frontend/src/lib/i18n/locales/zh.json b/frontend/src/lib/i18n/locales/zh.json index d6e0813f..d431dbbe 100644 --- a/frontend/src/lib/i18n/locales/zh.json +++ b/frontend/src/lib/i18n/locales/zh.json @@ -802,7 +802,8 @@ "language": "语言", "subtitle": "副标题", "page_count": "页数", - "cover_url": "封面" + "cover_url": "封面", + "medium": "媒介" }, "matchAny": "匹配任一", "matchAll": "匹配全部", diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts index 3598c385..bc765674 100644 --- a/frontend/src/lib/types.ts +++ b/frontend/src/lib/types.ts @@ -433,7 +433,8 @@ export type HygieneAttribute = | 'language' | 'subtitle' | 'page_count' - | 'cover_url'; + | 'cover_url' + | 'medium'; export interface HygieneMissingBook { id: number; diff --git a/frontend/src/routes/data-hygiene/+page.svelte b/frontend/src/routes/data-hygiene/+page.svelte index a20d60c5..67c53728 100644 --- a/frontend/src/routes/data-hygiene/+page.svelte +++ b/frontend/src/routes/data-hygiene/+page.svelte @@ -22,6 +22,7 @@ { key: 'subtitle', labelKey: 'dataHygiene.attributes.subtitle' }, { key: 'page_count', labelKey: 'dataHygiene.attributes.page_count' }, { key: 'cover_url', labelKey: 'dataHygiene.attributes.cover_url' }, + { key: 'medium', labelKey: 'dataHygiene.attributes.medium' }, ]; let selectedAttributes = $state([]); diff --git a/frontend/src/routes/data-hygiene/page.test.ts b/frontend/src/routes/data-hygiene/page.test.ts index 5d62533b..7a940a30 100644 --- a/frontend/src/routes/data-hygiene/page.test.ts +++ b/frontend/src/routes/data-hygiene/page.test.ts @@ -47,7 +47,7 @@ function mockBook(id: number, overrides?: Partial): HygieneM const emptyPerAttribute = { author: 0, isbn: 0, publisher: 0, published_year: 0, - blurb: 0, language: 0, subtitle: 0, page_count: 0, cover_url: 0, + blurb: 0, language: 0, subtitle: 0, page_count: 0, cover_url: 0, medium: 0, }; describe('DataHygienePage', () => { @@ -88,7 +88,7 @@ describe('DataHygienePage', () => { expect(mockListMissing).toHaveBeenCalledWith({ attributes: [ 'author', 'isbn', 'publisher', 'published_year', - 'blurb', 'language', 'subtitle', 'page_count', 'cover_url', + 'blurb', 'language', 'subtitle', 'page_count', 'cover_url', 'medium', ], match: 'any', offset: 0, @@ -96,14 +96,14 @@ describe('DataHygienePage', () => { }); }); - it('displays all 9 attribute chips', async () => { + it('displays all 10 attribute chips', async () => { render(DataHygienePage); const chips = await screen.findAllByRole('button'); const attrChips = chips.filter(c => - /Author|ISBN|Publisher|Year|Description|Language|Subtitle|Page count|Cover/.test(c.textContent || '') + /Author|ISBN|Publisher|Year|Description|Language|Subtitle|Page count|Cover|Medium/.test(c.textContent || '') ); - expect(attrChips).toHaveLength(9); + expect(attrChips).toHaveLength(10); }); it('shows per-attribute missing counts on chips', async () => { From d71bab8aa1f29b5171e69a2684045785d8051366 Mon Sep 17 00:00:00 2001 From: codebude Date: Tue, 15 Sep 2026 07:59:19 +0200 Subject: [PATCH 42/50] Add configurable reading date automation to profile settings --- ...reading_date_automation_to_usersettings.py | 33 +++++ backend/app/models.py | 2 + backend/app/routers/books.py | 61 +++++++-- backend/app/routers/profile.py | 13 +- backend/app/schemas.py | 12 ++ backend/app/services/data_import.py | 4 +- backend/tests/test_books.py | 121 ++++++++++++++++++ backend/tests/test_data.py | 30 +++++ backend/tests/test_data_import.py | 3 +- backend/tests/test_profile.py | 32 +++++ docs/guide/database-layout.md | 2 + docs/guide/using-librislog/profile.md | 15 +++ frontend/src/lib/components/BookDrawer.svelte | 24 ++++ .../src/lib/components/BookDrawer.test.ts | 7 + frontend/src/lib/components/DataImport.svelte | 8 ++ frontend/src/lib/i18n/index.ts | 4 +- frontend/src/lib/i18n/locales/de.json | 12 ++ frontend/src/lib/i18n/locales/en.json | 12 ++ frontend/src/lib/i18n/locales/es.json | 12 ++ frontend/src/lib/i18n/locales/fr.json | 12 ++ frontend/src/lib/i18n/locales/zh.json | 12 ++ frontend/src/lib/stores/userSettings.ts | 28 ++++ frontend/src/lib/types.ts | 3 + frontend/src/routes/profile/+page.svelte | 58 +++++++++ 24 files changed, 501 insertions(+), 19 deletions(-) create mode 100644 backend/alembic/versions/d7e8f9a0b1c2_add_reading_date_automation_to_usersettings.py create mode 100644 frontend/src/lib/stores/userSettings.ts diff --git a/backend/alembic/versions/d7e8f9a0b1c2_add_reading_date_automation_to_usersettings.py b/backend/alembic/versions/d7e8f9a0b1c2_add_reading_date_automation_to_usersettings.py new file mode 100644 index 00000000..1ad11b3d --- /dev/null +++ b/backend/alembic/versions/d7e8f9a0b1c2_add_reading_date_automation_to_usersettings.py @@ -0,0 +1,33 @@ +"""add reading date automation settings + +Revision ID: d7e8f9a0b1c2 +Revises: 0a1b2c3d4e5f +Create Date: 2026-09-14 00:00:00.000000 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +revision: str = "d7e8f9a0b1c2" +down_revision: Union[str, Sequence[str], None] = "0a1b2c3d4e5f" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + op.add_column( + "usersettings", + sa.Column("auto_set_date_started", sa.Boolean(), nullable=False, server_default=sa.true()), + ) + op.add_column( + "usersettings", + sa.Column("auto_set_date_finished", sa.Boolean(), nullable=False, server_default=sa.true()), + ) + + +def downgrade() -> None: + op.drop_column("usersettings", "auto_set_date_finished") + op.drop_column("usersettings", "auto_set_date_started") diff --git a/backend/app/models.py b/backend/app/models.py index 81a7affc..88e5db2d 100644 --- a/backend/app/models.py +++ b/backend/app/models.py @@ -221,6 +221,8 @@ class UserSettings(SQLModel, table=True): goal_books_per_year_enabled: bool = Field(default=False) goal_books_per_year: int = Field(default=25, ge=1) gamification_enabled: bool = Field(default=True) + auto_set_date_started: bool = Field(default=True) + auto_set_date_finished: bool = Field(default=True) statistics_range: str = Field(default="alltime", max_length=20) statistics_custom_from: Optional[date] = Field(default=None) statistics_custom_to: Optional[date] = Field(default=None) diff --git a/backend/app/routers/books.py b/backend/app/routers/books.py index a1ca29f0..7808f1b6 100644 --- a/backend/app/routers/books.py +++ b/backend/app/routers/books.py @@ -12,7 +12,7 @@ from app.auth import require_user from app.config import settings from app.database import get_session -from app.models import AcquisitionStatus, Author, Book, BookAuthor, BookTag, Medium, ReadingProgress, ReadingStatus, Tag, User +from app.models import AcquisitionStatus, Author, Book, BookAuthor, BookTag, Medium, ReadingProgress, ReadingStatus, Tag, User, UserSettings from app.schemas import ( BookCreate, BookListResponse, @@ -60,23 +60,36 @@ def _utcnow() -> datetime: return utcnow() +def _reading_date_automation_settings(session: Session, user_id: int) -> tuple[bool, bool]: + """Return start/finish date automation preferences, defaulting to enabled.""" + settings = session.exec( + select(UserSettings).where(UserSettings.user_id == user_id) + ).first() + if settings is None: + return True, True + return settings.auto_set_date_started, settings.auto_set_date_finished + + def _apply_status_transition_dates( book: Book, target_status: ReadingStatus, update_data: dict, skip_auto_date_started: bool = False, + *, + auto_set_date_started: bool = True, + auto_set_date_finished: bool = True, ) -> None: """Auto-fill date_started / date_finished when transitioning to a new status.""" if target_status == book.reading_status: return - if target_status == ReadingStatus.currently_reading: + if target_status == ReadingStatus.currently_reading and auto_set_date_started: if skip_auto_date_started: update_data.setdefault("date_started", None) elif book.date_started is None and update_data.get("date_started") is None: update_data["date_started"] = _utcnow() - if target_status in (ReadingStatus.read, ReadingStatus.did_not_finish): + if target_status in (ReadingStatus.read, ReadingStatus.did_not_finish) and auto_set_date_finished: if update_data.get("date_finished") is None: update_data["date_finished"] = _utcnow() @@ -242,11 +255,14 @@ def list_books( book_ids = [b.id for b in books if b.id is not None] book_tags_map = load_tags_batch(session, book_ids) if book_ids else {} book_authors_map = load_authors_batch(session, book_ids) if book_ids else {} - return BookListResponse( - books=[ + book_reads: list[BookRead] = [] + for book in books: + assert book.id is not None + book_reads.append( _build_book_read_with_tags(book, book_tags_map.get(book.id), book_authors_map.get(book.id)) - for book in books - ], + ) + return BookListResponse( + books=book_reads, total=total, ) @@ -511,6 +527,9 @@ async def update_book( ) authors_provided = authors_payload is not None target_status = update_data.get("reading_status", book.reading_status) + auto_set_date_started, auto_set_date_finished = _reading_date_automation_settings( + session, current_user.id + ) # Download external cover URL -> local file. if "cover_url" in update_data and is_external_cover_url(update_data["cover_url"]): @@ -540,7 +559,13 @@ async def update_book( if not shared: delete_cover_file(old_filename, settings.covers_dir) - _apply_status_transition_dates(book, target_status, update_data) + _apply_status_transition_dates( + book, + target_status, + update_data, + auto_set_date_started=auto_set_date_started, + auto_set_date_finished=auto_set_date_finished, + ) _validate_dates(update_data) _validate_date_finished_for_read(book, update_data, target_status) @@ -577,6 +602,7 @@ def transition_status( session: Session = Depends(get_session), ) -> StatusTransitionResponse: """Change a book's reading status with date-conflict detection and resolution.""" + assert current_user.id is not None logger.debug( "transition_status — id=%s new_status=%s force_date_started=%r force_date_finished=%r", book_id, transition.new_status, transition.force_date_started, transition.force_date_finished, @@ -588,6 +614,9 @@ def transition_status( conflict: DateConflict | None = None update_data: dict = {"reading_status": transition.new_status} now = _utcnow() + auto_set_date_started, auto_set_date_finished = _reading_date_automation_settings( + session, current_user.id + ) # date_finished handling is split into two passes: # 1. Inline below — conflict detection when moving TO read/did_not_finish @@ -602,17 +631,17 @@ def transition_status( and book.date_started is not None and not transition.skip_auto_date_started ): - if transition.force_date_started is None: + if transition.force_date_started is None and auto_set_date_started: conflict = DateConflict( field="date_started", existing_date=book.date_started, suggested_date=now, ) return StatusTransitionResponse(book=build_book_read(session, book), date_conflict=conflict) - update_data["date_started"] = transition.force_date_started if ( - book.date_finished is not None + transition.force_date_started is not None + and book.date_finished is not None and transition.force_date_started > book.date_finished ): conflict = DateConflict( @@ -642,6 +671,7 @@ def transition_status( and book.date_started is None and book.date_finished is not None and transition.force_date_started is None + and auto_set_date_started and not transition.skip_auto_date_started ): conflict = DateConflict( @@ -681,7 +711,14 @@ def transition_status( if transition.force_date_finished is not None: update_data["date_finished"] = transition.force_date_finished - _apply_status_transition_dates(book, transition.new_status, update_data, transition.skip_auto_date_started) + _apply_status_transition_dates( + book, + transition.new_status, + update_data, + transition.skip_auto_date_started, + auto_set_date_started=auto_set_date_started, + auto_set_date_finished=auto_set_date_finished, + ) _validate_dates(update_data) _validate_date_finished_for_read(book, update_data, transition.new_status) book.sqlmodel_update(update_data) diff --git a/backend/app/routers/profile.py b/backend/app/routers/profile.py index 5f4ef840..4358f08d 100644 --- a/backend/app/routers/profile.py +++ b/backend/app/routers/profile.py @@ -32,6 +32,7 @@ EmbedTokenRead, EmbedTokenUpdate, ProfileUpdate, + StatisticsRange, UserRead, UserSettingsRead, UserSettingsUpdate, @@ -99,6 +100,7 @@ def get_settings( session.add(settings) session.commit() session.refresh(settings) + assert settings.user_id is not None return UserSettingsRead( user_id=settings.user_id, language=settings.language, @@ -114,7 +116,9 @@ def get_settings( goal_books_per_year_enabled=settings.goal_books_per_year_enabled, goal_books_per_year=settings.goal_books_per_year, gamification_enabled=settings.gamification_enabled, - statistics_range=settings.statistics_range, + auto_set_date_started=settings.auto_set_date_started, + auto_set_date_finished=settings.auto_set_date_finished, + statistics_range=StatisticsRange(settings.statistics_range), statistics_custom_from=settings.statistics_custom_from, statistics_custom_to=settings.statistics_custom_to, ) @@ -151,6 +155,7 @@ def update_settings( session.add(settings) session.commit() session.refresh(settings) + assert settings.user_id is not None return UserSettingsRead( user_id=settings.user_id, language=settings.language, @@ -166,7 +171,9 @@ def update_settings( goal_books_per_year_enabled=settings.goal_books_per_year_enabled, goal_books_per_year=settings.goal_books_per_year, gamification_enabled=settings.gamification_enabled, - statistics_range=settings.statistics_range, + auto_set_date_started=settings.auto_set_date_started, + auto_set_date_finished=settings.auto_set_date_finished, + statistics_range=StatisticsRange(settings.statistics_range), statistics_custom_from=settings.statistics_custom_from, statistics_custom_to=settings.statistics_custom_to, ) @@ -369,7 +376,7 @@ def rotate_embed_token( token.revoked_at = now session.add(token) - + assert current_user.id is not None plain_token = generate_embed_token() new_token = EmbedToken( user_id=current_user.id, diff --git a/backend/app/schemas.py b/backend/app/schemas.py index 4edaff95..ab67e627 100644 --- a/backend/app/schemas.py +++ b/backend/app/schemas.py @@ -433,6 +433,8 @@ class UserSettingsRead(SQLModel): goal_books_per_year_enabled: bool goal_books_per_year: int gamification_enabled: bool + auto_set_date_started: bool + auto_set_date_finished: bool statistics_range: StatisticsRange statistics_custom_from: Optional[date] = None statistics_custom_to: Optional[date] = None @@ -453,10 +455,19 @@ class UserSettingsUpdate(SQLModel): goal_books_per_year_enabled: Optional[bool] = None goal_books_per_year: Optional[int] = Field(default=None, ge=1) gamification_enabled: Optional[bool] = None + auto_set_date_started: Optional[bool] = None + auto_set_date_finished: Optional[bool] = None statistics_range: Optional[StatisticsRange] = None statistics_custom_from: Optional[date] = None statistics_custom_to: Optional[date] = None + @field_validator("auto_set_date_started", "auto_set_date_finished") + @classmethod + def validate_date_automation_setting(cls, value: Optional[bool]) -> Optional[bool]: + if value is None: + raise ValueError("Reading date automation settings cannot be null") + return value + @field_validator('theme') @classmethod def validate_theme(cls, v: Optional[str]) -> Optional[str]: @@ -715,6 +726,7 @@ class DataImportPreviewRow(SQLModel): source: dict[str, Any] transformed: dict[str, Any] errors: list[str] + warnings: list[str] = Field(default_factory=list) class DataImportPreviewRequest(SQLModel): diff --git a/backend/app/services/data_import.py b/backend/app/services/data_import.py index 8e18be4a..d90817af 100644 --- a/backend/app/services/data_import.py +++ b/backend/app/services/data_import.py @@ -686,6 +686,7 @@ def preview_import( for idx, row in enumerate(rows[:limit], start=1): row_errors: list[str] = [] + row_warnings: list[str] = [] row_data = _mapped_row(row, mapping, transform_cache, {"row": idx, "total": len(rows)}, row_errors) # Validate required fields and data types for preview @@ -742,7 +743,7 @@ def preview_import( ) if reading_status == ReadingStatus.read and not date_finished: - row_errors.append( + row_warnings.append( "Marked as 'read' but has no finished date; " "without a finish date the book will not count toward monthly statistics" ) @@ -757,6 +758,7 @@ def preview_import( "source": source_display, "transformed": transformed_display, "errors": row_errors, + "warnings": row_warnings, }) return {"preview_rows": preview_rows, "row_count": len(rows), "errors": []} diff --git a/backend/tests/test_books.py b/backend/tests/test_books.py index 76b866c4..ef0a8bce 100644 --- a/backend/tests/test_books.py +++ b/backend/tests/test_books.py @@ -663,6 +663,96 @@ def test_update_book_sets_date_finished_when_moving_to_read(client: TestClient, assert resp.json()["date_finished"].startswith("2026-05-11T10:30:00") +def test_transition_status_respects_disabled_date_automation(client: TestClient) -> None: + settings_response = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": False, "auto_set_date_finished": False}, + ) + assert settings_response.status_code == 200 + + book = _create_book(client, title="Undated transition") + reading = client.post( + f"/api/books/{book['id']}/transition-status", + json={"new_status": "currently_reading"}, + ) + assert reading.status_code == 200 + assert reading.json()["book"]["date_started"] is None + + finished = client.post( + f"/api/books/{book['id']}/transition-status", + json={"new_status": "read"}, + ) + assert finished.status_code == 200 + assert finished.json()["book"]["date_finished"] is None + + +def test_transition_status_respects_each_date_automation_setting_independently(client: TestClient) -> None: + settings_response = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": False, "auto_set_date_finished": True}, + ) + assert settings_response.status_code == 200 + + book = _create_book(client, title="Independent start setting") + reading = client.post( + f"/api/books/{book['id']}/transition-status", + json={"new_status": "currently_reading"}, + ) + assert reading.status_code == 200 + assert reading.json()["book"]["date_started"] is None + + finished = client.post( + f"/api/books/{book['id']}/transition-status", + json={"new_status": "read"}, + ) + assert finished.status_code == 200 + assert finished.json()["book"]["date_finished"] is not None + + settings_response = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": True, "auto_set_date_finished": False}, + ) + assert settings_response.status_code == 200 + + second_book = _create_book(client, title="Independent finish setting") + second_reading = client.post( + f"/api/books/{second_book['id']}/transition-status", + json={"new_status": "currently_reading"}, + ) + assert second_reading.status_code == 200 + assert second_reading.json()["book"]["date_started"] is not None + + second_finished = client.post( + f"/api/books/{second_book['id']}/transition-status", + json={"new_status": "read"}, + ) + assert second_finished.status_code == 200 + assert second_finished.json()["book"]["date_finished"] is None + + +def test_update_book_respects_disabled_date_automation(client: TestClient) -> None: + settings_response = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": False, "auto_set_date_finished": False}, + ) + assert settings_response.status_code == 200 + + book = _create_book(client, title="Undated update") + reading = client.patch( + f"/api/books/{book['id']}", + json={"reading_status": "currently_reading"}, + ) + assert reading.status_code == 200 + assert reading.json()["date_started"] is None + + finished = client.patch( + f"/api/books/{book['id']}", + json={"reading_status": "read"}, + ) + assert finished.status_code == 200 + assert finished.json()["date_finished"] is None + + def test_update_book_does_not_override_existing_date_started(client: TestClient, monkeypatch: MonkeyPatch) -> None: book = _create_book( client, @@ -918,6 +1008,37 @@ def test_transition_status_chained_detects_started_after_finished(client: TestCl } +def test_transition_status_keeps_started_after_finished_conflict_with_auto_start_disabled( + client: TestClient, +) -> None: + settings_response = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": False}, + ) + assert settings_response.status_code == 200 + + book = _create_book( + client, + title="Explicit invalid start", + reading_status="read", + date_started="2024-01-01", + date_finished="2024-02-02", + ) + response = client.post( + f"/api/books/{book['id']}/transition-status", + json={ + "new_status": "currently_reading", + "force_date_started": "2026-05-11T10:30:00Z", + }, + ) + assert response.status_code == 200 + data = response.json() + assert data["book"]["reading_status"] == "read" + assert data["book"]["date_started"] == "2024-01-01T00:00:00Z" + assert data["book"]["date_finished"] == "2024-02-02T00:00:00Z" + assert data["date_conflict"]["field"] == "started_after_finished" + + def test_transition_status_chained_option_a_clear_finished(client: TestClient, monkeypatch: MonkeyPatch) -> None: """Resolve started_after_finished with force_date_started + skip → clears date_finished.""" book = _create_book( diff --git a/backend/tests/test_data.py b/backend/tests/test_data.py index 2b39245d..49ff2751 100644 --- a/backend/tests/test_data.py +++ b/backend/tests/test_data.py @@ -285,6 +285,36 @@ def test_data_import_validate_and_execute_continue_on_error(client: TestClient, assert complete["failed"] == 1 +def test_data_import_preview_allows_read_book_without_finished_date( + client: TestClient, monkeypatch: MonkeyPatch, tmp_path: Path, +) -> None: + monkeypatch.setattr(settings, "import_temp_dir", str(tmp_path / "import_temp_dir")) + csv_payload = "Title,Author,Status,Availability\nDune,Frank Herbert,read,owned\n" + parse_resp = client.post( + "/api/data/import/parse", + files={"file": ("books.csv", csv_payload, "text/csv")}, + ) + file_id = parse_resp.json()["file_id"] + + preview_resp = client.post( + "/api/data/import/preview", + json={ + "file_id": file_id, + "mapping": { + "title": {"source": "Title", "transform": None}, + "author": {"source": "Author", "transform": None}, + "reading_status": {"source": "Status", "transform": None}, + "acquisition_status": {"source": "Availability", "transform": None}, + }, + }, + ) + assert preview_resp.status_code == 200 + preview = preview_resp.json() + assert preview["errors"] == [] + assert preview["preview_rows"][0]["errors"] == [] + assert any("no finished date" in warning for warning in preview["preview_rows"][0]["warnings"]) + + def test_data_import_execute_rollback_all_rolls_back(client: TestClient, monkeypatch: MonkeyPatch, tmp_path: Path) -> None: monkeypatch.setattr(settings, "import_temp_dir", str(tmp_path / "import_temp")) csv_payload = "Title,Author\nDune,Frank Herbert\n,Missing\n" diff --git a/backend/tests/test_data_import.py b/backend/tests/test_data_import.py index 2d1f36e8..ec0b955b 100644 --- a/backend/tests/test_data_import.py +++ b/backend/tests/test_data_import.py @@ -1493,7 +1493,8 @@ def test_preview_import_read_without_finished_date( result = di.preview_import( file_id, user, {"title": ImportFieldConfig(source="title"), "reading_status": ImportFieldConfig(source="status")} ) - assert any("no finished date" in e for e in result["preview_rows"][0]["errors"]) + assert result["preview_rows"][0]["errors"] == [] + assert any("no finished date" in warning for warning in result["preview_rows"][0]["warnings"]) def test_preview_import_require_acquisition_status_invalid( diff --git a/backend/tests/test_profile.py b/backend/tests/test_profile.py index 9c48d846..02cc06f8 100644 --- a/backend/tests/test_profile.py +++ b/backend/tests/test_profile.py @@ -42,6 +42,8 @@ def test_get_settings_creates_default_when_missing(client: TestClient, session: data = resp.json() assert data["language"] == "en" assert data["user_id"] == user.id + assert data["auto_set_date_started"] is True + assert data["auto_set_date_finished"] is True def test_update_settings_creates_default_when_missing(client: TestClient, session: Session) -> None: @@ -90,6 +92,36 @@ def test_statistics_range_settings_are_persisted(client: TestClient) -> None: assert restored.json()["statistics_range"] == "custom" +def test_reading_date_automation_settings_are_persisted(client: TestClient) -> None: + response = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": False, "auto_set_date_finished": False}, + ) + assert response.status_code == 200 + data = response.json() + assert data["auto_set_date_started"] is False + assert data["auto_set_date_finished"] is False + + restored = client.get("/api/profile/settings") + assert restored.status_code == 200 + assert restored.json()["auto_set_date_started"] is False + assert restored.json()["auto_set_date_finished"] is False + + partial = client.patch( + "/api/profile/settings", + json={"auto_set_date_started": True}, + ) + assert partial.status_code == 200 + assert partial.json()["auto_set_date_started"] is True + assert partial.json()["auto_set_date_finished"] is False + + null_value = client.patch( + "/api/profile/settings", + json={"auto_set_date_finished": None}, + ) + assert null_value.status_code == 422 + + def test_statistics_range_settings_reject_invalid_dates(client: TestClient) -> None: response = client.patch( "/api/profile/settings", diff --git a/docs/guide/database-layout.md b/docs/guide/database-layout.md index f69d0f6c..ca9b3ade 100644 --- a/docs/guide/database-layout.md +++ b/docs/guide/database-layout.md @@ -298,6 +298,8 @@ Per-user settings such as language, timezone, and theme. | `timezone` | `VARCHAR(64)` | NOT NULL | default `UTC` | | `theme` | `VARCHAR(20)` | NOT NULL | default `light` | | `custom_theme` | `VARCHAR(30)` | | | +| `auto_set_date_started` | `BOOLEAN` | NOT NULL | default `true` | +| `auto_set_date_finished` | `BOOLEAN` | NOT NULL | default `true` | ### `book_author` diff --git a/docs/guide/using-librislog/profile.md b/docs/guide/using-librislog/profile.md index 0006c039..8cbdd7ae 100644 --- a/docs/guide/using-librislog/profile.md +++ b/docs/guide/using-librislog/profile.md @@ -43,6 +43,21 @@ The **"Show reading streaks & goals on dashboard"** switch above the goals disab See [Dashboard → Reading Streaks & Goals](/guide/using-librislog/dashboard#reading-streaks-goals) for details on how streaks and goal progress are calculated. +## Reading Date Automation + +By default, LibrisLog fills in missing reading dates when you change a book's status: + +- Moving a book to **Currently Reading** sets its start date to the current date and time if no start date exists. +- Moving a book to **Read** or **Did Not Finish** sets its finish date to the current date and time if no finish date exists. + +Existing dates entered by you are preserved and are never overwritten automatically. + +You can disable these behaviors independently in the **Reading Date Automation** section of your profile. When disabled, the status still changes, but the corresponding date remains empty. This is useful when you know a book's status but do not know when you started or finished it. + +Books without the relevant dates are omitted from date-based views and calculations, such as the reading timeline, finished-books-by-month charts, reading duration, and date-based goals. They remain included in status-based totals, such as the number of books marked **Read**. + +Disabling automation does not remove existing dates or disable date-conflict protection. It only prevents LibrisLog from creating a missing date automatically. + ## URL/Profile Sharing Create a read-only public view of your reading profile and share it with a URL. The shared page does not expose editing controls, notes, blurbs, or your email address. diff --git a/frontend/src/lib/components/BookDrawer.svelte b/frontend/src/lib/components/BookDrawer.svelte index 202a6367..50aa76b0 100644 --- a/frontend/src/lib/components/BookDrawer.svelte +++ b/frontend/src/lib/components/BookDrawer.svelte @@ -1,10 +1,12 @@