diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml deleted file mode 100644 index 8c2fb8d..0000000 --- a/.forgejo/workflows/ci.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: CI - -on: - push: - -jobs: - test: - runs-on: docker - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install system dependencies - run: | - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3-venv pipx libgl1 libxcb-cursor0 libxkbcommon-x11-0 libegl1 libdbus-1-3 \ - libopengl0 libx11-6 libxext6 libxi6 libxrender1 libxrandr2 \ - libxcb1 libxcb-render0 libxcb-keysyms1 libxcb-image0 libxcb-shm0 \ - libxcb-icccm4 libxcb-xfixes0 libxcb-shape0 libxcb-randr0 libxcb-xinerama0 \ - libxkbcommon0 - - - name: Install Poetry - run: | - pipx install poetry==1.8.3 - /root/.local/bin/poetry --version - echo "$HOME/.local/bin" >> "$GITHUB_PATH" - - - name: Install project deps (including test extras) - run: | - poetry install --with test - - - name: Run test script - run: | - ./tests.sh - - # Notify if any previous step in this job failed - - name: Notify on failure - if: ${{ failure() }} - env: - WEBHOOK_URL: ${{ secrets.NODERED_WEBHOOK_URL }} - REPOSITORY: ${{ forgejo.repository }} - RUN_NUMBER: ${{ forgejo.run_number }} - SERVER_URL: ${{ forgejo.server_url }} - run: | - curl -X POST \ - -H "Content-Type: application/json" \ - -d "{\"repository\":\"$REPOSITORY\",\"run_number\":\"$RUN_NUMBER\",\"status\":\"failure\",\"url\":\"$SERVER_URL/$REPOSITORY/actions/runs/$RUN_NUMBER\"}" \ - "$WEBHOOK_URL" diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml deleted file mode 100644 index fbe5a7e..0000000 --- a/.forgejo/workflows/lint.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Lint - -on: - push: - -jobs: - test: - runs-on: docker - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install system dependencies - run: | - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - black pyflakes3 vulture python3-bandit - - - name: Run linters - run: | - black --diff --check bouquin/* - black --diff --check tests/* - pyflakes3 bouquin/* - pyflakes3 tests/* - vulture - bandit -s B110 -r bouquin/ - - # Notify if any previous step in this job failed - - name: Notify on failure - if: ${{ failure() }} - env: - WEBHOOK_URL: ${{ secrets.NODERED_WEBHOOK_URL }} - REPOSITORY: ${{ forgejo.repository }} - RUN_NUMBER: ${{ forgejo.run_number }} - SERVER_URL: ${{ forgejo.server_url }} - run: | - curl -X POST \ - -H "Content-Type: application/json" \ - -d "{\"repository\":\"$REPOSITORY\",\"run_number\":\"$RUN_NUMBER\",\"status\":\"failure\",\"url\":\"$SERVER_URL/$REPOSITORY/actions/runs/$RUN_NUMBER\"}" \ - "$WEBHOOK_URL" diff --git a/.forgejo/workflows/trivy.yml b/.forgejo/workflows/trivy.yml deleted file mode 100644 index fad2f6f..0000000 --- a/.forgejo/workflows/trivy.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Trivy - -on: - schedule: - - cron: '0 1 * * *' - push: - -jobs: - test: - runs-on: docker - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install system dependencies - run: | - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget gnupg - wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | tee /usr/share/keyrings/trivy.gpg > /dev/null - echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" | tee -a /etc/apt/sources.list.d/trivy.list - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends trivy - - - name: Run trivy - run: | - trivy fs --no-progress --ignore-unfixed --format table --disable-telemetry . - - # Notify if any previous step in this job failed - - name: Notify on failure - if: ${{ failure() }} - env: - WEBHOOK_URL: ${{ secrets.NODERED_WEBHOOK_URL }} - REPOSITORY: ${{ forgejo.repository }} - RUN_NUMBER: ${{ forgejo.run_number }} - SERVER_URL: ${{ forgejo.server_url }} - run: | - curl -X POST \ - -H "Content-Type: application/json" \ - -d "{\"repository\":\"$REPOSITORY\",\"run_number\":\"$RUN_NUMBER\",\"status\":\"failure\",\"url\":\"$SERVER_URL/$REPOSITORY/actions/runs/$RUN_NUMBER\"}" \ - "$WEBHOOK_URL" diff --git a/.gitignore b/.gitignore index 07c956d..2352872 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,3 @@ __pycache__ .pytest_cache dist .coverage -*.db -*.pdf -*.csv -*.html diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 6281daa..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,26 +0,0 @@ -repos: - - repo: https://github.com/pycqa/flake8 - rev: 7.3.0 - hooks: - - id: flake8 - args: ["--select=F"] - types: [python] - - - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.11.0 - hooks: - - id: black - language_version: python3 - - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 - hooks: - - id: trailing-whitespace - - id: end-of-file-fixer - - - repo: https://github.com/PyCQA/bandit - rev: 1.9.2 - hooks: - - id: bandit - files: ^bouquin/ - args: ["-s", "B110"] diff --git a/CHANGELOG.md b/CHANGELOG.md index 45edf09..8bcacf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,195 +1,7 @@ -# 0.7.3 - - * Allow optionally moving unchecked TODOs to the next day (even if it's the weekend) rather than next weekday. - * Add 'group by activity' in timesheet/invoice reports, rather than just by time period. - -# 0.7.2 - - * Fix Manage Reminders dialog (the actions column was missing, to edit/delete reminders) - -# 0.7.1 - - * Reduce the scope for toggling a checkbox on/off when not clicking precisely on it (must be to the left of the first letter) - * Moving unchecked TODO items to the next weekday now brings across the header that was above it, if present - * Invoicing should not be enabled by default - * Fix Reminders to fire right on the minute after adding them during runtime - * It is now possible to set up Webhooks for Reminders! A URL and a secret value (sent as X-Bouquin-Header) can be set in the Settings. - * Improvements to StatisticsDialog: it now shows statistics about logged time, reminders, etc. Sections are grouped for better readability - -# 0.7.0 - - * New Invoicing feature! This is tied to time logging and (optionally) documents and reminders features. - * Add 'Last week' to Time Report dialog range option - * Add 'Change Date' button to the History Dialog (same as the one used in Time log dialogs) - -# 0.6.4 - - * Time reports: Fix report 'group by' logic to not show ambiguous 'note' data. - * Time reports: Add default option to 'don't group'. This gives every individual time log row (and so the 'note' is shown in this case) - * Reminders: Ability to explicitly set the date of a reminder and have it handle recurrence based on that date - -# 0.6.3 - - * Allow 'this week', 'this month', 'this year' granularity in Timesheet reports. Default date range to start from this month. - * Allow 'All Projects' for timesheet reports. - * Make Reminder alarm proposed time be 5 minutes into the future (no point in being right now - that time is already passed) - * Allow more advanced recurring reminders (fortnightly, every specific day of month, monthly on the Nth weekday) - -# 0.6.2 - - * Ensure that adding a document whilst on an older date page, uses that date as its upload date - * Add 'Created at' to time log table. - * Show total hours for the day in the time log table (not just in the widget in sidebar) - * Pomodoro timer is now in the sidebar when toggled on, rather than as a separate dialog, so it stays out of the way - * Indent tabs by 4 spaces in code block editor dialog - -# 0.6.1 - - * Consolidate some code related to opening documents using the Documents feature. - * Ensure time log dialog gets closed when Pomodoro Timer finishes and user logs time. - * More code coverage - -# 0.6.0 - - * Add 'Documents' feature. Documents are tied to Projects in the same way as Time Logging, and can be tagged via the Tags feature. - * Close time log dialog if opened via the + button from sidebar widget - * Only show tags in Statistics widget if tags are enabled - * Fix rounding up/down in Pomodoro timer to the closest 15 min interval - -# 0.5.5 - - * Add + button to time log widget in side bar to have a simplified log entry dialog (without summary or report option) - * Allow click-and-drag mouse select on lines with checkbox, to capture the checkbox as well as the text. - * Allow changing the date when logging time (rather than having to go to that date before clicking on adding time log/opening time log manager) - * Ensure time log reports have an extension - -# 0.5.4 - - * Ensure pressing enter a second time on a new line with a checkbox, erases the checkbox (if it had no text added to it) - -# 0.5.3 - - * Prevent triple-click select from selecting the list item (e.g checkbox, bullet) - * Use DejaVu Sans font for regular text instead of heavier Noto - might help with the freeze issues. - * Change History icon (again) - * Make it easier to check on or off the checkbox by adding some buffer (instead of having to precisely click inside it) - * Prevent double-click of checkbox leading to selecting/highlighting it - * Slightly fade the text of a checkbox line if the checkbox is checked. - * Fix weekend date colours being incorrect on theme change while app is running - * Avoid capturing checkbox/bullet etc in the task text that would get offered as the 'note' when Pomodoro timer stops - * Code Blocks are now their own QDialog to try and reduce risk of getting trapped in / bleeding in/out of text in code blocks. - -# 0.5.2 - - * Update icon again to remove background - * Adjust History icon and reorder toolbar items - * Try to address checkbox/bullet size issues (again) - * Fix HTML export of markdown (with newlines, tables and other styling preserved) - * Remove table tool - -# 0.5.1 - - * Try to address Noto Sans font issue that works for both numbers and checkbox/bullets. - * Update icon - * Update French translations - * Improve size of flashing reminder dialog - -# 0.5 - - * More Italian translations, thank you @mdaleo404 - * Set locked status on window title when locked - * Don't exit on incorrect key, let it be tried again - * Make reminders be its own dataset rather than tied to current string. - * Add support for repeated reminders - * Make reminders be a feature that can be turned on and off - * Add syntax highlighting for code blocks (right-click to set it) - * Add a Pomodoro-style timer for measuring time spent on a task (stopping the timer offers to log it to Time Log) - * Add ability to create markdown tables. Right-click to edit the table in a friendlier table dialog - -# 0.4.5 - - * Make it possible to delete revisions - * Make it possible to force-lock the screen even if idle timer hasn't tripped - * Add shortcuts for lock and unlock of screen - * Other misc bug fixes - -# 0.4.4.1 - - * Adjust some widget heights/settings text wrap - * Adjust shortcuts - * History unicode symbol - * Icon in version dialog - -# 0.4.4 - - * Moving unchecked TODOs now includes those up to 7 days ago, not just yesterday - * Moving unchecked TODOs now skips placing them on weekends. - * Moving unchecked TODOs now automatically occurs after midnight if the app is open (not just on startup) - * Check for new version / download new AppImage via the Help -> Version screen. - * Remove extra newline after headings - -# 0.4.3 - - * Ship Noto Sans Symbols2 font, which seems to work better for unicode symbols on Fedora - -# 0.4.2 - - * Improve Statistics widget height - * Improve SaveDialog widget width - * Make Tags and TimeLog optional features that can be switched on/off in Settings (enabled by default) - * Make it possible to change regular text size - * Refactored Settings dialog to use tabs to reduce its size - -# 0.4.1 - - * Allow time log entries to be edited directly in their table cells - * Miscellaneous bug fixes for editing (list cursor positions/text selectivity, alarm removing newline) - * Add 'Close tab' nav item and shortcut - -# 0.4 - - * Remove screenshot tool - * Improve width of bug report dialog - * Improve size of checkboxes - * Convert bullet - to actual unicode bullets - * Add alarm option to set reminders - * Add time logging and reporting - -# 0.3.2 - - * Add weekday letters on left axis of Statistics page - * Allow clicking on a date in the Statistics heatmap and have it open that page - * Add the ability to choose the database path at startup - * Add in-app bug report functionality - -# 0.3.1 - - * Make it possible to add a tag from the Tag Browser - * Add a statistics dialog with heatmap - * Remove export to .txt (just use .md) - * Restore link styling and clickability - -# 0.3 - - * Introduce Tags - * Make translations dynamically detected from the locales dir rather than hardcoded - * Add Italian translations (thanks @mdaleo404) - * Add version information in the navigation - * Increase line spacing between lines (except for code blocks) - * Prevent being able to left-click a date and have it load in current tab if it is already open in another tab - * Avoid second checkbox/bullet on second newline after first newline - * Avoid Home/left arrow jumping to the left side of a list symbol - * Various test additions/fixes - -# 0.2.1.8 - - * Translate all strings, add French, add locale choice in settings - * Fix hiding status bar (including find bar) when locked - # 0.2.1.7 * Fix being able to set bold, italic and strikethrough at the same time. - * Fixes for system dark theme and move stylesheets for Calendar/Lock Overlay into the ThemeManager + * Fixes for system dark theme * Add AppImage # 0.2.1.6 diff --git a/README.md b/README.md index da87442..96bdf58 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,9 @@ # Bouquin -
- Bouquin logo -
## Introduction -Bouquin ("Book-ahn") is a notebook and planner application written in Python, Qt and SQLCipher. - -It is designed to treat each day as its own 'page', complete with Markdown rendering, tagging, -search, reminders and time logging for those of us who need to keep track of not just TODOs, but -also how long we spent on them. +Bouquin ("Book-ahn") is a simple, opinionated notebook application written in Python, PyQt and SQLCipher. It uses [SQLCipher bindings](https://pypi.org/project/sqlcipher3-wheels) as a drop-in replacement for SQLite3. This means that the underlying database for the notebook is encrypted at rest. @@ -18,66 +11,38 @@ for SQLite3. This means that the underlying database for the notebook is encrypt To increase security, the SQLCipher key is requested when the app is opened, and is not written to disk unless the user configures it to be in the settings. -There is deliberately no network connectivity or syncing intended, other than the option to send a bug -report from within the app, or optionally to check for new versions to upgrade to. +There is deliberately no network connectivity or syncing intended. ## Screenshots -### General view -
- Bouquin screenshot -
+![Screenshot of Bouquin](https://git.mig5.net/mig5/bouquin/raw/branch/main/screenshots/screenshot.png) +![Screenshot of Bouquin History Preview pane](https://git.mig5.net/mig5/bouquin/raw/branch/main/screenshots/history_preview.png) +![Screenshot of Bouquin History Diff pane](https://git.mig5.net/mig5/bouquin/raw/branch/main/screenshots/history_diff.png) -### History panes -
- Screenshot of Bouquin History Preview Pane - Screenshot of Bouquin History Diff Pane -
- -### Tags -
- Screenshot of Bouquin Tag Manager screen -
- -### Time Logging -
- Screenshot of Bouquin Time Log screens -
- - -### Statistics -
- Bouquin statistics -
- - -## Some of the features +## Features * Data is encrypted at rest * Encryption key is prompted for and never stored, unless user chooses to via Settings - * All changes are version controlled, with ability to view/diff versions, revert or delete revisions - * Automatic rendering of basic Markdown syntax + * Every 'page' is linked to the calendar day + * All changes are version controlled, with ability to view/diff versions and revert + * Text is Markdown with basic styling * Tabs are supported - right-click on a date from the calendar to open it in a new tab. * Images are supported - * Search all pages, or find text on current page - * Add and manage tags + * Search all pages, or find text on page (Ctrl+F) * Automatic periodic saving (or explicitly save) + * Transparent integrity checking of the database when it opens * Automatic locking of the app after a period of inactivity (default 15 min) * Rekey the database (change the password) - * Export the database to json, html, csv, markdown or .sql (for sqlite3) + * Export the database to json, txt, html, csv, markdown or .sql (for sqlite3) * Backup the database to encrypted SQLCipher format (which can then be loaded back in to a Bouquin) - * Dark and light theme support + * Dark and light themes * Automatically generate checkboxes when typing 'TODO' - * It is possible to automatically move unchecked checkboxes from the last 7 days to the next weekday. - * English, French and Italian locales provided - * Ability to set reminder alarms (which will be flashed as the reminder) - * Ability to log time per day for different projects/activities, pomodoro-style log timer and timesheet reports - * Ability to store and tag documents (tied to Projects, same as the Time Logging system). The documents are stored embedded in the encrypted database. + * Optionally automatically move unchecked checkboxes from yesterday to today, on startup ## How to install -Make sure you have `libxcb-cursor0` installed (on Debian-based distributions) or `xcb-util-cursor` (RedHat/Fedora-based distributions). +Make sure you have `libxcb-cursor0` installed (it may be called something else on non-Debian distributions). If downloading from my Forgejo's Releases page, you may wish to verify the GPG signatures with my [GPG key](https://mig5.net/static/mig5.asc). diff --git a/bouquin.desktop b/bouquin.desktop deleted file mode 100644 index aa519c3..0000000 --- a/bouquin.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Bouquin -Exec=Bouquin.AppImage -Icon=bouquin -Categories=Office diff --git a/bouquin/bug_report_dialog.py b/bouquin/bug_report_dialog.py deleted file mode 100644 index 0743985..0000000 --- a/bouquin/bug_report_dialog.py +++ /dev/null @@ -1,119 +0,0 @@ -from __future__ import annotations - -import importlib.metadata - -import requests -from PySide6.QtWidgets import ( - QDialog, - QDialogButtonBox, - QLabel, - QMessageBox, - QTextEdit, - QVBoxLayout, -) - -from . import strings - -BUG_REPORT_HOST = "https://nr.mig5.net" -ROUTE = "forms/bouquin/bugs" - - -class BugReportDialog(QDialog): - """ - Dialog to collect a bug report - """ - - MAX_CHARS = 5000 - - def __init__(self, parent=None): - super().__init__(parent) - self.setWindowTitle(strings._("report_a_bug")) - - layout = QVBoxLayout(self) - - header = QLabel(strings._("bug_report_explanation")) - header.setWordWrap(True) - layout.addWidget(header) - - self.text_edit = QTextEdit() - self.text_edit.setPlaceholderText(strings._("bug_report_placeholder")) - layout.addWidget(self.text_edit) - - self.text_edit.textChanged.connect(self._enforce_max_length) - - # Buttons: Cancel / Send - button_box = QDialogButtonBox(QDialogButtonBox.Cancel) - button_box.addButton(strings._("send"), QDialogButtonBox.AcceptRole) - button_box.accepted.connect(self._send) - button_box.rejected.connect(self.reject) - layout.addWidget(button_box) - - self.setMinimumWidth(560) - - self.text_edit.setFocus() - - # ------------Helpers ------------ # - - def _enforce_max_length(self): - text = self.text_edit.toPlainText() - if len(text) <= self.MAX_CHARS: - return - - # Remember cursor position - cursor = self.text_edit.textCursor() - pos = cursor.position() - - # Trim and restore without re-entering this slot - self.text_edit.blockSignals(True) - self.text_edit.setPlainText(text[: self.MAX_CHARS]) - self.text_edit.blockSignals(False) - - cursor.setPosition(pos) - self.text_edit.setTextCursor(cursor) - - def _send(self): - text = self.text_edit.toPlainText().strip() - if not text: - QMessageBox.warning( - self, - strings._("report_a_bug"), - strings._("bug_report_empty"), - ) - return - - # Get current app version - version = importlib.metadata.version("bouquin") - - payload: dict[str, str] = { - "message": text, - "version": version, - } - - # POST as JSON - try: - resp = requests.post( - f"{BUG_REPORT_HOST}/{ROUTE}", - json=payload, - timeout=10, - ) - except Exception as e: - QMessageBox.critical( - self, - strings._("report_a_bug"), - strings._("bug_report_send_failed") + f"\n{e}", - ) - return - - if resp.status_code == 201: - QMessageBox.information( - self, - strings._("report_a_bug"), - strings._("bug_report_sent_ok"), - ) - self.accept() - else: - QMessageBox.critical( - self, - strings._("report_a_bug"), - strings._("bug_report_send_failed") + f" (HTTP {resp.status_code})", - ) diff --git a/bouquin/code_block_editor_dialog.py b/bouquin/code_block_editor_dialog.py deleted file mode 100644 index 8df348d..0000000 --- a/bouquin/code_block_editor_dialog.py +++ /dev/null @@ -1,208 +0,0 @@ -from __future__ import annotations - -from PySide6.QtCore import QRect, QSize, Qt -from PySide6.QtGui import QColor, QFont, QFontMetrics, QPainter, QPalette -from PySide6.QtWidgets import ( - QComboBox, - QDialog, - QDialogButtonBox, - QLabel, - QPlainTextEdit, - QVBoxLayout, - QWidget, -) - -from . import strings - - -class _LineNumberArea(QWidget): - def __init__(self, editor: "CodeEditorWithLineNumbers"): - super().__init__(editor) - self._editor = editor - - def sizeHint(self) -> QSize: # type: ignore[override] - return QSize(self._editor.line_number_area_width(), 0) - - def paintEvent(self, event): # type: ignore[override] - self._editor.line_number_area_paint_event(event) - - -class CodeEditorWithLineNumbers(QPlainTextEdit): - """QPlainTextEdit with a non-selectable line-number gutter on the left.""" - - def __init__(self, parent=None): - super().__init__(parent) - self._line_number_area = _LineNumberArea(self) - - self.blockCountChanged.connect(self._update_line_number_area_width) - self.updateRequest.connect(self._update_line_number_area) - self.cursorPositionChanged.connect(self._line_number_area.update) - - self._update_line_number_area_width() - self._update_tab_stop_width() - - # ---- layout / sizing ------------------------------------------------- - - def setFont(self, font: QFont) -> None: # type: ignore[override] - """Ensure tab width stays at 4 spaces when the font changes.""" - super().setFont(font) - self._update_tab_stop_width() - - def _update_tab_stop_width(self) -> None: - """Set tab width to 4 spaces.""" - metrics = QFontMetrics(self.font()) - # Tab width = width of 4 space characters - self.setTabStopDistance(metrics.horizontalAdvance(" ") * 4) - - def line_number_area_width(self) -> int: - # Enough digits for large-ish code blocks. - digits = max(2, len(str(max(1, self.blockCount())))) - fm = QFontMetrics(self._line_number_font()) - return fm.horizontalAdvance("9" * digits) + 8 - - def _line_number_font(self) -> QFont: - """Font to use for line numbers (slightly smaller than main text).""" - font = self.font() - if font.pointSize() > 0: - font.setPointSize(font.pointSize() - 1) - else: - # fallback for pixel-sized fonts - font.setPointSizeF(font.pointSizeF() * 0.9) - return font - - def _update_line_number_area_width(self) -> None: - margin = self.line_number_area_width() - self.setViewportMargins(margin, 0, 0, 0) - - def resizeEvent(self, event): # type: ignore[override] - super().resizeEvent(event) - cr = self.contentsRect() - self._line_number_area.setGeometry( - QRect(cr.left(), cr.top(), self.line_number_area_width(), cr.height()) - ) - - def _update_line_number_area(self, rect, dy) -> None: - if dy: - self._line_number_area.scroll(0, dy) - else: - self._line_number_area.update( - 0, rect.y(), self._line_number_area.width(), rect.height() - ) - - if rect.contains(self.viewport().rect()): - self._update_line_number_area_width() - - # ---- painting -------------------------------------------------------- - - def line_number_area_paint_event(self, event) -> None: - painter = QPainter(self._line_number_area) - painter.fillRect(event.rect(), self.palette().base()) - - # Use a slightly smaller font for numbers - painter.setFont(self._line_number_font()) - - # Faded colour: same blend used for completed-task text in - # MarkdownHighlighter (text colour towards background). - pal = self.palette() - text_fg = pal.color(QPalette.Text) - text_bg = pal.color(QPalette.Base) - t = 0.55 # same factor as completed_task_format - faded = QColor( - int(text_fg.red() * (1.0 - t) + text_bg.red() * t), - int(text_fg.green() * (1.0 - t) + text_bg.green() * t), - int(text_fg.blue() * (1.0 - t) + text_bg.blue() * t), - ) - painter.setPen(faded) - - block = self.firstVisibleBlock() - block_number = block.blockNumber() - top = self.blockBoundingGeometry(block).translated(self.contentOffset()).top() - bottom = top + self.blockBoundingRect(block).height() - fm = self.fontMetrics() - line_height = fm.height() - right_margin = self._line_number_area.width() - 4 - - while block.isValid() and top <= event.rect().bottom(): - if block.isVisible() and bottom >= event.rect().top(): - number = str(block_number + 1) - painter.setPen(self.palette().text().color()) - painter.drawText( - 0, - int(top), - right_margin, - line_height, - Qt.AlignRight | Qt.AlignVCenter, - number, - ) - - block = block.next() - top = bottom - bottom = top + self.blockBoundingRect(block).height() - block_number += 1 - - -class CodeBlockEditorDialog(QDialog): - def __init__( - self, code: str, language: str | None, parent=None, allow_delete: bool = False - ): - super().__init__(parent) - self.setWindowTitle(strings._("edit_code_block")) - - self.setMinimumSize(650, 650) - self._code_edit = CodeEditorWithLineNumbers(self) - self._code_edit.setPlainText(code) - - # Track whether the user clicked "Delete" - self._delete_requested = False - - # Language selector (optional) - self._lang_combo = QComboBox(self) - languages = [ - "", - "bash", - "css", - "html", - "javascript", - "php", - "python", - ] - self._lang_combo.addItems(languages) - if language and language in languages: - self._lang_combo.setCurrentText(language) - - # Buttons - buttons = QDialogButtonBox( - QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel, - parent=self, - ) - buttons.accepted.connect(self.accept) - buttons.rejected.connect(self.reject) - - if allow_delete: - delete_btn = buttons.addButton( - strings._("delete_code_block"), - QDialogButtonBox.ButtonRole.DestructiveRole, - ) - delete_btn.clicked.connect(self._on_delete_clicked) - - layout = QVBoxLayout(self) - layout.addWidget(QLabel(strings._("locale") + ":", self)) - layout.addWidget(self._lang_combo) - layout.addWidget(self._code_edit) - layout.addWidget(buttons) - - def _on_delete_clicked(self) -> None: - """Mark this dialog as 'delete requested' and close as Accepted.""" - self._delete_requested = True - self.accept() - - def was_deleted(self) -> bool: - """Return True if the user chose to delete the code block.""" - return self._delete_requested - - def code(self) -> str: - return self._code_edit.toPlainText() - - def language(self) -> str | None: - text = self._lang_combo.currentText().strip() - return text or None diff --git a/bouquin/code_highlighter.py b/bouquin/code_highlighter.py deleted file mode 100644 index 74ef6d4..0000000 --- a/bouquin/code_highlighter.py +++ /dev/null @@ -1,373 +0,0 @@ -from __future__ import annotations - -import re -from typing import Dict, Optional - -from PySide6.QtGui import QColor, QFont, QTextCharFormat - - -class CodeHighlighter: - """Syntax highlighter for different programming languages.""" - - # Language keywords - KEYWORDS = { - "python": [ - "False", - "None", - "True", - "and", - "as", - "assert", - "async", - "await", - "break", - "class", - "continue", - "def", - "del", - "elif", - "else", - "except", - "finally", - "for", - "from", - "global", - "if", - "import", - "in", - "is", - "lambda", - "nonlocal", - "not", - "or", - "pass", - "pprint", - "print", - "raise", - "return", - "try", - "while", - "with", - "yield", - ], - "javascript": [ - "abstract", - "arguments", - "await", - "boolean", - "break", - "byte", - "case", - "catch", - "char", - "class", - "const", - "continue", - "debugger", - "default", - "delete", - "do", - "double", - "else", - "enum", - "eval", - "export", - "extends", - "false", - "final", - "finally", - "float", - "for", - "function", - "goto", - "if", - "implements", - "import", - "in", - "instanceof", - "int", - "interface", - "let", - "long", - "native", - "new", - "null", - "package", - "private", - "protected", - "public", - "return", - "short", - "static", - "super", - "switch", - "synchronized", - "this", - "throw", - "throws", - "transient", - "true", - "try", - "typeof", - "var", - "void", - "volatile", - "while", - "with", - "yield", - ], - "php": [ - "abstract", - "and", - "array", - "as", - "break", - "callable", - "case", - "catch", - "class", - "clone", - "const", - "continue", - "declare", - "default", - "die", - "do", - "echo", - "else", - "elseif", - "empty", - "enddeclare", - "endfor", - "endforeach", - "endif", - "endswitch", - "endwhile", - "eval", - "exit", - "extends", - "final", - "for", - "foreach", - "function", - "global", - "goto", - "if", - "implements", - "include", - "include_once", - "instanceof", - "insteadof", - "interface", - "isset", - "list", - "namespace", - "new", - "or", - "print", - "print_r", - "private", - "protected", - "public", - "require", - "require_once", - "return", - "static", - "syslog", - "switch", - "throw", - "trait", - "try", - "unset", - "use", - "var", - "var_dump", - "while", - "xor", - "yield", - ], - "bash": [ - "if", - "then", - "echo", - "else", - "elif", - "fi", - "case", - "esac", - "for", - "select", - "while", - "until", - "do", - "done", - "in", - "function", - "time", - "coproc", - ], - "html": [ - "DOCTYPE", - "html", - "head", - "title", - "meta", - "link", - "style", - "script", - "body", - "div", - "span", - "p", - "a", - "img", - "ul", - "ol", - "li", - "table", - "tr", - "td", - "th", - "form", - "input", - "button", - "h1", - "h2", - "h3", - "h4", - "h5", - "h6", - "br", - "hr", - ], - "css": [ - "color", - "background", - "background-color", - "border", - "margin", - "padding", - "width", - "height", - "font", - "font-size", - "font-weight", - "display", - "position", - "top", - "left", - "right", - "bottom", - "float", - "clear", - "overflow", - "z-index", - "opacity", - ], - } - - @staticmethod - def get_language_patterns(language: str) -> list: - """Get highlighting patterns for a language.""" - patterns = [] - - keywords = CodeHighlighter.KEYWORDS.get(language.lower(), []) - - if language.lower() in ["python", "bash", "php"]: - # Comments (#) - patterns.append((r"#.*$", "comment")) - - if language.lower() in ["javascript", "php", "css"]: - # Comments (//) - patterns.append((r"//.*$", "comment")) - # Multi-line comments (/* */) - patterns.append((r"/\*.*?\*/", "comment")) - - if language.lower() in ["html", "xml"]: - # HTML/XML tags - patterns.append((r"<[^>]+>", "tag")) - # HTML comments - patterns.append((r"", "comment")) - - # Numbers - patterns.append((r"\b\d+\.?\d*\b", "number")) - - # Keywords - for keyword in keywords: - patterns.append((r"\b" + keyword + r"\b", "keyword")) - - # Do strings last so they override any of the above (e.g reserved keywords in strings) - - # Strings (double quotes) - patterns.append((r'"[^"\\]*(\\.[^"\\]*)*"', "string")) - - # Strings (single quotes) - patterns.append((r"'[^'\\]*(\\.[^'\\]*)*'", "string")) - - return patterns - - @staticmethod - def get_format_for_type( - format_type: str, base_format: QTextCharFormat - ) -> QTextCharFormat: - """Get text format for a specific syntax type.""" - fmt = QTextCharFormat(base_format) - - if format_type == "keyword": - fmt.setForeground(QColor(86, 156, 214)) # Blue - fmt.setFontWeight(QFont.Weight.Bold) - elif format_type == "string": - fmt.setForeground(QColor(206, 145, 120)) # Orange - elif format_type == "comment": - fmt.setForeground(QColor(106, 153, 85)) # Green - fmt.setFontItalic(True) - elif format_type == "number": - fmt.setForeground(QColor(181, 206, 168)) # Light green - elif format_type == "tag": - fmt.setForeground(QColor(78, 201, 176)) # Cyan - - return fmt - - -class CodeBlockMetadata: - """Stores metadata about code blocks (language, etc.) for a document.""" - - def __init__(self): - self._block_languages: Dict[int, str] = {} # block_number -> language - - def set_language(self, block_number: int, language: str): - """Set the language for a code block.""" - self._block_languages[block_number] = language.lower() - - def get_language(self, block_number: int) -> Optional[str]: - """Get the language for a code block.""" - return self._block_languages.get(block_number) - - def serialize(self) -> str: - """Serialize metadata to a string.""" - # Store as JSON-like format in a comment at the end - if not self._block_languages: - return "" - - items = [f"{k}:{v}" for k, v in sorted(self._block_languages.items())] - return "\n" - - def deserialize(self, text: str): - """Deserialize metadata from text.""" - self._block_languages.clear() - - # Look for metadata comment at the end - match = re.search(r"", text) - if match: - pairs = match.group(1).split(",") - for pair in pairs: - if ":" in pair: - block_num, lang = pair.split(":", 1) - try: - self._block_languages[int(block_num)] = lang - except ValueError: - pass - - def clear_language(self, block_number: int): - """Remove any stored language for a given block, if present.""" - self._block_languages.pop(block_number, None) diff --git a/bouquin/db.py b/bouquin/db.py index f0d5b5f..af75247 100644 --- a/bouquin/db.py +++ b/bouquin/db.py @@ -1,88 +1,15 @@ from __future__ import annotations import csv -import datetime as _dt -import hashlib import html import json -import mimetypes -import re + from dataclasses import dataclass from pathlib import Path -from typing import Dict, List, Sequence, Tuple - -import markdown -from sqlcipher3 import Binary from sqlcipher3 import dbapi2 as sqlite - -from . import strings +from typing import List, Sequence, Tuple Entry = Tuple[str, str] -TagRow = Tuple[int, str, str] -ProjectRow = Tuple[int, str] # (id, name) -ActivityRow = Tuple[int, str] # (id, name) -TimeLogRow = Tuple[ - int, # id - str, # page_date (yyyy-MM-dd) - int, - str, # project_id, project_name - int, - str, # activity_id, activity_name - int, # minutes - str | None, # note -] -DocumentRow = Tuple[ - int, # id - int, # project_id - str, # project_name - str, # file_name - str | None, # description - int, # size_bytes - str, # uploaded_at (ISO) -] -ProjectBillingRow = Tuple[ - int, # project_id - int, # hourly_rate_cents - str, # currency - str | None, # tax_label - float | None, # tax_rate_percent - str | None, # client_name - str | None, # client_company - str | None, # client_address - str | None, # client_email -] -CompanyProfileRow = Tuple[ - str | None, # name - str | None, # address - str | None, # phone - str | None, # email - str | None, # tax_id - str | None, # payment_details - bytes | None, # logo -] - -_TAG_COLORS = [ - "#FFB3BA", # soft red - "#FFDFBA", # soft orange - "#FFFFBA", # soft yellow - "#BAFFC9", # soft green - "#BAE1FF", # soft blue - "#E0BAFF", # soft purple - "#FFC4B3", # soft coral - "#FFD8B1", # soft peach - "#FFF1BA", # soft light yellow - "#E9FFBA", # soft lime - "#CFFFE5", # soft mint - "#BAFFF5", # soft aqua - "#BAF0FF", # soft cyan - "#C7E9FF", # soft sky blue - "#C7CEFF", # soft periwinkle - "#F0BAFF", # soft lavender pink - "#FFBAF2", # soft magenta - "#FFD1F0", # soft pink - "#EBD5C7", # soft beige - "#EAEAEA", # soft gray -] @dataclass @@ -92,38 +19,9 @@ class DBConfig: idle_minutes: int = 15 # 0 = never lock theme: str = "system" move_todos: bool = False - move_todos_include_weekends: bool = False - tags: bool = True - time_log: bool = True - reminders: bool = True - reminders_webhook_url: str = (None,) - reminders_webhook_secret: str = (None,) - documents: bool = True - invoicing: bool = False - locale: str = "en" - font_size: int = 11 class DBManager: - # Allow list of invoice columns allowed for dynamic field helpers - _INVOICE_COLUMN_ALLOWLIST = frozenset( - { - "invoice_number", - "issue_date", - "due_date", - "currency", - "tax_label", - "tax_rate_percent", - "subtotal_cents", - "tax_cents", - "total_cents", - "detail_mode", - "paid_at", - "payment_note", - "document_id", - } - ) - def __init__(self, cfg: DBConfig): self.cfg = cfg self.conn: sqlite.Connection | None = None @@ -164,12 +62,8 @@ class DBManager: # Not OK: rows of problems returned details = "; ".join(str(r[0]) for r in rows if r and r[0] is not None) raise sqlite.IntegrityError( - strings._("db_sqlcipher_integrity_check_failed") - + ( - f": {details}" - if details - else f" ({len(rows)} {strings._('db_issues_reported')})" - ) + "SQLCipher integrity check failed" + + (f": {details}" if details else f" ({len(rows)} issue(s) reported)") ) def _ensure_schema(self) -> None: @@ -181,6 +75,7 @@ class DBManager: # Always keep FKs on cur.execute("PRAGMA foreign_keys = ON;") + # Create new versioned schema if missing (< 0.1.5) cur.executescript( """ CREATE TABLE IF NOT EXISTS pages ( @@ -201,169 +96,6 @@ class DBManager: CREATE UNIQUE INDEX IF NOT EXISTS ux_versions_date_ver ON versions(date, version_no); CREATE INDEX IF NOT EXISTS ix_versions_date_created ON versions(date, created_at); - - CREATE TABLE IF NOT EXISTS tags ( - id INTEGER PRIMARY KEY, - name TEXT NOT NULL UNIQUE, - color TEXT NOT NULL - ); - - CREATE INDEX IF NOT EXISTS ix_tags_name ON tags(name); - - CREATE TABLE IF NOT EXISTS page_tags ( - page_date TEXT NOT NULL, -- FK to pages.date - tag_id INTEGER NOT NULL, -- FK to tags.id - PRIMARY KEY (page_date, tag_id), - FOREIGN KEY(page_date) REFERENCES pages(date) ON DELETE CASCADE, - FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE - ); - - CREATE INDEX IF NOT EXISTS ix_page_tags_tag_id ON page_tags(tag_id); - - CREATE TABLE IF NOT EXISTS projects ( - id INTEGER PRIMARY KEY, - name TEXT NOT NULL UNIQUE - ); - - CREATE TABLE IF NOT EXISTS activities ( - id INTEGER PRIMARY KEY, - name TEXT NOT NULL UNIQUE - ); - - CREATE TABLE IF NOT EXISTS time_log ( - id INTEGER PRIMARY KEY, - page_date TEXT NOT NULL, -- FK to pages.date (yyyy-MM-dd) - project_id INTEGER NOT NULL, -- FK to projects.id - activity_id INTEGER NOT NULL, -- FK to activities.id - minutes INTEGER NOT NULL, -- duration in minutes - note TEXT, - created_at TEXT NOT NULL DEFAULT ( - strftime('%Y-%m-%dT%H:%M:%fZ','now') - ), - FOREIGN KEY(page_date) REFERENCES pages(date) ON DELETE CASCADE, - FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE RESTRICT, - FOREIGN KEY(activity_id) REFERENCES activities(id) ON DELETE RESTRICT - ); - - CREATE INDEX IF NOT EXISTS ix_time_log_date - ON time_log(page_date); - CREATE INDEX IF NOT EXISTS ix_time_log_project - ON time_log(project_id); - CREATE INDEX IF NOT EXISTS ix_time_log_activity - ON time_log(activity_id); - - CREATE TABLE IF NOT EXISTS reminders ( - id INTEGER PRIMARY KEY, - text TEXT NOT NULL, - time_str TEXT NOT NULL, -- HH:MM - reminder_type TEXT NOT NULL, -- once|daily|weekdays|weekly - weekday INTEGER, -- 0-6 for weekly (0=Mon) - date_iso TEXT, -- for once type - active INTEGER NOT NULL DEFAULT 1, -- 0=inactive, 1=active - created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now')) - ); - - CREATE INDEX IF NOT EXISTS ix_reminders_active - ON reminders(active); - - CREATE TABLE IF NOT EXISTS project_documents ( - id INTEGER PRIMARY KEY, - project_id INTEGER NOT NULL, -- FK to projects.id - file_name TEXT NOT NULL, -- original filename - mime_type TEXT, -- optional - description TEXT, - size_bytes INTEGER NOT NULL, - uploaded_at TEXT NOT NULL DEFAULT ( - strftime('%Y-%m-%d','now') - ), - data BLOB NOT NULL, - FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE RESTRICT - ); - - CREATE INDEX IF NOT EXISTS ix_project_documents_project - ON project_documents(project_id); - - -- New: tags attached to documents (like page_tags, but for docs) - CREATE TABLE IF NOT EXISTS document_tags ( - document_id INTEGER NOT NULL, -- FK to project_documents.id - tag_id INTEGER NOT NULL, -- FK to tags.id - PRIMARY KEY (document_id, tag_id), - FOREIGN KEY(document_id) REFERENCES project_documents(id) ON DELETE CASCADE, - FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE - ); - - CREATE INDEX IF NOT EXISTS ix_document_tags_tag_id - ON document_tags(tag_id); - - CREATE TABLE IF NOT EXISTS project_billing ( - project_id INTEGER PRIMARY KEY - REFERENCES projects(id) ON DELETE CASCADE, - hourly_rate_cents INTEGER NOT NULL DEFAULT 0, - currency TEXT NOT NULL DEFAULT 'AUD', - tax_label TEXT, - tax_rate_percent REAL, - client_name TEXT, -- contact person - client_company TEXT, -- business name - client_address TEXT, - client_email TEXT - ); - - CREATE TABLE IF NOT EXISTS company_profile ( - id INTEGER PRIMARY KEY CHECK (id = 1), - name TEXT, - address TEXT, - phone TEXT, - email TEXT, - tax_id TEXT, - payment_details TEXT, - logo BLOB - ); - - CREATE TABLE IF NOT EXISTS invoices ( - id INTEGER PRIMARY KEY, - project_id INTEGER NOT NULL - REFERENCES projects(id) ON DELETE RESTRICT, - invoice_number TEXT NOT NULL, - issue_date TEXT NOT NULL, -- yyyy-MM-dd - due_date TEXT, - currency TEXT NOT NULL, - tax_label TEXT, - tax_rate_percent REAL, - subtotal_cents INTEGER NOT NULL, - tax_cents INTEGER NOT NULL, - total_cents INTEGER NOT NULL, - detail_mode TEXT NOT NULL, -- 'detailed' | 'summary' - paid_at TEXT, - payment_note TEXT, - document_id INTEGER, - FOREIGN KEY(document_id) REFERENCES project_documents(id) - ON DELETE SET NULL, - UNIQUE(project_id, invoice_number) - ); - - CREATE INDEX IF NOT EXISTS ix_invoices_project - ON invoices(project_id); - - CREATE TABLE IF NOT EXISTS invoice_line_items ( - id INTEGER PRIMARY KEY, - invoice_id INTEGER NOT NULL - REFERENCES invoices(id) ON DELETE CASCADE, - description TEXT NOT NULL, - hours REAL NOT NULL, - rate_cents INTEGER NOT NULL, - amount_cents INTEGER NOT NULL - ); - - CREATE INDEX IF NOT EXISTS ix_invoice_line_items_invoice - ON invoice_line_items(invoice_id); - - CREATE TABLE IF NOT EXISTS invoice_time_log ( - invoice_id INTEGER NOT NULL - REFERENCES invoices(id) ON DELETE CASCADE, - time_log_id INTEGER NOT NULL - REFERENCES time_log(id) ON DELETE RESTRICT, - PRIMARY KEY (invoice_id, time_log_id) - ); """ ) self.conn.commit() @@ -383,7 +115,7 @@ class DBManager: self.conn = None self.cfg.key = new_key if not self.connect(): - raise sqlite.Error(strings._("db_reopen_failed_after_rekey")) + raise sqlite.Error("Re-open failed after rekey") def get_entry(self, date_iso: str) -> str: """ @@ -401,94 +133,26 @@ class DBManager: ).fetchone() return row[0] if row else "" - def search_entries(self, text: str) -> list[tuple[str, str, str, str, str | None]]: + def search_entries(self, text: str) -> list[str]: """ - Search for entries by term or tag name. - Returns both pages and documents. - - kind = "page" or "document" - key = date_iso (page) or str(doc_id) (document) - title = heading for the result ("YYYY-MM-DD" or "Document") - text = source text for the snippet - aux = extra info (file_name for documents, else None) + Search for entries by term. This only works against the latest + version of the page. """ cur = self.conn.cursor() - q = text.strip() - if not q: - return [] - - pattern = f"%{q.lower()}%" - - results: list[tuple[str, str, str, str, str | None]] = [] - - # --- Pages: content or tag matches --------------------------------- - page_rows = cur.execute( + pattern = f"%{text}%" + rows = cur.execute( """ - SELECT DISTINCT p.date AS date_iso, v.content + SELECT p.date, v.content FROM pages AS p JOIN versions AS v ON v.id = p.current_version_id - LEFT JOIN page_tags pt - ON pt.page_date = p.date - LEFT JOIN tags t - ON t.id = pt.tag_id WHERE TRIM(v.content) <> '' - AND ( - LOWER(v.content) LIKE ? - OR LOWER(COALESCE(t.name, '')) LIKE ? - ) + AND v.content LIKE LOWER(?) ESCAPE '\\' ORDER BY p.date DESC; """, - (pattern, pattern), + (pattern,), ).fetchall() - - for r in page_rows: - date_iso = r["date_iso"] - content = r["content"] - results.append(("page", date_iso, date_iso, content, None)) - - # --- Documents: file name, description, or tag matches ------------- - doc_rows = cur.execute( - """ - SELECT DISTINCT - d.id AS doc_id, - d.file_name AS file_name, - d.uploaded_at AS uploaded_at, - COALESCE(d.description, '') AS description, - COALESCE(t.name, '') AS tag_name - FROM project_documents AS d - LEFT JOIN document_tags AS dt - ON dt.document_id = d.id - LEFT JOIN tags AS t - ON t.id = dt.tag_id - WHERE - LOWER(d.file_name) LIKE ? - OR LOWER(COALESCE(d.description, '')) LIKE ? - OR LOWER(COALESCE(t.name, '')) LIKE ? - ORDER BY LOWER(d.file_name); - """, - (pattern, pattern, pattern), - ).fetchall() - - for r in doc_rows: - doc_id = r["doc_id"] - file_name = r["file_name"] - description = r["description"] or "" - uploaded_at = r["uploaded_at"] - # Simple snippet source: file name + description - text_src = f"{file_name}\n{description}".strip() - - results.append( - ( - "document", - str(doc_id), - strings._("search_result_heading_document") + f" ({uploaded_at})", - text_src, - file_name, - ) - ) - - return results + return [(r[0], r[1]) for r in rows] def dates_with_content(self) -> list[str]: """ @@ -587,9 +251,7 @@ class DBManager: "SELECT date FROM versions WHERE id=?;", (version_id,) ).fetchone() if row is None or row["date"] != date_iso: - raise ValueError( - strings._("db_version_id_does_not_belong_to_the_given_date") - ) + raise ValueError("version_id does not belong to the given date") with self.conn: cur.execute( @@ -597,17 +259,6 @@ class DBManager: (version_id, date_iso), ) - def delete_version(self, *, version_id: int) -> bool | None: - """ - Delete a specific version by version_id. - """ - cur = self.conn.cursor() - with self.conn: - cur.execute( - "DELETE FROM versions WHERE id=?;", - (version_id,), - ) - # ------------------------- Export logic here ------------------------# def get_all_entries(self) -> List[Entry]: """ @@ -642,6 +293,21 @@ class DBManager: writer.writerow(["date", "content"]) # header writer.writerows(entries) + def export_txt( + self, + entries: Sequence[Entry], + file_path: str, + separator: str = "\n\n— — — — —\n\n", + ) -> None: + """ + Strip the the latest version of the pages to a text file. + """ + with open(file_path, "w", encoding="utf-8") as f: + for i, (d, c) in enumerate(entries): + f.write(f"{d}\n{c}\n") + if i < len(entries) - 1: + f.write(separator) + def export_html( self, entries: Sequence[Entry], file_path: str, title: str = "Bouquin export" ) -> None: @@ -653,33 +319,14 @@ class DBManager: '', '', f"{html.escape(title)}", - "", + "", "", f"

{html.escape(title)}

", ] for d, c in entries: - body_html = markdown.markdown( - c, - extensions=[ - "extra", - "nl2br", - ], - output_format="html5", - ) - parts.append( - f"
" - f"
" - f"
{body_html}
" - f"
" + f"
{c}
" ) parts.append("") @@ -728,1717 +375,9 @@ class DBManager: cur = self.conn.cursor() cur.execute("VACUUM") except Exception as e: - print(f"{strings._('error')}: {e}") - - # -------- Tags: helpers ------------------------------------------- - - def _default_tag_colour(self, name: str) -> str: - """ - Deterministically pick a colour for a tag name from a small palette. - """ - if not name: - return "#CCCCCC" - h = int(hashlib.sha1(name.encode("utf-8")).hexdigest()[:8], 16) # nosec - return _TAG_COLORS[h % len(_TAG_COLORS)] - - # -------- Tags: per-page ------------------------------------------- - - def get_tags_for_page(self, date_iso: str) -> list[TagRow]: - """ - Return (id, name, color) for all tags attached to this page/date. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT t.id, t.name, t.color - FROM page_tags pt - JOIN tags t ON t.id = pt.tag_id - WHERE pt.page_date = ? - ORDER BY LOWER(t.name); - """, - (date_iso,), - ).fetchall() - return [(r[0], r[1], r[2]) for r in rows] - - def set_tags_for_page(self, date_iso: str, tag_names: Sequence[str]) -> None: - """ - Replace the tag set for a page with the given names. - Creates new tags as needed (with auto colours). - Tags are case-insensitive - reuses existing tag if found with different case. - """ - # Normalise + dedupe (case-insensitive) - clean_names = [] - seen = set() - for name in tag_names: - name = name.strip() - if not name: - continue - if name.lower() in seen: - continue - seen.add(name.lower()) - clean_names.append(name) - - with self.conn: - cur = self.conn.cursor() - - # Ensure the page row exists even if there's no content yet - cur.execute("INSERT OR IGNORE INTO pages(date) VALUES (?);", (date_iso,)) - - if not clean_names: - # Just clear all tags for this page - cur.execute("DELETE FROM page_tags WHERE page_date=?;", (date_iso,)) - return - - # For each tag name, check if it exists with different casing - # If so, reuse that existing tag; otherwise create new - final_tag_names = [] - for name in clean_names: - # Look for existing tag (case-insensitive) - existing = cur.execute( - "SELECT name FROM tags WHERE LOWER(name) = LOWER(?);", (name,) - ).fetchone() - - if existing: - # Use the existing tag's exact name - final_tag_names.append(existing["name"]) - else: - # Create new tag with the provided casing - cur.execute( - """ - INSERT OR IGNORE INTO tags(name, color) - VALUES (?, ?); - """, - (name, self._default_tag_colour(name)), - ) - final_tag_names.append(name) - - # Lookup ids for the final tag names - placeholders = ",".join("?" for _ in final_tag_names) - rows = cur.execute( - f""" - SELECT id, name - FROM tags - WHERE name IN ({placeholders}); - """, # nosec - tuple(final_tag_names), - ).fetchall() - ids_by_name = {r["name"]: r["id"] for r in rows} - - # Reset page_tags for this page - cur.execute("DELETE FROM page_tags WHERE page_date=?;", (date_iso,)) - for name in final_tag_names: - tag_id = ids_by_name.get(name) - if tag_id is not None: - cur.execute( - """ - INSERT OR IGNORE INTO page_tags(page_date, tag_id) - VALUES (?, ?); - """, - (date_iso, tag_id), - ) - - # -------- Tags: global management ---------------------------------- - - def list_tags(self) -> list[TagRow]: - """ - Return all tags in the database. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT id, name, color - FROM tags - ORDER BY LOWER(name); - """ - ).fetchall() - return [(r[0], r[1], r[2]) for r in rows] - - def add_tag(self, name: str, color: str) -> None: - """ - Update a tag's name and colour. - """ - name = name.strip() - color = color.strip() or "#CCCCCC" - - try: - with self.conn: - cur = self.conn.cursor() - cur.execute( - """ - INSERT INTO tags - (name, color) - VALUES (?, ?); - """, - (name, color), - ) - except sqlite.IntegrityError as e: - if "UNIQUE constraint failed: tags.name" in str(e): - raise sqlite.IntegrityError( - strings._("tag_already_exists_with_that_name") - ) from e - - def update_tag(self, tag_id: int, name: str, color: str) -> None: - """ - Update a tag's name and colour. - """ - name = name.strip() - color = color.strip() or "#CCCCCC" - - try: - with self.conn: - cur = self.conn.cursor() - cur.execute( - """ - UPDATE tags - SET name = ?, color = ? - WHERE id = ?; - """, - (name, color, tag_id), - ) - except sqlite.IntegrityError as e: - if "UNIQUE constraint failed: tags.name" in str(e): - raise sqlite.IntegrityError( - strings._("tag_already_exists_with_that_name") - ) from e - - def delete_tag(self, tag_id: int) -> None: - """ - Delete a tag entirely (removes it from all pages and documents). - """ - with self.conn: - cur = self.conn.cursor() - cur.execute("DELETE FROM page_tags WHERE tag_id=?;", (tag_id,)) - cur.execute("DELETE FROM document_tags WHERE tag_id=?;", (tag_id,)) - cur.execute("DELETE FROM tags WHERE id=?;", (tag_id,)) - - def get_pages_for_tag(self, tag_name: str) -> list[Entry]: - """ - Return (date, content) for pages that have the given tag. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT p.date, v.content - FROM pages AS p - JOIN versions AS v - ON v.id = p.current_version_id - JOIN page_tags pt - ON pt.page_date = p.date - JOIN tags t - ON t.id = pt.tag_id - WHERE LOWER(t.name) = LOWER(?) - ORDER BY p.date DESC; - """, - (tag_name,), - ).fetchall() - return [(r[0], r[1]) for r in rows] - - # ---------- helpers for word counting ---------- - def _strip_markdown(self, text: str) -> str: - """ - Cheap markdown-ish stripper for word counting. - We only need approximate numbers. - """ - if not text: - return "" - - # Remove fenced code blocks - text = re.sub(r"```.*?```", " ", text, flags=re.DOTALL) - # Remove inline code - text = re.sub(r"`[^`]+`", " ", text) - # [text](url) → text - text = re.sub(r"\[([^\]]+)\]\([^)]+\)", r"\1", text) - # Remove emphasis markers, headings, etc. - text = re.sub(r"[#*_>]+", " ", text) - # Strip simple HTML tags - text = re.sub(r"<[^>]+>", " ", text) - - return text - - def _count_words(self, text: str) -> int: - text = self._strip_markdown(text) - words = re.findall(r"\b\w+\b", text, flags=re.UNICODE) - return len(words) - - def gather_stats(self): - """Compute all the numbers the Statistics dialog needs in one place.""" - - # 1) pages with content (current version only) - try: - pages_with_content_list = self.dates_with_content() - except Exception: - pages_with_content_list = [] - pages_with_content = len(pages_with_content_list) - - cur = self.conn.cursor() - - # 2 & 3) total revisions + page with most revisions + per-date counts - total_revisions = 0 - page_most_revisions: str | None = None - page_most_revisions_count = 0 - revisions_by_date: Dict[_dt.date, int] = {} - - rows = cur.execute( - """ - SELECT date, COUNT(*) AS c - FROM versions - GROUP BY date - ORDER BY date; - """ - ).fetchall() - - for r in rows: - date_iso = r["date"] - c = int(r["c"]) - total_revisions += c - - if c > page_most_revisions_count: - page_most_revisions_count = c - page_most_revisions = date_iso - - d = _dt.date.fromisoformat(date_iso) - revisions_by_date[d] = c - - # 4) total words + per-date words (current version only) - entries = self.get_all_entries() - total_words = 0 - words_by_date: Dict[_dt.date, int] = {} - - for date_iso, content in entries: - wc = self._count_words(content or "") - total_words += wc - d = _dt.date.fromisoformat(date_iso) - words_by_date[d] = wc - - # tags + page with most tags - rows = cur.execute("SELECT COUNT(*) AS total_unique FROM tags;").fetchall() - unique_tags = int(rows[0]["total_unique"]) if rows else 0 - - rows = cur.execute( - """ - SELECT page_date, COUNT(*) AS c - FROM page_tags - GROUP BY page_date - ORDER BY c DESC, page_date ASC - LIMIT 1; - """ - ).fetchall() - - if rows: - page_most_tags = rows[0]["page_date"] - page_most_tags_count = int(rows[0]["c"]) - else: - page_most_tags = None - page_most_tags_count = 0 - - # 5) Time logging stats (minutes / hours) - time_minutes_by_date: Dict[_dt.date, int] = {} - total_time_minutes = 0 - day_most_time: str | None = None - day_most_time_minutes = 0 - - try: - rows = cur.execute( - """ - SELECT page_date, SUM(minutes) AS total_minutes - FROM time_log - GROUP BY page_date - ORDER BY page_date; - """ - ).fetchall() - except Exception: - rows = [] - - for r in rows: - date_iso = r["page_date"] - if not date_iso: - continue - m = int(r["total_minutes"] or 0) - total_time_minutes += m - if m > day_most_time_minutes: - day_most_time_minutes = m - day_most_time = date_iso - try: - d = _dt.date.fromisoformat(date_iso) - except Exception: # nosec B112 - continue - time_minutes_by_date[d] = m - - # Project with most logged time - project_most_minutes_name: str | None = None - project_most_minutes = 0 - - try: - rows = cur.execute( - """ - SELECT p.name AS project_name, - SUM(t.minutes) AS total_minutes - FROM time_log t - JOIN projects p ON p.id = t.project_id - GROUP BY t.project_id, p.name - ORDER BY total_minutes DESC, LOWER(project_name) ASC - LIMIT 1; - """ - ).fetchall() - except Exception: - rows = [] - - if rows: - project_most_minutes_name = rows[0]["project_name"] - project_most_minutes = int(rows[0]["total_minutes"] or 0) - - # Activity with most logged time - activity_most_minutes_name: str | None = None - activity_most_minutes = 0 - - try: - rows = cur.execute( - """ - SELECT a.name AS activity_name, - SUM(t.minutes) AS total_minutes - FROM time_log t - JOIN activities a ON a.id = t.activity_id - GROUP BY t.activity_id, a.name - ORDER BY total_minutes DESC, LOWER(activity_name) ASC - LIMIT 1; - """ - ).fetchall() - except Exception: - rows = [] - - if rows: - activity_most_minutes_name = rows[0]["activity_name"] - activity_most_minutes = int(rows[0]["total_minutes"] or 0) - - # 6) Reminder stats - reminders_by_date: Dict[_dt.date, int] = {} - total_reminders = 0 - day_most_reminders: str | None = None - day_most_reminders_count = 0 - - try: - rows = cur.execute( - """ - SELECT substr(created_at, 1, 10) AS date_iso, - COUNT(*) AS c - FROM reminders - GROUP BY date_iso - ORDER BY date_iso; - """ - ).fetchall() - except Exception: - rows = [] - - for r in rows: - date_iso = r["date_iso"] - if not date_iso: - continue - c = int(r["c"] or 0) - total_reminders += c - if c > day_most_reminders_count: - day_most_reminders_count = c - day_most_reminders = date_iso - try: - d = _dt.date.fromisoformat(date_iso) - except Exception: # nosec B112 - continue - reminders_by_date[d] = c - - return ( - pages_with_content, - total_revisions, - page_most_revisions, - page_most_revisions_count, - words_by_date, - total_words, - unique_tags, - page_most_tags, - page_most_tags_count, - revisions_by_date, - time_minutes_by_date, - total_time_minutes, - day_most_time, - day_most_time_minutes, - project_most_minutes_name, - project_most_minutes, - activity_most_minutes_name, - activity_most_minutes, - reminders_by_date, - total_reminders, - day_most_reminders, - day_most_reminders_count, - ) - - # -------- Time logging: projects & activities --------------------- - - def list_projects(self) -> list[ProjectRow]: - cur = self.conn.cursor() - rows = cur.execute( - "SELECT id, name FROM projects ORDER BY LOWER(name);" - ).fetchall() - return [(r["id"], r["name"]) for r in rows] - - def list_projects_by_id(self, project_id: int) -> str: - cur = self.conn.cursor() - row = cur.execute( - "SELECT name FROM projects WHERE id = ?;", - (project_id,), - ).fetchone() - return row["name"] if row else "" - - def add_project(self, name: str) -> int: - name = name.strip() - if not name: - raise ValueError("empty project name") - with self.conn: - cur = self.conn.cursor() - cur.execute( - "INSERT OR IGNORE INTO projects(name) VALUES (?);", - (name,), - ) - row = cur.execute( - "SELECT id, name FROM projects WHERE name = ?;", - (name,), - ).fetchone() - return row["id"] - - def rename_project(self, project_id: int, new_name: str) -> None: - new_name = new_name.strip() - if not new_name: - return - with self.conn: - self.conn.execute( - "UPDATE projects SET name = ? WHERE id = ?;", - (new_name, project_id), - ) - - def delete_project(self, project_id: int) -> None: - with self.conn: - self.conn.execute( - "DELETE FROM projects WHERE id = ?;", - (project_id,), - ) - - def list_activities(self) -> list[ActivityRow]: - cur = self.conn.cursor() - rows = cur.execute( - "SELECT id, name FROM activities ORDER BY LOWER(name);" - ).fetchall() - return [(r["id"], r["name"]) for r in rows] - - def add_activity(self, name: str) -> int: - name = name.strip() - if not name: - raise ValueError("empty activity name") - with self.conn: - cur = self.conn.cursor() - cur.execute( - "INSERT OR IGNORE INTO activities(name) VALUES (?);", - (name,), - ) - row = cur.execute( - "SELECT id, name FROM activities WHERE name = ?;", - (name,), - ).fetchone() - return row["id"] - - def rename_activity(self, activity_id: int, new_name: str) -> None: - new_name = new_name.strip() - if not new_name: - return - with self.conn: - self.conn.execute( - "UPDATE activities SET name = ? WHERE id = ?;", - (new_name, activity_id), - ) - - def delete_activity(self, activity_id: int) -> None: - with self.conn: - self.conn.execute( - "DELETE FROM activities WHERE id = ?;", - (activity_id,), - ) - - # -------- Time logging: entries ----------------------------------- - - def add_time_log( - self, - date_iso: str, - project_id: int, - activity_id: int, - minutes: int, - note: str | None = None, - ) -> int: - with self.conn: - cur = self.conn.cursor() - # Ensure a page row exists even if there is no text content yet - cur.execute("INSERT OR IGNORE INTO pages(date) VALUES (?);", (date_iso,)) - cur.execute( - """ - INSERT INTO time_log(page_date, project_id, activity_id, minutes, note) - VALUES (?, ?, ?, ?, ?); - """, - (date_iso, project_id, activity_id, minutes, note), - ) - return cur.lastrowid - - def update_time_log( - self, - entry_id: int, - project_id: int, - activity_id: int, - minutes: int, - note: str | None = None, - ) -> None: - with self.conn: - self.conn.execute( - """ - UPDATE time_log - SET project_id = ?, activity_id = ?, minutes = ?, note = ? - WHERE id = ?; - """, - (project_id, activity_id, minutes, note, entry_id), - ) - - def delete_time_log(self, entry_id: int) -> None: - with self.conn: - self.conn.execute( - "DELETE FROM time_log WHERE id = ?;", - (entry_id,), - ) - - def time_log_for_date(self, date_iso: str) -> list[TimeLogRow]: - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT - t.id, - t.page_date, - t.project_id, - p.name AS project_name, - t.activity_id, - a.name AS activity_name, - t.minutes, - t.note, - t.created_at AS created_at - FROM time_log t - JOIN projects p ON p.id = t.project_id - JOIN activities a ON a.id = t.activity_id - WHERE t.page_date = ? - ORDER BY LOWER(p.name), LOWER(a.name), t.id; - """, - (date_iso,), - ).fetchall() - - result: list[TimeLogRow] = [] - for r in rows: - result.append( - ( - r["id"], - r["page_date"], - r["project_id"], - r["project_name"], - r["activity_id"], - r["activity_name"], - r["minutes"], - r["note"], - r["created_at"], - ) - ) - return result - - def time_report( - self, - project_id: int, - start_date_iso: str, - end_date_iso: str, - granularity: str = "day", # 'day' | 'week' | 'month' | 'activity' | 'none' - ) -> list[tuple[str, str, str, int]]: - """ - Return (time_period, activity_name, total_minutes) tuples between start and end - for a project, grouped by period and activity. - time_period is: - - 'YYYY-MM-DD' for day - - 'YYYY-WW' for week - - 'YYYY-MM' for month - For 'activity' granularity, results are grouped by activity only (no time bucket). - For 'none' granularity, each individual time log entry becomes a row. - """ - cur = self.conn.cursor() - - if granularity == "none": - # No grouping: one row per entry - rows = cur.execute( - """ - SELECT - t.page_date AS period, - a.name AS activity_name, - t.note AS note, - t.minutes AS total_minutes - FROM time_log t - JOIN activities a ON a.id = t.activity_id - WHERE t.project_id = ? - AND t.page_date BETWEEN ? AND ? - ORDER BY period, LOWER(a.name), t.id; - """, - (project_id, start_date_iso, end_date_iso), - ).fetchall() - - return [ - (r["period"], r["activity_name"], r["note"], r["total_minutes"]) - for r in rows - ] - - if granularity == "activity": - rows = cur.execute( - """ - SELECT - a.name AS activity_name, - SUM(t.minutes) AS total_minutes - FROM time_log t - JOIN activities a ON a.id = t.activity_id - WHERE t.project_id = ? - AND t.page_date BETWEEN ? AND ? - GROUP BY activity_name - ORDER BY LOWER(activity_name); - """, - (project_id, start_date_iso, end_date_iso), - ).fetchall() - - # period column is unused for activity grouping in the UI, but we keep - # the tuple shape consistent. - return [("", r["activity_name"], "", r["total_minutes"]) for r in rows] - - if granularity == "day": - bucket_expr = "page_date" - elif granularity == "week": - # ISO-like year-week; SQLite weeks start at 00 - bucket_expr = "strftime('%Y-%W', page_date)" - else: # month - bucket_expr = "substr(page_date, 1, 7)" # YYYY-MM - - rows = cur.execute( - f""" - SELECT - {bucket_expr} AS bucket, - a.name AS activity_name, - SUM(t.minutes) AS total_minutes - FROM time_log t - JOIN activities a ON a.id = t.activity_id - WHERE t.project_id = ? - AND t.page_date BETWEEN ? AND ? - GROUP BY bucket, activity_name - ORDER BY bucket, LOWER(activity_name); - """, # nosec - (project_id, start_date_iso, end_date_iso), - ).fetchall() - - return [(r["bucket"], r["activity_name"], "", r["total_minutes"]) for r in rows] - - def time_report_all( - self, - start_date_iso: str, - end_date_iso: str, - granularity: str = "day", # 'day' | 'week' | 'month' | 'activity' | 'none' - ) -> list[tuple[str, str, str, str, int]]: - """ - Return (project_name, time_period, activity_name, note, total_minutes) - across *all* projects between start and end. - - For 'day'/'week'/'month', grouped by project + period + activity. - - For 'activity', grouped by project + activity. - - For 'none', one row per time_log entry. - """ - cur = self.conn.cursor() - - if granularity == "none": - # No grouping - one row per time_log record - rows = cur.execute( - """ - SELECT - p.name AS project_name, - t.page_date AS period, - a.name AS activity_name, - t.note AS note, - t.minutes AS total_minutes - FROM time_log t - JOIN projects p ON p.id = t.project_id - JOIN activities a ON a.id = t.activity_id - WHERE t.page_date BETWEEN ? AND ? - ORDER BY LOWER(p.name), period, LOWER(activity_name), t.id; - """, - (start_date_iso, end_date_iso), - ).fetchall() - - return [ - ( - r["project_name"], - r["period"], - r["activity_name"], - r["note"], - r["total_minutes"], - ) - for r in rows - ] - - if granularity == "activity": - rows = cur.execute( - """ - SELECT - p.name AS project_name, - a.name AS activity_name, - SUM(t.minutes) AS total_minutes - FROM time_log t - JOIN projects p ON p.id = t.project_id - JOIN activities a ON a.id = t.activity_id - WHERE t.page_date BETWEEN ? AND ? - GROUP BY p.id, activity_name - ORDER BY LOWER(p.name), LOWER(activity_name); - """, - (start_date_iso, end_date_iso), - ).fetchall() - - return [ - ( - r["project_name"], - "", - r["activity_name"], - "", - r["total_minutes"], - ) - for r in rows - ] - - if granularity == "day": - bucket_expr = "page_date" - elif granularity == "week": - bucket_expr = "strftime('%Y-%W', page_date)" - else: # month - bucket_expr = "substr(page_date, 1, 7)" # YYYY-MM - - rows = cur.execute( - f""" - SELECT - p.name AS project_name, - {bucket_expr} AS bucket, - a.name AS activity_name, - SUM(t.minutes) AS total_minutes - FROM time_log t - JOIN projects p ON p.id = t.project_id - JOIN activities a ON a.id = t.activity_id - WHERE t.page_date BETWEEN ? AND ? - GROUP BY p.id, bucket, activity_name - ORDER BY LOWER(p.name), bucket, LOWER(activity_name); - """, # nosec - (start_date_iso, end_date_iso), - ).fetchall() - - return [ - ( - r["project_name"], - r["bucket"], - r["activity_name"], - "", - r["total_minutes"], - ) - for r in rows - ] + print(f"Error: {e}") def close(self) -> None: if self.conn is not None: self.conn.close() self.conn = None - - # ------------------------- Reminders logic here ------------------------# - def save_reminder(self, reminder) -> int: - """Save or update a reminder. Returns the reminder ID.""" - cur = self.conn.cursor() - if reminder.id: - # Update existing - cur.execute( - """ - UPDATE reminders - SET text = ?, time_str = ?, reminder_type = ?, - weekday = ?, date_iso = ?, active = ? - WHERE id = ? - """, - ( - reminder.text, - reminder.time_str, - reminder.reminder_type.value, - reminder.weekday, - reminder.date_iso, - 1 if reminder.active else 0, - reminder.id, - ), - ) - self.conn.commit() - return reminder.id - else: - # Insert new - cur.execute( - """ - INSERT INTO reminders (text, time_str, reminder_type, weekday, date_iso, active) - VALUES (?, ?, ?, ?, ?, ?) - """, - ( - reminder.text, - reminder.time_str, - reminder.reminder_type.value, - reminder.weekday, - reminder.date_iso, - 1 if reminder.active else 0, - ), - ) - self.conn.commit() - return cur.lastrowid - - def get_all_reminders(self): - """Get all reminders.""" - from .reminders import Reminder, ReminderType - - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT id, text, time_str, reminder_type, weekday, date_iso, active - FROM reminders - ORDER BY time_str - """ - ).fetchall() - - result = [] - for r in rows: - result.append( - Reminder( - id=r["id"], - text=r["text"], - time_str=r["time_str"], - reminder_type=ReminderType(r["reminder_type"]), - weekday=r["weekday"], - date_iso=r["date_iso"], - active=bool(r["active"]), - ) - ) - return result - - def update_reminder_active(self, reminder_id: int, active: bool) -> None: - """Update the active status of a reminder.""" - cur = self.conn.cursor() - cur.execute( - "UPDATE reminders SET active = ? WHERE id = ?", - (1 if active else 0, reminder_id), - ) - self.conn.commit() - - def delete_reminder(self, reminder_id: int) -> None: - """Delete a reminder.""" - cur = self.conn.cursor() - cur.execute("DELETE FROM reminders WHERE id = ?", (reminder_id,)) - self.conn.commit() - - # ------------------------- Documents logic here ------------------------# - - def documents_for_project(self, project_id: int) -> list[DocumentRow]: - """ - Return metadata for all documents attached to a given project. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT - d.id, - d.project_id, - p.name AS project_name, - d.file_name, - d.description, - d.size_bytes, - d.uploaded_at - FROM project_documents AS d - JOIN projects AS p ON p.id = d.project_id - WHERE d.project_id = ? - ORDER BY d.uploaded_at DESC, LOWER(d.file_name); - """, - (project_id,), - ).fetchall() - - result: list[DocumentRow] = [] - for r in rows: - result.append( - ( - r["id"], - r["project_id"], - r["project_name"], - r["file_name"], - r["description"], - r["size_bytes"], - r["uploaded_at"], - ) - ) - return result - - def search_documents(self, query: str) -> list[DocumentRow]: - """Search documents across all projects. - - The search is case-insensitive and matches against: - - file name - - description - - project name - - tag names associated with the document - """ - pattern = f"%{query.lower()}%" - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT DISTINCT - d.id, - d.project_id, - p.name AS project_name, - d.file_name, - d.description, - d.size_bytes, - d.uploaded_at - FROM project_documents AS d - LEFT JOIN projects AS p ON p.id = d.project_id - LEFT JOIN document_tags AS dt ON dt.document_id = d.id - LEFT JOIN tags AS t ON t.id = dt.tag_id - WHERE LOWER(d.file_name) LIKE :pat - OR LOWER(COALESCE(d.description, '')) LIKE :pat - OR LOWER(COALESCE(p.name, '')) LIKE :pat - OR LOWER(COALESCE(t.name, '')) LIKE :pat - ORDER BY d.uploaded_at DESC, LOWER(d.file_name); - """, - {"pat": pattern}, - ).fetchall() - - result: list[DocumentRow] = [] - for r in rows: - result.append( - ( - r["id"], - r["project_id"], - r["project_name"], - r["file_name"], - r["description"], - r["size_bytes"], - r["uploaded_at"], - ) - ) - return result - - def add_document_from_path( - self, - project_id: int, - file_path: str, - description: str | None = None, - uploaded_at: str | None = None, - ) -> int: - """ - Read a file from disk and store it as a BLOB in project_documents. - - Args: - project_id: The project to attach the document to - file_path: Path to the file to upload - description: Optional description - uploaded_at: Optional date in YYYY-MM-DD format. If None, uses current date. - """ - path = Path(file_path) - if not path.is_file(): - raise ValueError(f"File does not exist: {file_path}") - - data = path.read_bytes() - size_bytes = len(data) - file_name = path.name - mime_type, _ = mimetypes.guess_type(str(path)) - mime_type = mime_type or None - - with self.conn: - cur = self.conn.cursor() - if uploaded_at is not None: - # Use explicit date - cur.execute( - """ - INSERT INTO project_documents - (project_id, file_name, mime_type, - description, size_bytes, uploaded_at, data) - VALUES (?, ?, ?, ?, ?, ?, ?); - """, - ( - project_id, - file_name, - mime_type, - description, - size_bytes, - uploaded_at, - Binary(data), - ), - ) - else: - # Let DB default to current date - cur.execute( - """ - INSERT INTO project_documents - (project_id, file_name, mime_type, - description, size_bytes, data) - VALUES (?, ?, ?, ?, ?, ?); - """, - ( - project_id, - file_name, - mime_type, - description, - size_bytes, - Binary(data), - ), - ) - doc_id = cur.lastrowid or 0 - - return int(doc_id) - - def update_document_description(self, doc_id: int, description: str | None) -> None: - with self.conn: - self.conn.execute( - "UPDATE project_documents SET description = ? WHERE id = ?;", - (description, doc_id), - ) - - def update_document_uploaded_at(self, doc_id: int, uploaded_at: str) -> None: - """ - Update the uploaded_at date for a document. - - Args: - doc_id: Document ID - uploaded_at: Date in YYYY-MM-DD format - """ - with self.conn: - self.conn.execute( - "UPDATE project_documents SET uploaded_at = ? WHERE id = ?;", - (uploaded_at, doc_id), - ) - - def delete_document(self, doc_id: int) -> None: - with self.conn: - self.conn.execute("DELETE FROM project_documents WHERE id = ?;", (doc_id,)) - - def document_data(self, doc_id: int) -> bytes: - """ - Return just the raw bytes for a document. - """ - cur = self.conn.cursor() - row = cur.execute( - "SELECT data FROM project_documents WHERE id = ?;", - (doc_id,), - ).fetchone() - if row is None: - raise KeyError(f"Unknown document id {doc_id}") - return bytes(row["data"]) - - def get_tags_for_document(self, document_id: int) -> list[TagRow]: - """ - Return (id, name, color) for all tags attached to this document. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT t.id, t.name, t.color - FROM document_tags dt - JOIN tags t ON t.id = dt.tag_id - WHERE dt.document_id = ? - ORDER BY LOWER(t.name); - """, - (document_id,), - ).fetchall() - return [(r[0], r[1], r[2]) for r in rows] - - def set_tags_for_document(self, document_id: int, tag_names: Sequence[str]) -> None: - """ - Replace the tag set for a document with the given names. - Behaviour mirrors set_tags_for_page. - """ - # Normalise + dedupe (case-insensitive) - clean_names: list[str] = [] - seen: set[str] = set() - for name in tag_names: - name = name.strip() - if not name: - continue - key = name.lower() - if key in seen: - continue - seen.add(key) - clean_names.append(name) - - with self.conn: - cur = self.conn.cursor() - - # Ensure the document exists - exists = cur.execute( - "SELECT 1 FROM project_documents WHERE id = ?;", (document_id,) - ).fetchone() - if not exists: - raise sqlite.IntegrityError(f"Unknown document id {document_id}") - - if not clean_names: - cur.execute( - "DELETE FROM document_tags WHERE document_id = ?;", - (document_id,), - ) - return - - # For each tag name, reuse existing tag (case-insensitive) or create new - final_tag_names: list[str] = [] - for name in clean_names: - existing = cur.execute( - "SELECT name FROM tags WHERE LOWER(name) = LOWER(?);", (name,) - ).fetchone() - if existing: - final_tag_names.append(existing["name"]) - else: - cur.execute( - """ - INSERT OR IGNORE INTO tags(name, color) - VALUES (?, ?); - """, - (name, self._default_tag_colour(name)), - ) - final_tag_names.append(name) - - # Lookup ids for the final tag names - placeholders = ",".join("?" for _ in final_tag_names) - rows = cur.execute( - f""" - SELECT id, name - FROM tags - WHERE name IN ({placeholders}); - """, # nosec - tuple(final_tag_names), - ).fetchall() - ids_by_name = {r["name"]: r["id"] for r in rows} - - # Reset document_tags for this document - cur.execute( - "DELETE FROM document_tags WHERE document_id = ?;", - (document_id,), - ) - for name in final_tag_names: - tag_id = ids_by_name.get(name) - if tag_id is not None: - cur.execute( - """ - INSERT OR IGNORE INTO document_tags(document_id, tag_id) - VALUES (?, ?); - """, - (document_id, tag_id), - ) - - def documents_by_date(self) -> Dict[_dt.date, int]: - """ - Return a mapping of date -> number of documents uploaded on that date. - - The keys are datetime.date objects derived from the - project_documents.uploaded_at column, which is stored as a - YYYY-MM-DD ISO date string (or a timestamp whose leading part - is that date). - """ - cur = self.conn.cursor() - try: - rows = cur.execute( - """ - SELECT uploaded_at AS date_iso, - COUNT(*) AS c - FROM project_documents - WHERE uploaded_at IS NOT NULL - AND uploaded_at != '' - GROUP BY uploaded_at - ORDER BY uploaded_at; - """ - ).fetchall() - except Exception: - # Older DBs without project_documents/uploaded_at → no document stats - return {} - - result: Dict[_dt.date, int] = {} - for r in rows: - date_iso = r["date_iso"] - if not date_iso: - continue - - # If uploaded_at ever contains a full timestamp, only use - # the leading date portion. - date_part = str(date_iso).split(" ", 1)[0][:10] - try: - d = _dt.date.fromisoformat(date_part) - except Exception: # nosec B112 - continue - - result[d] = int(r["c"]) - - return result - - def todays_documents(self, date_iso: str) -> list[tuple[int, str, str | None, str]]: - """ - Return today's documents as - (doc_id, file_name, project_name, uploaded_at). - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT d.id AS doc_id, - d.file_name AS file_name, - p.name AS project_name - FROM project_documents AS d - LEFT JOIN projects AS p ON p.id = d.project_id - WHERE d.uploaded_at LIKE ? - ORDER BY d.uploaded_at DESC, LOWER(d.file_name); - """, - (f"%{date_iso}%",), - ).fetchall() - - return [(r["doc_id"], r["file_name"], r["project_name"]) for r in rows] - - def get_documents_for_tag(self, tag_name: str) -> list[tuple[int, str, str]]: - """ - Return (document_id, project_name, file_name) for documents with a given tag. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT d.id AS doc_id, - p.name AS project_name, - d.file_name - FROM project_documents AS d - JOIN document_tags AS dt ON dt.document_id = d.id - JOIN tags AS t ON t.id = dt.tag_id - LEFT JOIN projects AS p ON p.id = d.project_id - WHERE LOWER(t.name) = LOWER(?) - ORDER BY LOWER(d.file_name); - """, - (tag_name,), - ).fetchall() - return [(r["doc_id"], r["project_name"], r["file_name"]) for r in rows] - - # ------------------------- Billing settings ------------------------# - - def get_project_billing(self, project_id: int) -> ProjectBillingRow | None: - cur = self.conn.cursor() - row = cur.execute( - """ - SELECT - project_id, - hourly_rate_cents, - currency, - tax_label, - tax_rate_percent, - client_name, - client_company, - client_address, - client_email - FROM project_billing - WHERE project_id = ? - """, - (project_id,), - ).fetchone() - if not row: - return None - return ( - row["project_id"], - row["hourly_rate_cents"], - row["currency"], - row["tax_label"], - row["tax_rate_percent"], - row["client_name"], - row["client_company"], - row["client_address"], - row["client_email"], - ) - - def upsert_project_billing( - self, - project_id: int, - hourly_rate_cents: int, - currency: str, - tax_label: str | None, - tax_rate_percent: float | None, - client_name: str | None, - client_company: str | None, - client_address: str | None, - client_email: str | None, - ) -> None: - with self.conn: - self.conn.execute( - """ - INSERT INTO project_billing ( - project_id, - hourly_rate_cents, - currency, - tax_label, - tax_rate_percent, - client_name, - client_company, - client_address, - client_email - ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) - ON CONFLICT(project_id) DO UPDATE SET - hourly_rate_cents = excluded.hourly_rate_cents, - currency = excluded.currency, - tax_label = excluded.tax_label, - tax_rate_percent = excluded.tax_rate_percent, - client_name = excluded.client_name, - client_company = excluded.client_company, - client_address = excluded.client_address, - client_email = excluded.client_email; - """, - ( - project_id, - hourly_rate_cents, - currency, - tax_label, - tax_rate_percent, - client_name, - client_company, - client_address, - client_email, - ), - ) - - def list_client_companies(self) -> list[str]: - """Return distinct client display names from project_billing.""" - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT DISTINCT client_company - FROM project_billing - WHERE client_company IS NOT NULL - AND TRIM(client_company) <> '' - ORDER BY LOWER(client_company); - """ - ).fetchall() - return [r["client_company"] for r in rows] - - def get_client_by_company( - self, client_company: str - ) -> tuple[str | None, str | None, str | None, str | None] | None: - """ - Return (contact_name, client_display_name, address, email) - for a given client display name, based on the most recent project using it. - """ - cur = self.conn.cursor() - row = cur.execute( - """ - SELECT client_name, client_company, client_address, client_email - FROM project_billing - WHERE client_company = ? - AND client_company IS NOT NULL - AND TRIM(client_company) <> '' - ORDER BY project_id DESC - LIMIT 1 - """, - (client_company,), - ).fetchone() - if not row: - return None - return ( - row["client_name"], - row["client_company"], - row["client_address"], - row["client_email"], - ) - - # ------------------------- Company profile ------------------------# - - def get_company_profile(self) -> CompanyProfileRow | None: - cur = self.conn.cursor() - row = cur.execute( - """ - SELECT name, address, phone, email, tax_id, payment_details, logo - FROM company_profile - WHERE id = 1 - """ - ).fetchone() - if not row: - return None - return ( - row["name"], - row["address"], - row["phone"], - row["email"], - row["tax_id"], - row["payment_details"], - row["logo"], - ) - - def save_company_profile( - self, - name: str | None, - address: str | None, - phone: str | None, - email: str | None, - tax_id: str | None, - payment_details: str | None, - logo: bytes | None, - ) -> None: - with self.conn: - self.conn.execute( - """ - INSERT INTO company_profile (id, name, address, phone, email, tax_id, payment_details, logo) - VALUES (1, ?, ?, ?, ?, ?, ?, ?) - ON CONFLICT(id) DO UPDATE SET - name = excluded.name, - address = excluded.address, - phone = excluded.phone, - email = excluded.email, - tax_id = excluded.tax_id, - payment_details = excluded.payment_details, - logo = excluded.logo; - """, - ( - name, - address, - phone, - email, - tax_id, - payment_details, - Binary(logo) if logo else None, - ), - ) - - # ------------------------- Invoices -------------------------------# - - def create_invoice( - self, - project_id: int, - invoice_number: str, - issue_date: str, - due_date: str | None, - currency: str, - tax_label: str | None, - tax_rate_percent: float | None, - detail_mode: str, # 'detailed' or 'summary' - line_items: list[tuple[str, float, int]], # (description, hours, rate_cents) - time_log_ids: list[int], - ) -> int: - """ - Create invoice + line items + link time logs. - Returns invoice ID. - """ - if line_items: - first_rate_cents = line_items[0][2] - else: - first_rate_cents = 0 - - total_hours = sum(hours for _desc, hours, _rate in line_items) - subtotal_cents = int(round(total_hours * first_rate_cents)) - tax_cents = int(round(subtotal_cents * (tax_rate_percent or 0) / 100.0)) - total_cents = subtotal_cents + tax_cents - - with self.conn: - cur = self.conn.cursor() - cur.execute( - """ - INSERT INTO invoices ( - project_id, - invoice_number, - issue_date, - due_date, - currency, - tax_label, - tax_rate_percent, - subtotal_cents, - tax_cents, - total_cents, - detail_mode - ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) - """, - ( - project_id, - invoice_number, - issue_date, - due_date, - currency, - tax_label, - tax_rate_percent, - subtotal_cents, - tax_cents, - total_cents, - detail_mode, - ), - ) - invoice_id = cur.lastrowid - - # Line items - for desc, hours, rate_cents in line_items: - amount_cents = int(round(hours * rate_cents)) - cur.execute( - """ - INSERT INTO invoice_line_items ( - invoice_id, description, hours, rate_cents, amount_cents - ) - VALUES (?, ?, ?, ?, ?) - """, - (invoice_id, desc, hours, rate_cents, amount_cents), - ) - - # Link time logs - for tl_id in time_log_ids: - cur.execute( - "INSERT INTO invoice_time_log (invoice_id, time_log_id) VALUES (?, ?)", - (invoice_id, tl_id), - ) - - return invoice_id - - def get_invoice_count_by_project_id_and_year( - self, project_id: int, year: str - ) -> None: - with self.conn: - row = self.conn.execute( - "SELECT COUNT(*) AS c FROM invoices WHERE project_id = ? AND issue_date LIKE ?", - (project_id, year), - ).fetchone() - return row["c"] - - def get_all_invoices(self, project_id: int | None = None) -> None: - with self.conn: - if project_id is None: - rows = self.conn.execute( - """ - SELECT - i.id, - i.project_id, - p.name AS project_name, - i.invoice_number, - i.issue_date, - i.due_date, - i.currency, - i.tax_label, - i.tax_rate_percent, - i.subtotal_cents, - i.tax_cents, - i.total_cents, - i.paid_at, - i.payment_note - FROM invoices AS i - LEFT JOIN projects AS p ON p.id = i.project_id - ORDER BY i.issue_date DESC, i.invoice_number COLLATE NOCASE; - """ - ).fetchall() - else: - rows = self.conn.execute( - """ - SELECT - i.id, - i.project_id, - p.name AS project_name, - i.invoice_number, - i.issue_date, - i.due_date, - i.currency, - i.tax_label, - i.tax_rate_percent, - i.subtotal_cents, - i.tax_cents, - i.total_cents, - i.paid_at, - i.payment_note - FROM invoices AS i - LEFT JOIN projects AS p ON p.id = i.project_id - WHERE i.project_id = ? - ORDER BY i.issue_date DESC, i.invoice_number COLLATE NOCASE; - """, - (project_id,), - ).fetchall() - return rows - - def _validate_invoice_field(self, field: str) -> str: - if field not in self._INVOICE_COLUMN_ALLOWLIST: - raise ValueError(f"Invalid invoice field name: {field!r}") - return field - - def get_invoice_field_by_id(self, invoice_id: int, field: str) -> None: - field = self._validate_invoice_field(field) - - with self.conn: - row = self.conn.execute( - f"SELECT {field} FROM invoices WHERE id = ?", # nosec B608 - (invoice_id,), - ).fetchone() - return row - - def set_invoice_field_by_id( - self, invoice_id: int, field: str, value: str | None = None - ) -> None: - field = self._validate_invoice_field(field) - - with self.conn: - self.conn.execute( - f"UPDATE invoices SET {field} = ? WHERE id = ?", # nosec B608 - ( - value, - invoice_id, - ), - ) - - def update_invoice_number(self, invoice_id: int, invoice_number: str) -> None: - with self.conn: - self.conn.execute( - "UPDATE invoices SET invoice_number = ? WHERE id = ?", - (invoice_number, invoice_id), - ) - - def set_invoice_document(self, invoice_id: int, document_id: int) -> None: - with self.conn: - self.conn.execute( - "UPDATE invoices SET document_id = ? WHERE id = ?", - (document_id, invoice_id), - ) - - def time_logs_for_range( - self, - project_id: int, - start_date_iso: str, - end_date_iso: str, - ) -> list[TimeLogRow]: - """ - Return raw time log rows for a project/date range. - - Shape matches time_log_for_date: TimeLogRow. - """ - cur = self.conn.cursor() - rows = cur.execute( - """ - SELECT - t.id, - t.page_date, - t.project_id, - p.name AS project_name, - t.activity_id, - a.name AS activity_name, - t.minutes, - t.note, - t.created_at AS created_at - FROM time_log t - JOIN projects p ON p.id = t.project_id - JOIN activities a ON a.id = t.activity_id - WHERE t.project_id = ? - AND t.page_date BETWEEN ? AND ? - ORDER BY t.page_date, LOWER(a.name), t.id; - """, - (project_id, start_date_iso, end_date_iso), - ).fetchall() - - result: list[TimeLogRow] = [] - for r in rows: - result.append( - ( - r["id"], - r["page_date"], - r["project_id"], - r["project_name"], - r["activity_id"], - r["activity_name"], - r["minutes"], - r["note"], - r["created_at"], - ) - ) - return result diff --git a/bouquin/document_utils.py b/bouquin/document_utils.py deleted file mode 100644 index fd7313e..0000000 --- a/bouquin/document_utils.py +++ /dev/null @@ -1,64 +0,0 @@ -""" -Utility functions for document operations. - -This module provides shared functionality for document handling across -different widgets (TodaysDocumentsWidget, DocumentsDialog, SearchResultsDialog, -and TagBrowserDialog). -""" - -from __future__ import annotations - -import tempfile -from pathlib import Path -from typing import TYPE_CHECKING, Optional - -from PySide6.QtCore import QUrl -from PySide6.QtGui import QDesktopServices -from PySide6.QtWidgets import QMessageBox, QWidget - -from . import strings - -if TYPE_CHECKING: - from .db import DBManager - - -def open_document_from_db( - db: DBManager, doc_id: int, file_name: str, parent_widget: Optional[QWidget] = None -) -> bool: - """ - Open a document by fetching it from the database and opening with system default app. - """ - # Fetch document data from database - try: - data = db.document_data(doc_id) - except Exception as e: - # Show error dialog if parent widget is provided - if parent_widget: - QMessageBox.warning( - parent_widget, - strings._("project_documents_title"), - strings._("documents_open_failed").format(error=str(e)), - ) - return False - - # Extract file extension - suffix = Path(file_name).suffix or "" - - # Create temporary file with same extension - tmp = tempfile.NamedTemporaryFile( - prefix="bouquin_doc_", - suffix=suffix, - delete=False, - ) - - # Write data to temp file - try: - tmp.write(data) - tmp.flush() - finally: - tmp.close() - - # Open with system default application - success = QDesktopServices.openUrl(QUrl.fromLocalFile(tmp.name)) - - return success diff --git a/bouquin/documents.py b/bouquin/documents.py deleted file mode 100644 index 9f5a40f..0000000 --- a/bouquin/documents.py +++ /dev/null @@ -1,601 +0,0 @@ -from __future__ import annotations - -from typing import Optional - -from PySide6.QtCore import Qt -from PySide6.QtGui import QColor -from PySide6.QtWidgets import ( - QAbstractItemView, - QComboBox, - QDialog, - QFileDialog, - QFormLayout, - QFrame, - QHBoxLayout, - QHeaderView, - QLineEdit, - QListWidget, - QListWidgetItem, - QMessageBox, - QPushButton, - QSizePolicy, - QStyle, - QTableWidget, - QTableWidgetItem, - QToolButton, - QVBoxLayout, - QWidget, -) - -from . import strings -from .db import DBManager, DocumentRow -from .settings import load_db_config -from .time_log import TimeCodeManagerDialog - - -class TodaysDocumentsWidget(QFrame): - """ - Collapsible sidebar widget showing today's documents. - """ - - def __init__( - self, db: DBManager, date_iso: str, parent: QWidget | None = None - ) -> None: - super().__init__(parent) - self._db = db - self._current_date = date_iso - - self.setFrameShape(QFrame.StyledPanel) - self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) - - # Header (toggle + open-documents button) - self.toggle_btn = QToolButton() - self.toggle_btn.setText(strings._("todays_documents")) - self.toggle_btn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - self.toggle_btn.setCheckable(True) - self.toggle_btn.setChecked(False) - self.toggle_btn.setArrowType(Qt.RightArrow) - self.toggle_btn.clicked.connect(self._on_toggle) - - self.open_btn = QToolButton() - self.open_btn.setIcon( - self.style().standardIcon(QStyle.SP_FileDialogDetailedView) - ) - self.open_btn.setToolTip(strings._("project_documents_title")) - self.open_btn.setAutoRaise(True) - self.open_btn.clicked.connect(self._open_documents_dialog) - - header = QHBoxLayout() - header.setContentsMargins(0, 0, 0, 0) - header.addWidget(self.toggle_btn) - header.addStretch(1) - header.addWidget(self.open_btn) - - # Body: list of today's documents - self.body = QWidget() - body_layout = QVBoxLayout(self.body) - body_layout.setContentsMargins(0, 4, 0, 0) - body_layout.setSpacing(2) - - self.list = QListWidget() - self.list.setSelectionMode(QAbstractItemView.SingleSelection) - self.list.setMaximumHeight(160) - self.list.itemDoubleClicked.connect(self._open_selected_document) - body_layout.addWidget(self.list) - - self.body.setVisible(False) - - main = QVBoxLayout(self) - main.setContentsMargins(0, 0, 0, 0) - main.addLayout(header) - main.addWidget(self.body) - - # Initial fill - self.reload() - - # ----- public API --------------------------------------------------- - - def reload(self) -> None: - """Refresh the list of today's documents.""" - self.list.clear() - - rows = self._db.todays_documents(self._current_date) - if not rows: - item = QListWidgetItem(strings._("todays_documents_none")) - item.setFlags(item.flags() & ~Qt.ItemIsEnabled) - self.list.addItem(item) - return - - for doc_id, file_name, project_name in rows: - label = file_name - extra_parts = [] - if project_name: - extra_parts.append(project_name) - if extra_parts: - label = f"{file_name} - " + " · ".join(extra_parts) - - item = QListWidgetItem(label) - item.setData( - Qt.ItemDataRole.UserRole, - {"doc_id": doc_id, "file_name": file_name}, - ) - self.list.addItem(item) - - # ----- internals ---------------------------------------------------- - - def set_current_date(self, date_iso: str) -> None: - self._current_date = date_iso - self.reload() - - def _on_toggle(self, checked: bool) -> None: - self.body.setVisible(checked) - self.toggle_btn.setArrowType(Qt.DownArrow if checked else Qt.RightArrow) - if checked: - self.reload() - - def _open_selected_document(self, item: QListWidgetItem) -> None: - data = item.data(Qt.ItemDataRole.UserRole) - if not isinstance(data, dict): - return - doc_id = data.get("doc_id") - file_name = data.get("file_name") or "" - if doc_id is None or not file_name: - return - self._open_document(int(doc_id), file_name) - - def _open_document(self, doc_id: int, file_name: str) -> None: - """Open a document from the list.""" - from .document_utils import open_document_from_db - - open_document_from_db(self._db, doc_id, file_name, parent_widget=self) - - def _open_documents_dialog(self) -> None: - """Open the full DocumentsDialog.""" - dlg = DocumentsDialog(self._db, self, current_date=self._current_date) - dlg.exec() - # Refresh after any changes - self.reload() - - -class DocumentsDialog(QDialog): - """ - Per-project document manager. - - - Choose a project - - See list of attached documents - - Add (from file), open (via temp file), delete - - Inline-edit description - - Inline-edit tags (comma-separated), using the global tags table - """ - - FILE_COL = 0 - TAGS_COL = 1 - DESC_COL = 2 - ADDED_COL = 3 - SIZE_COL = 4 - - def __init__( - self, - db: DBManager, - parent: QWidget | None = None, - initial_project_id: Optional[int] = None, - current_date: Optional[str] = None, - ) -> None: - super().__init__(parent) - self._db = db - self.cfg = load_db_config() - self._reloading_docs = False - self._search_text: str = "" - self._current_date = current_date # Store the current date for document uploads - - self.setWindowTitle(strings._("project_documents_title")) - self.resize(900, 450) - - root = QVBoxLayout(self) - - # --- Project selector ------------------------------------------------- - form = QFormLayout() - proj_row = QHBoxLayout() - self.project_combo = QComboBox() - self.manage_projects_btn = QPushButton(strings._("manage_projects")) - self.manage_projects_btn.clicked.connect(self._manage_projects) - proj_row.addWidget(self.project_combo, 1) - proj_row.addWidget(self.manage_projects_btn) - form.addRow(strings._("project"), proj_row) - - # --- Search box (all projects) ---------------------------------------- - self.search_edit = QLineEdit() - self.search_edit.setClearButtonEnabled(True) - self.search_edit.setPlaceholderText(strings._("documents_search_placeholder")) - self.search_edit.textChanged.connect(self._on_search_text_changed) - form.addRow(strings._("documents_search_label"), self.search_edit) - - root.addLayout(form) - - self.project_combo.currentIndexChanged.connect(self._on_project_changed) - - # --- Table of documents ---------------------------------------------- - self.table = QTableWidget() - self.table.setColumnCount(5) - self.table.setHorizontalHeaderLabels( - [ - strings._("documents_col_file"), # FILE_COL - strings._("documents_col_tags"), # TAGS_COL - strings._("documents_col_description"), # DESC_COL - strings._("documents_col_added"), # ADDED_COL - strings._("documents_col_size"), # SIZE_COL - ] - ) - - header = self.table.horizontalHeader() - header.setSectionResizeMode(self.FILE_COL, QHeaderView.Stretch) - header.setSectionResizeMode(self.TAGS_COL, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.DESC_COL, QHeaderView.Stretch) - header.setSectionResizeMode(self.ADDED_COL, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.SIZE_COL, QHeaderView.ResizeToContents) - - self.table.setSelectionBehavior(QAbstractItemView.SelectRows) - self.table.setSelectionMode(QAbstractItemView.SingleSelection) - # Editable: tags + description - self.table.setEditTriggers( - QAbstractItemView.DoubleClicked | QAbstractItemView.SelectedClicked - ) - - self.table.itemChanged.connect(self._on_item_changed) - self.table.itemDoubleClicked.connect(self._on_open_clicked) - - root.addWidget(self.table, 1) - - # --- Buttons --------------------------------------------------------- - btn_row = QHBoxLayout() - btn_row.addStretch(1) - - self.add_btn = QPushButton(strings._("documents_add")) - self.add_btn.clicked.connect(self._on_add_clicked) - btn_row.addWidget(self.add_btn) - - self.open_btn = QPushButton(strings._("documents_open")) - self.open_btn.clicked.connect(self._on_open_clicked) - btn_row.addWidget(self.open_btn) - - self.delete_btn = QPushButton(strings._("documents_delete")) - self.delete_btn.clicked.connect(self._on_delete_clicked) - btn_row.addWidget(self.delete_btn) - - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - btn_row.addWidget(close_btn) - - root.addLayout(btn_row) - - # Separator at bottom (purely cosmetic) - line = QFrame() - line.setFrameShape(QFrame.HLine) - line.setFrameShadow(QFrame.Sunken) - root.addWidget(line) - - # Init data - self._reload_projects() - self._select_initial_project(initial_project_id) - self._reload_documents() - - # --- Helpers ------------------------------------------------------------- - - def _reload_projects(self) -> None: - self.project_combo.blockSignals(True) - try: - self.project_combo.clear() - for proj_id, name in self._db.list_projects(): - self.project_combo.addItem(name, proj_id) - finally: - self.project_combo.blockSignals(False) - - def _select_initial_project(self, project_id: Optional[int]) -> None: - if project_id is None: - if self.project_combo.count() > 0: - self.project_combo.setCurrentIndex(0) - return - - idx = self.project_combo.findData(project_id) - if idx >= 0: - self.project_combo.setCurrentIndex(idx) - elif self.project_combo.count() > 0: - self.project_combo.setCurrentIndex(0) - - def _current_project(self) -> Optional[int]: - idx = self.project_combo.currentIndex() - if idx < 0: - return None - proj_id = self.project_combo.itemData(idx) - return int(proj_id) if proj_id is not None else None - - def _manage_projects(self) -> None: - dlg = TimeCodeManagerDialog(self._db, focus_tab="projects", parent=self) - dlg.exec() - self._reload_projects() - self._reload_documents() - - def _on_search_text_changed(self, text: str) -> None: - """Update the in-memory search text and reload the table.""" - self._search_text = text - self._reload_documents() - - def _reload_documents(self) -> None: - - search = (self._search_text or "").strip() - - self._reloading_docs = True - try: - self.table.setRowCount(0) - - if search: - # Global search across all projects - rows: list[DocumentRow] = self._db.search_documents(search) - - else: - proj_id = self._current_project() - if proj_id is None: - return - - rows = self._db.documents_for_project(proj_id) - - self.table.setRowCount(len(rows)) - - for row_idx, r in enumerate(rows): - ( - doc_id, - _project_id, - project_name, - file_name, - description, - size_bytes, - uploaded_at, - ) = r - - # Col 0: File - file_item = QTableWidgetItem(file_name) - file_item.setData(Qt.ItemDataRole.UserRole, doc_id) - file_item.setFlags(file_item.flags() & ~Qt.ItemIsEditable) - self.table.setItem(row_idx, self.FILE_COL, file_item) - - # Col 1: Tags (comma-separated) - tags = self._db.get_tags_for_document(doc_id) - tag_names = [name for (_tid, name, _color) in tags] - tags_text = ", ".join(tag_names) - tags_item = QTableWidgetItem(tags_text) - - # If there is at least one tag, colour the cell using the first tag's colour - if tags: - first_color = tags[0][2] - if first_color: - col = QColor(first_color) - tags_item.setBackground(col) - # Choose a readable text color - if col.lightness() < 128: - tags_item.setForeground(QColor("#ffffff")) - else: - tags_item.setForeground(QColor("#000000")) - - self.table.setItem(row_idx, self.TAGS_COL, tags_item) - if not self.cfg.tags: - self.table.hideColumn(self.TAGS_COL) - - # Col 2: Description (editable) - desc_item = QTableWidgetItem(description or "") - self.table.setItem(row_idx, self.DESC_COL, desc_item) - - # Col 3: Added at (editable) - added_label = uploaded_at - added_item = QTableWidgetItem(added_label) - self.table.setItem(row_idx, self.ADDED_COL, added_item) - - # Col 4: Size (not editable) - size_item = QTableWidgetItem(self._format_size(size_bytes)) - size_item.setFlags(size_item.flags() & ~Qt.ItemIsEditable) - self.table.setItem(row_idx, self.SIZE_COL, size_item) - finally: - self._reloading_docs = False - - # --- Signals ------------------------------------------------------------- - - def _on_project_changed(self, idx: int) -> None: - _ = idx - self._reload_documents() - - def _on_add_clicked(self) -> None: - proj_id = self._current_project() - if proj_id is None: - QMessageBox.warning( - self, - strings._("project_documents_title"), - strings._("documents_no_project_selected"), - ) - return - - paths, _ = QFileDialog.getOpenFileNames( - self, - strings._("documents_add"), - "", - strings._("documents_file_filter_all"), - ) - if not paths: - return - - for path in paths: - try: - self._db.add_document_from_path( - proj_id, path, uploaded_at=self._current_date - ) - except Exception as e: # pragma: no cover - QMessageBox.warning( - self, - strings._("project_documents_title"), - strings._("documents_add_failed").format(error=str(e)), - ) - - self._reload_documents() - - def _selected_doc_meta(self) -> tuple[Optional[int], Optional[str]]: - row = self.table.currentRow() - if row < 0: - return None, None - - file_item = self.table.item(row, self.FILE_COL) - if file_item is None: - return None, None - - doc_id = file_item.data(Qt.ItemDataRole.UserRole) - file_name = file_item.text() - return (int(doc_id) if doc_id is not None else None, file_name) - - def _on_open_clicked(self, *args) -> None: - doc_id, file_name = self._selected_doc_meta() - if doc_id is None or not file_name: - return - self._open_document(doc_id, file_name) - - def _on_delete_clicked(self) -> None: - doc_id, _file_name = self._selected_doc_meta() - if doc_id is None: - return - - resp = QMessageBox.question( - self, - strings._("project_documents_title"), - strings._("documents_confirm_delete"), - ) - if resp != QMessageBox.StandardButton.Yes: - return - - self._db.delete_document(doc_id) - self._reload_documents() - - def _on_item_changed(self, item: QTableWidgetItem) -> None: - """ - Handle inline edits to Description, Tags, and Added date. - """ - if self._reloading_docs or item is None: - return - - row = item.row() - col = item.column() - - file_item = self.table.item(row, self.FILE_COL) - if file_item is None: - return - - doc_id = file_item.data(Qt.ItemDataRole.UserRole) - if doc_id is None: - return - - doc_id = int(doc_id) - - # Description column - if col == self.DESC_COL: - desc = item.text().strip() or None - self._db.update_document_description(doc_id, desc) - return - - # Tags column - if col == self.TAGS_COL: - raw = item.text() - # split on commas, strip, drop empties - names = [p.strip() for p in raw.split(",") if p.strip()] - self._db.set_tags_for_document(doc_id, names) - - # Re-normalise text to the canonical tag names stored in DB - tags = self._db.get_tags_for_document(doc_id) - tag_names = [name for (_tid, name, _color) in tags] - tags_text = ", ".join(tag_names) - - self._reloading_docs = True - try: - item.setText(tags_text) - # Reset / apply background based on first tag colour - if tags: - first_color = tags[0][2] - if first_color: - col = QColor(first_color) - item.setBackground(col) - if col.lightness() < 128: - item.setForeground(QColor("#ffffff")) - else: - item.setForeground(QColor("#000000")) - else: - # No tags: clear background / foreground to defaults - item.setBackground(QColor()) - item.setForeground(QColor()) - finally: - self._reloading_docs = False - return - - # Added date column - if col == self.ADDED_COL: - date_str = item.text().strip() - - # Validate date format (YYYY-MM-DD) - if not self._validate_date_format(date_str): - QMessageBox.warning( - self, - strings._("project_documents_title"), - ( - strings._("documents_invalid_date_format") - if hasattr(strings, "_") - and callable(getattr(strings, "_")) - and "documents_invalid_date_format" in dir(strings) - else f"Invalid date format. Please use YYYY-MM-DD format.\nExample: {date_str[:4]}-01-15" - ), - ) - # Reload to reset the cell to its original value - self._reload_documents() - return - - # Update the database - self._db.update_document_uploaded_at(doc_id, date_str) - return - - # --- utils ------------------------------------------------------------- - - def _validate_date_format(self, date_str: str) -> bool: - """ - Validate that a date string is in YYYY-MM-DD format. - - Returns True if valid, False otherwise. - """ - import re - from datetime import datetime - - # Check basic format with regex - if not re.match(r"^\d{4}-\d{2}-\d{2}$", date_str): - return False - - # Validate it's a real date - try: - datetime.strptime(date_str, "%Y-%m-%d") - return True - except ValueError: - return False - - def _open_document(self, doc_id: int, file_name: str) -> None: - """ - Fetch BLOB from DB, write to a temporary file, and open with default app. - """ - from .document_utils import open_document_from_db - - open_document_from_db(self._db, doc_id, file_name, parent_widget=self) - - @staticmethod - def _format_size(size_bytes: int) -> str: - """ - Human-readable file size. - """ - if size_bytes < 1024: - return f"{size_bytes} B" - kb = size_bytes / 1024.0 - if kb < 1024: - return f"{kb:.1f} KB" - mb = kb / 1024.0 - if mb < 1024: - return f"{mb:.1f} MB" - gb = mb / 1024.0 - return f"{gb:.1f} GB" diff --git a/bouquin/find_bar.py b/bouquin/find_bar.py index 99a1fcd..8136c06 100644 --- a/bouquin/find_bar.py +++ b/bouquin/find_bar.py @@ -1,18 +1,21 @@ from __future__ import annotations from PySide6.QtCore import Qt, Signal -from PySide6.QtGui import QShortcut, QTextCharFormat, QTextCursor, QTextDocument -from PySide6.QtWidgets import ( - QCheckBox, - QHBoxLayout, - QLabel, - QLineEdit, - QPushButton, - QTextEdit, - QWidget, +from PySide6.QtGui import ( + QShortcut, + QTextCursor, + QTextCharFormat, + QTextDocument, +) +from PySide6.QtWidgets import ( + QWidget, + QHBoxLayout, + QLineEdit, + QLabel, + QPushButton, + QCheckBox, + QTextEdit, ) - -from . import strings class FindBar(QWidget): @@ -38,17 +41,17 @@ class FindBar(QWidget): layout = QHBoxLayout(self) layout.setContentsMargins(6, 0, 6, 0) - layout.addWidget(QLabel(strings._("find"))) + layout.addWidget(QLabel("Find:")) self.edit = QLineEdit(self) - self.edit.setPlaceholderText(strings._("find_bar_type_to_search")) + self.edit.setPlaceholderText("Type to search") layout.addWidget(self.edit) - self.case = QCheckBox(strings._("find_bar_match_case"), self) + self.case = QCheckBox("Match case", self) layout.addWidget(self.case) - self.prevBtn = QPushButton(strings._("previous"), self) - self.nextBtn = QPushButton(strings._("next"), self) + self.prevBtn = QPushButton("Prev", self) + self.nextBtn = QPushButton("Next", self) self.closeBtn = QPushButton("✕", self) self.closeBtn.setFlat(True) layout.addWidget(self.prevBtn) @@ -117,6 +120,8 @@ class FindBar(QWidget): return flags def find_next(self): + if not self.editor: + return txt = self.edit.text() if not txt: return @@ -142,6 +147,8 @@ class FindBar(QWidget): self._update_highlight() def find_prev(self): + if not self.editor: + return txt = self.edit.text() if not txt: return diff --git a/bouquin/flow_layout.py b/bouquin/flow_layout.py deleted file mode 100644 index e2a1c5a..0000000 --- a/bouquin/flow_layout.py +++ /dev/null @@ -1,88 +0,0 @@ -from __future__ import annotations - -from PySide6.QtCore import QPoint, QRect, QSize, Qt -from PySide6.QtWidgets import QLayout - - -class FlowLayout(QLayout): - def __init__( - self, parent=None, margin: int = 0, hspacing: int = 4, vspacing: int = 4 - ): - super().__init__(parent) - self._items = [] - self._hspace = hspacing - self._vspace = vspacing - self.setContentsMargins(margin, margin, margin, margin) - - def addItem(self, item): - self._items.append(item) - - def itemAt(self, index): - if 0 <= index < len(self._items): - return self._items[index] - return None - - def takeAt(self, index): - if 0 <= index < len(self._items): - return self._items.pop(index) - return None - - def count(self): - return len(self._items) - - def expandingDirections(self): - return Qt.Orientations(Qt.Orientation(0)) - - def hasHeightForWidth(self): - return True - - def heightForWidth(self, width: int) -> int: - return self._do_layout(QRect(0, 0, width, 0), test_only=True) - - def setGeometry(self, rect: QRect): - super().setGeometry(rect) - self._do_layout(rect, test_only=False) - - def sizeHint(self) -> QSize: - return self.minimumSize() - - def minimumSize(self) -> QSize: - size = QSize() - for item in self._items: - size = size.expandedTo(item.minimumSize()) - left, top, right, bottom = self.getContentsMargins() - size += QSize(left + right, top + bottom) - return size - - def _do_layout(self, rect: QRect, test_only: bool) -> int: - x = rect.x() - y = rect.y() - line_height = 0 - - left, top, right, bottom = self.getContentsMargins() - effective_rect = rect.adjusted(+left, +top, -right, -bottom) - x = effective_rect.x() - y = effective_rect.y() - max_right = effective_rect.right() - - for item in self._items: - wid = item.widget() - if wid is None or not wid.isVisible(): - continue - space_x = self._hspace - space_y = self._vspace - next_x = x + item.sizeHint().width() + space_x - if next_x - space_x > max_right and line_height > 0: - # Wrap - x = effective_rect.x() - y = y + line_height + space_y - next_x = x + item.sizeHint().width() + space_x - line_height = 0 - - if not test_only: - item.setGeometry(QRect(QPoint(x, y), item.sizeHint())) - - x = next_x - line_height = max(line_height, item.sizeHint().height()) - - return y + line_height - rect.y() + bottom diff --git a/bouquin/fonts/DejaVu.license b/bouquin/fonts/DejaVu.license deleted file mode 100644 index 8d71958..0000000 --- a/bouquin/fonts/DejaVu.license +++ /dev/null @@ -1,187 +0,0 @@ -Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. -Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) - - -Bitstream Vera Fonts Copyright ------------------------------- - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is -a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute the -Font Software, including without limitation the rights to use, copy, merge, -publish, distribute, and/or sell copies of the Font Software, and to permit -persons to whom the Font Software is furnished to do so, subject to the -following conditions: - -The above copyright and trademark notices and this permission notice shall -be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and -additional glyphs or characters may be added to the Fonts, only if the fonts -are renamed to names not containing either the words "Bitstream" or the word -"Vera". - -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Bitstream -Vera" names. - -The Font Software may be sold as part of a larger software package but no -copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME -FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING -ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE -FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font Software -without prior written authorization from the Gnome Foundation or Bitstream -Inc., respectively. For further information, contact: fonts at gnome dot -org. - -Arev Fonts Copyright ------------------------------- - -Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and -associated documentation files (the "Font Software"), to reproduce -and distribute the modifications to the Bitstream Vera Font Software, -including without limitation the rights to use, copy, merge, publish, -distribute, and/or sell copies of the Font Software, and to permit -persons to whom the Font Software is furnished to do so, subject to -the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Tavmjong Bah" or the word "Arev". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Tavmjong Bah Arev" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the name of Tavmjong Bah shall not -be used in advertising or otherwise to promote the sale, use or other -dealings in this Font Software without prior written authorization -from Tavmjong Bah. For further information, contact: tavmjong @ free -. fr. - -TeX Gyre DJV Math ------------------ -Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. - -Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski -(on behalf of TeX users groups) are in public domain. - -Letters imported from Euler Fraktur from AMSfonts are (c) American -Mathematical Society (see below). -Bitstream Vera Fonts Copyright -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera -is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license (“Fonts”) and associated -documentation -files (the “Font Software”), to reproduce and distribute the Font Software, -including without limitation the rights to use, copy, merge, publish, -distribute, -and/or sell copies of the Font Software, and to permit persons to whom -the Font Software is furnished to do so, subject to the following -conditions: - -The above copyright and trademark notices and this permission notice -shall be -included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and -additional -glyphs or characters may be added to the Fonts, only if the fonts are -renamed -to names not containing either the words “Bitstream” or the word “Vera”. - -This License becomes null and void to the extent applicable to Fonts or -Font Software -that has been modified and is distributed under the “Bitstream Vera” -names. - -The Font Software may be sold as part of a larger software package but -no copy -of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME -FOUNDATION -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, -SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE -THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. -Except as contained in this notice, the names of GNOME, the GNOME -Foundation, -and Bitstream Inc., shall not be used in advertising or otherwise to promote -the sale, use or other dealings in this Font Software without prior written -authorization from the GNOME Foundation or Bitstream Inc., respectively. -For further information, contact: fonts at gnome dot org. - -AMSFonts (v. 2.2) copyright - -The PostScript Type 1 implementation of the AMSFonts produced by and -previously distributed by Blue Sky Research and Y&Y, Inc. are now freely -available for general use. This has been accomplished through the -cooperation -of a consortium of scientific publishers with Blue Sky Research and Y&Y. -Members of this consortium include: - -Elsevier Science IBM Corporation Society for Industrial and Applied -Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) - -In order to assure the authenticity of these fonts, copyright will be -held by -the American Mathematical Society. This is not meant to restrict in any way -the legitimate use of the fonts, such as (but not limited to) electronic -distribution of documents containing these fonts, inclusion of these fonts -into other public domain or commercial font collections or computer -applications, use of the outline data to create derivative fonts and/or -faces, etc. However, the AMS does require that the AMS copyright notice be -removed from any derivative versions of the fonts which have been altered in -any way. In addition, to ensure the fidelity of TeX documents using Computer -Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, -has requested that any alterations which yield different font metrics be -given a different name. - -$Id$ diff --git a/bouquin/fonts/DejaVuSans.ttf b/bouquin/fonts/DejaVuSans.ttf deleted file mode 100644 index e5f7eec..0000000 Binary files a/bouquin/fonts/DejaVuSans.ttf and /dev/null differ diff --git a/bouquin/fonts/Noto.license b/bouquin/fonts/Noto.license deleted file mode 100644 index c37cc47..0000000 --- a/bouquin/fonts/Noto.license +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -https://openfontlicense.org - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/bouquin/fonts/NotoSansSymbols2-Regular.ttf b/bouquin/fonts/NotoSansSymbols2-Regular.ttf deleted file mode 100644 index 7816268..0000000 Binary files a/bouquin/fonts/NotoSansSymbols2-Regular.ttf and /dev/null differ diff --git a/bouquin/history_dialog.py b/bouquin/history_dialog.py index c145cce..1127852 100644 --- a/bouquin/history_dialog.py +++ b/bouquin/history_dialog.py @@ -1,30 +1,20 @@ from __future__ import annotations -import difflib -import html as _html -import re +import difflib, re, html as _html from datetime import datetime - -from PySide6.QtCore import QDate, Qt, Slot +from PySide6.QtCore import Qt, Slot from PySide6.QtWidgets import ( - QAbstractItemView, - QCalendarWidget, QDialog, - QDialogButtonBox, + QVBoxLayout, QHBoxLayout, - QLabel, QListWidget, QListWidgetItem, - QMessageBox, QPushButton, - QTabWidget, + QMessageBox, QTextBrowser, - QVBoxLayout, + QTabWidget, ) -from . import strings -from .theme import ThemeManager - def _markdown_to_text(s: str) -> str: """Convert markdown to plain text for diff comparison.""" @@ -53,9 +43,7 @@ def _colored_unified_diff_html(old_md: str, new_md: str) -> str: """Return HTML with colored unified diff (+ green, - red, context gray).""" a = _markdown_to_text(old_md).splitlines() b = _markdown_to_text(new_md).splitlines() - ud = difflib.unified_diff( - a, b, fromfile=strings._("current"), tofile=strings._("selected"), lineterm="" - ) + ud = difflib.unified_diff(a, b, fromfile="current", tofile="selected", lineterm="") lines = [] for line in ud: if line.startswith("+") and not line.startswith("+++"): @@ -77,33 +65,19 @@ def _colored_unified_diff_html(old_md: str, new_md: str) -> str: class HistoryDialog(QDialog): """Show versions for a date, preview, diff, and allow revert.""" - def __init__( - self, db, date_iso: str, parent=None, themes: ThemeManager | None = None - ): + def __init__(self, db, date_iso: str, parent=None): super().__init__(parent) - self.setWindowTitle(f"{strings._('history')} — {date_iso}") + self.setWindowTitle(f"History — {date_iso}") self._db = db self._date = date_iso - self._themes = themes self._versions = [] # list[dict] from DB self._current_id = None # id of current root = QVBoxLayout(self) - # --- Top: date label + change-date button - date_row = QHBoxLayout() - self.date_label = QLabel(strings._("date_label").format(date=date_iso)) - date_row.addWidget(self.date_label) - date_row.addStretch(1) - self.change_date_btn = QPushButton(strings._("change_date")) - self.change_date_btn.clicked.connect(self._on_change_date_clicked) - date_row.addWidget(self.change_date_btn) - root.addLayout(date_row) - # Top: list of versions top = QHBoxLayout() self.list = QListWidget() - self.list.setSelectionMode(QAbstractItemView.ExtendedSelection) self.list.setMinimumSize(500, 650) self.list.currentItemChanged.connect(self._on_select) top.addWidget(self.list, 1) @@ -114,8 +88,8 @@ class HistoryDialog(QDialog): self.preview.setOpenExternalLinks(True) self.diff = QTextBrowser() self.diff.setOpenExternalLinks(False) - self.tabs.addTab(self.preview, strings._("history_dialog_preview")) - self.tabs.addTab(self.diff, strings._("history_dialog_diff")) + self.tabs.addTab(self.preview, "Preview") + self.tabs.addTab(self.diff, "Diff") self.tabs.setMinimumSize(500, 650) top.addWidget(self.tabs, 2) @@ -124,66 +98,16 @@ class HistoryDialog(QDialog): # Buttons row = QHBoxLayout() row.addStretch(1) - self.btn_revert = QPushButton(strings._("history_dialog_revert_to_selected")) + self.btn_revert = QPushButton("Revert to Selected") self.btn_revert.clicked.connect(self._revert) - self.btn_delete = QPushButton(strings._("history_dialog_delete")) - self.btn_delete.clicked.connect(self._delete) - self.btn_close = QPushButton(strings._("close")) + self.btn_close = QPushButton("Close") self.btn_close.clicked.connect(self.reject) row.addWidget(self.btn_revert) - row.addWidget(self.btn_delete) row.addWidget(self.btn_close) root.addLayout(row) self._load_versions() - @Slot() - def _on_change_date_clicked(self) -> None: - """Let the user choose a different date and reload entries.""" - - # Start from current dialog date; fall back to today if invalid - current_qdate = QDate.fromString(self._date, Qt.ISODate) - if not current_qdate.isValid(): - current_qdate = QDate.currentDate() - - dlg = QDialog(self) - dlg.setWindowTitle(strings._("select_date_title")) - - layout = QVBoxLayout(dlg) - - calendar = QCalendarWidget(dlg) - calendar.setSelectedDate(current_qdate) - layout.addWidget(calendar) - # Apply the same theming as the main sidebar calendar - if self._themes is not None: - self._themes.register_calendar(calendar) - - buttons = QDialogButtonBox( - QDialogButtonBox.Ok | QDialogButtonBox.Cancel, parent=dlg - ) - buttons.accepted.connect(dlg.accept) - buttons.rejected.connect(dlg.reject) - layout.addWidget(buttons) - - if dlg.exec() != QDialog.Accepted: - return - - new_qdate = calendar.selectedDate() - new_iso = new_qdate.toString(Qt.ISODate) - if new_iso == self._date: - # No change - return - - # Update state - self._date = new_iso - - # Update window title and header label - self.setWindowTitle(strings._("for").format(date=new_iso)) - self.date_label.setText(strings._("date_label").format(date=new_iso)) - - # Reload entries for the newly selected date - self._load_versions() - # --- Data/UX helpers --- def _load_versions(self): # [{id,version_no,created_at,note,is_current}] @@ -202,7 +126,7 @@ class HistoryDialog(QDialog): if v.get("note"): label += f" · {v['note']}" if v["is_current"]: - label += " **(" + strings._("current") + ")**" + label += " **(current)**" it = QListWidgetItem(label) it.setData(Qt.UserRole, v["id"]) self.list.addItem(it) @@ -217,28 +141,26 @@ class HistoryDialog(QDialog): @Slot() def _on_select(self): - selected_items = self.list.selectedItems() item = self.list.currentItem() - if not item or len(selected_items) > 1: + if not item: self.preview.clear() self.diff.clear() self.btn_revert.setEnabled(False) return - sel_id = item.data(Qt.UserRole) sel = self._db.get_version(version_id=sel_id) self.preview.setMarkdown(sel["content"]) # Diff vs current (textual diff) cur = self._db.get_version(version_id=self._current_id) self.diff.setHtml(_colored_unified_diff_html(cur["content"], sel["content"])) - - # Enable revert and delete buttons only if selecting a non-current version + # Enable revert only if selecting a non-current version self.btn_revert.setEnabled(sel_id != self._current_id) - self.btn_delete.setEnabled(sel_id != self._current_id) @Slot() def _revert(self): item = self.list.currentItem() + if not item: + return sel_id = item.data(Qt.UserRole) if sel_id == self._current_id: return @@ -246,24 +168,6 @@ class HistoryDialog(QDialog): try: self._db.revert_to_version(self._date, version_id=sel_id) except Exception as e: - QMessageBox.critical( - self, strings._("history_dialog_revert_failed"), str(e) - ) + QMessageBox.critical(self, "Revert failed", str(e)) return self.accept() - - @Slot() - def _delete(self): - selected_items = self.list.selectedItems() - for item in selected_items: - sel_id = item.data(Qt.UserRole) - if sel_id == self._current_id: - return - try: - self._db.delete_version(version_id=sel_id) - except Exception as e: - QMessageBox.critical( - self, strings._("history_dialog_delete_failed"), str(e) - ) - return - return self._load_versions() diff --git a/bouquin/icons/bouquin.svg b/bouquin/icons/bouquin.svg deleted file mode 100644 index b282050..0000000 --- a/bouquin/icons/bouquin.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bouquin/invoices.py b/bouquin/invoices.py deleted file mode 100644 index 18071d6..0000000 --- a/bouquin/invoices.py +++ /dev/null @@ -1,1445 +0,0 @@ -from __future__ import annotations - -from dataclasses import dataclass -from enum import Enum - -from PySide6.QtCore import QDate, Qt, QUrl, Signal -from PySide6.QtGui import QDesktopServices, QImage, QPageLayout, QTextDocument -from PySide6.QtPrintSupport import QPrinter -from PySide6.QtWidgets import ( - QAbstractItemView, - QButtonGroup, - QCheckBox, - QComboBox, - QDateEdit, - QDialog, - QDoubleSpinBox, - QFileDialog, - QFormLayout, - QHBoxLayout, - QHeaderView, - QLabel, - QLineEdit, - QMessageBox, - QPushButton, - QRadioButton, - QTableWidget, - QTableWidgetItem, - QTextEdit, - QVBoxLayout, - QWidget, -) -from sqlcipher3 import dbapi2 as sqlite3 - -from . import strings -from .db import DBManager, TimeLogRow -from .reminders import Reminder, ReminderType -from .settings import load_db_config - - -class InvoiceDetailMode(str, Enum): - DETAILED = "detailed" - SUMMARY = "summary" - - -@dataclass -class InvoiceLineItem: - description: str - hours: float - rate_cents: int - amount_cents: int - - -# Default time of day for automatically created invoice reminders (HH:MM) -_INVOICE_REMINDER_TIME = "09:00" - - -def _invoice_due_reminder_text(project_name: str, invoice_number: str) -> str: - """Build the human-readable text for an invoice due-date reminder. - - Using a single helper keeps the text consistent between creation and - removal of reminders. - """ - project = project_name.strip() or "(no project)" - number = invoice_number.strip() or "?" - return f"Invoice {number} for {project} is due" - - -class InvoiceDialog(QDialog): - """ - Create an invoice for a project + date range from time logs. - """ - - COL_INCLUDE = 0 - COL_DATE = 1 - COL_ACTIVITY = 2 - COL_NOTE = 3 - COL_HOURS = 4 - COL_AMOUNT = 5 - - remindersChanged = Signal() - - def __init__( - self, - db: DBManager, - project_id: int, - start_date_iso: str, - end_date_iso: str, - time_rows: list[TimeLogRow] | None = None, - parent=None, - ): - super().__init__(parent) - self._db = db - self._project_id = project_id - self._start = start_date_iso - self._end = end_date_iso - - self.cfg = load_db_config() - - if time_rows is not None: - self._time_rows = time_rows - else: - # Fallback if dialog is ever used standalone - self._time_rows = db.time_logs_for_range( - project_id, start_date_iso, end_date_iso - ) - - self.setWindowTitle(strings._("invoice_dialog_title")) - - layout = QVBoxLayout(self) - - # -------- Header / metadata -------- - form = QFormLayout() - - # Project label - proj_name = self._project_name() - self.project_label = QLabel(proj_name) - form.addRow(strings._("project") + ":", self.project_label) - - # Invoice number - self.invoice_number_edit = QLineEdit(self._suggest_invoice_number()) - form.addRow(strings._("invoice_number") + ":", self.invoice_number_edit) - - # Issue + due dates - today = QDate.currentDate() - self.issue_date_edit = QDateEdit(today) - self.issue_date_edit.setDisplayFormat("yyyy-MM-dd") - self.issue_date_edit.setCalendarPopup(True) - form.addRow(strings._("invoice_issue_date") + ":", self.issue_date_edit) - - self.due_date_edit = QDateEdit(today.addDays(14)) - self.due_date_edit.setDisplayFormat("yyyy-MM-dd") - self.due_date_edit.setCalendarPopup(True) - form.addRow(strings._("invoice_due_date") + ":", self.due_date_edit) - - # Billing defaults from project_billing - pb = db.get_project_billing(project_id) - if pb: - ( - _pid, - hourly_rate_cents, - currency, - tax_label, - tax_rate_percent, - client_name, - client_company, - client_address, - client_email, - ) = pb - else: - hourly_rate_cents = 0 - currency = "AUD" - tax_label = "GST" - tax_rate_percent = None - client_name = client_company = client_address = client_email = "" - - # Currency - self.currency_edit = QLineEdit(currency) - form.addRow(strings._("invoice_currency") + ":", self.currency_edit) - - # Hourly rate - self.rate_spin = QDoubleSpinBox() - self.rate_spin.setRange(0, 1_000_000) - self.rate_spin.setDecimals(2) - self.rate_spin.setValue(hourly_rate_cents / 100.0) - self.rate_spin.valueChanged.connect(self._recalc_amounts) - form.addRow(strings._("invoice_hourly_rate") + ":", self.rate_spin) - - # Tax - self.tax_checkbox = QCheckBox(strings._("invoice_apply_tax")) - self.tax_label = QLabel(strings._("invoice_tax_label") + ":") - self.tax_label_edit = QLineEdit(tax_label or "") - - self.tax_rate_label = QLabel(strings._("invoice_tax_rate") + " %:") - self.tax_rate_spin = QDoubleSpinBox() - self.tax_rate_spin.setRange(0, 100) - self.tax_rate_spin.setDecimals(2) - - tax_row = QHBoxLayout() - tax_row.addWidget(self.tax_checkbox) - tax_row.addWidget(self.tax_label) - tax_row.addWidget(self.tax_label_edit) - tax_row.addWidget(self.tax_rate_label) - tax_row.addWidget(self.tax_rate_spin) - form.addRow(strings._("invoice_tax") + ":", tax_row) - - if tax_rate_percent is None: - self.tax_rate_spin.setValue(10.0) - self.tax_checkbox.setChecked(False) - self.tax_label.hide() - self.tax_label_edit.hide() - self.tax_rate_label.hide() - self.tax_rate_spin.hide() - else: - self.tax_rate_spin.setValue(tax_rate_percent) - self.tax_checkbox.setChecked(True) - self.tax_label.show() - self.tax_label_edit.show() - self.tax_rate_label.show() - self.tax_rate_spin.show() - - # When tax settings change, recalc totals - self.tax_checkbox.toggled.connect(self._on_tax_toggled) - self.tax_rate_spin.valueChanged.connect(self._recalc_totals) - - # Client info - self.client_name_edit = QLineEdit(client_name or "") - - # Client company as an editable combo box with existing clients - self.client_company_combo = QComboBox() - self.client_company_combo.setEditable(True) - - companies = self._db.list_client_companies() - # Add existing companies - for comp in companies: - if comp: - self.client_company_combo.addItem(comp) - - # If this project already has a client_company, select it or set as text - if client_company: - idx = self.client_company_combo.findText( - client_company, Qt.MatchFixedString - ) - if idx >= 0: - self.client_company_combo.setCurrentIndex(idx) - else: - self.client_company_combo.setEditText(client_company) - - # When the company text changes (selection or typed), try autofill - self.client_company_combo.currentTextChanged.connect( - self._on_client_company_changed - ) - - self.client_addr_edit = QTextEdit() - self.client_addr_edit.setPlainText(client_address or "") - self.client_email_edit = QLineEdit(client_email or "") - - form.addRow(strings._("invoice_client_name") + ":", self.client_name_edit) - form.addRow( - strings._("invoice_client_company") + ":", self.client_company_combo - ) - form.addRow(strings._("invoice_client_address") + ":", self.client_addr_edit) - form.addRow(strings._("invoice_client_email") + ":", self.client_email_edit) - - layout.addLayout(form) - - # -------- Detail mode + table -------- - mode_row = QHBoxLayout() - self.rb_detailed = QRadioButton(strings._("invoice_mode_detailed")) - self.rb_summary = QRadioButton(strings._("invoice_mode_summary")) - self.rb_detailed.setChecked(True) - self.mode_group = QButtonGroup(self) - self.mode_group.addButton(self.rb_detailed) - self.mode_group.addButton(self.rb_summary) - self.rb_detailed.toggled.connect(self._update_mode_enabled) - mode_row.addWidget(self.rb_detailed) - mode_row.addWidget(self.rb_summary) - mode_row.addStretch() - layout.addLayout(mode_row) - - # Detailed table (time entries) - self.table = QTableWidget() - self.table.setColumnCount(6) - self.table.setHorizontalHeaderLabels( - [ - "", # include checkbox - strings._("date"), - strings._("activity"), - strings._("note"), - strings._("invoice_hours"), - strings._("invoice_amount"), - ] - ) - self.table.setSelectionMode(QAbstractItemView.NoSelection) - header = self.table.horizontalHeader() - header.setSectionResizeMode(self.COL_INCLUDE, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_DATE, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_ACTIVITY, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_NOTE, QHeaderView.Stretch) - header.setSectionResizeMode(self.COL_HOURS, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_AMOUNT, QHeaderView.ResizeToContents) - layout.addWidget(self.table) - - self._populate_detailed_rows(hourly_rate_cents) - self.table.itemChanged.connect(self._on_table_item_changed) - - # Summary line - self.summary_desc_label = QLabel(strings._("invoice_summary_desc") + ":") - self.summary_desc_edit = QLineEdit(strings._("invoice_summary_default_desc")) - self.summary_hours_label = QLabel(strings._("invoice_summary_hours") + ":") - self.summary_hours_spin = QDoubleSpinBox() - self.summary_hours_spin.setRange(0, 10_000) - self.summary_hours_spin.setDecimals(2) - self.summary_hours_spin.setValue(self._total_hours_from_table()) - self.summary_hours_spin.valueChanged.connect(self._recalc_totals) - - summary_row = QHBoxLayout() - summary_row.addWidget(self.summary_desc_label) - summary_row.addWidget(self.summary_desc_edit) - summary_row.addWidget(self.summary_hours_label) - summary_row.addWidget(self.summary_hours_spin) - layout.addLayout(summary_row) - - # -------- Totals -------- - totals_row = QHBoxLayout() - self.subtotal_label = QLabel("0.00") - self.tax_label_total = QLabel("0.00") - self.total_label = QLabel("0.00") - totals_row.addStretch() - totals_row.addWidget(QLabel(strings._("invoice_subtotal") + ":")) - totals_row.addWidget(self.subtotal_label) - totals_row.addWidget(QLabel(strings._("invoice_tax_total") + ":")) - totals_row.addWidget(self.tax_label_total) - totals_row.addWidget(QLabel(strings._("invoice_total") + ":")) - totals_row.addWidget(self.total_label) - layout.addLayout(totals_row) - - # -------- Buttons -------- - btn_row = QHBoxLayout() - btn_row.addStretch() - self.btn_save = QPushButton(strings._("invoice_save_and_export")) - self.btn_save.clicked.connect(self._on_save_clicked) - btn_row.addWidget(self.btn_save) - - cancel_btn = QPushButton(strings._("cancel")) - cancel_btn.clicked.connect(self.reject) - btn_row.addWidget(cancel_btn) - layout.addLayout(btn_row) - - self._update_mode_enabled() - self._recalc_totals() - - def _project_name(self) -> str: - # relies on TimeLogRow including project_name - if self._time_rows: - return self._time_rows[0][3] - # fallback: query projects table - return self._db.list_projects_by_id(self._project_id) - - def _suggest_invoice_number(self) -> str: - # Very simple example: YYYY-XXX based on count - today = QDate.currentDate() - year = today.toString("yyyy") - last = self._db.get_invoice_count_by_project_id_and_year( - self._project_id, f"{year}-%" - ) - seq = int(last) + 1 - return f"{year}-{seq:03d}" - - def _create_due_date_reminder( - self, invoice_id: int, invoice_number: str, due_date_iso: str - ) -> None: - """Create a one-off reminder on the invoice's due date. - - The reminder is purely informational and is keyed by its text so - that it can be found and deleted later when the invoice is paid. - """ - # No due date, nothing to remind about. - if not due_date_iso: - return - - # Build consistent text and create a Reminder dataclass instance. - project_name = self._project_name() - text = _invoice_due_reminder_text(project_name, invoice_number) - - reminder = Reminder( - id=None, - text=text, - time_str=_INVOICE_REMINDER_TIME, - reminder_type=ReminderType.ONCE, - weekday=None, - active=True, - date_iso=due_date_iso, - ) - - try: - # Save without failing the invoice flow if something goes wrong. - self._db.save_reminder(reminder) - self.remindersChanged.emit() - except Exception: - pass - - def _populate_detailed_rows(self, hourly_rate_cents: int) -> None: - self.table.blockSignals(True) - try: - self.table.setRowCount(len(self._time_rows)) - rate = hourly_rate_cents / 100.0 if hourly_rate_cents else 0.0 - - for row_idx, tl in enumerate(self._time_rows): - ( - tl_id, - page_date, - _proj_id, - _proj_name, - _act_id, - activity_name, - minutes, - note, - _created_at, - ) = tl - - # include checkbox - chk_item = QTableWidgetItem() - chk_item.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled) - chk_item.setCheckState(Qt.Checked) - chk_item.setData(Qt.UserRole, tl_id) - self.table.setItem(row_idx, self.COL_INCLUDE, chk_item) - - self.table.setItem(row_idx, self.COL_DATE, QTableWidgetItem(page_date)) - self.table.setItem( - row_idx, self.COL_ACTIVITY, QTableWidgetItem(activity_name) - ) - self.table.setItem(row_idx, self.COL_NOTE, QTableWidgetItem(note or "")) - - hours = minutes / 60.0 - - # Hours - editable via spin box (override allowed) - hours_spin = QDoubleSpinBox() - hours_spin.setRange(0, 24) - hours_spin.setDecimals(2) - hours_spin.setValue(hours) - hours_spin.valueChanged.connect(self._recalc_totals) - self.table.setCellWidget(row_idx, self.COL_HOURS, hours_spin) - - amount = hours * rate - amount_item = QTableWidgetItem(f"{amount:.2f}") - amount_item.setTextAlignment(Qt.AlignRight | Qt.AlignVCenter) - amount_item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable) - self.table.setItem(row_idx, self.COL_AMOUNT, amount_item) - finally: - self.table.blockSignals(False) - - def _total_hours_from_table(self) -> float: - total = 0.0 - for r in range(self.table.rowCount()): - include_item = self.table.item(r, self.COL_INCLUDE) - if include_item and include_item.checkState() == Qt.Checked: - hours_widget = self.table.cellWidget(r, self.COL_HOURS) - if isinstance(hours_widget, QDoubleSpinBox): - total += hours_widget.value() - return total - - def _detail_line_items(self) -> list[InvoiceLineItem]: - rate_cents = int(round(self.rate_spin.value() * 100)) - items: list[InvoiceLineItem] = [] - for r in range(self.table.rowCount()): - include_item = self.table.item(r, self.COL_INCLUDE) - if include_item and include_item.checkState() == Qt.Checked: - date_str = self.table.item(r, self.COL_DATE).text() - activity = self.table.item(r, self.COL_ACTIVITY).text() - note = self.table.item(r, self.COL_NOTE).text() - - descr_parts = [date_str, activity] - if note: - descr_parts.append(note) - descr = " - ".join(descr_parts) - - hours_widget = self.table.cellWidget(r, self.COL_HOURS) - hours = ( - hours_widget.value() - if isinstance(hours_widget, QDoubleSpinBox) - else 0.0 - ) - amount_cents = int(round(hours * rate_cents)) - items.append( - InvoiceLineItem( - description=descr, - hours=hours, - rate_cents=rate_cents, - amount_cents=amount_cents, - ) - ) - return items - - def _summary_line_items(self) -> list[InvoiceLineItem]: - rate_cents = int(round(self.rate_spin.value() * 100)) - hours = self.summary_hours_spin.value() - amount_cents = int(round(hours * rate_cents)) - return [ - InvoiceLineItem( - description=self.summary_desc_edit.text().strip() or "Services", - hours=hours, - rate_cents=rate_cents, - amount_cents=amount_cents, - ) - ] - - def _update_mode_enabled(self) -> None: - detailed = self.rb_detailed.isChecked() - self.table.setEnabled(detailed) - if not detailed: - self.summary_desc_label.show() - self.summary_desc_edit.show() - self.summary_hours_label.show() - self.summary_hours_spin.show() - else: - self.summary_desc_label.hide() - self.summary_desc_edit.hide() - self.summary_hours_label.hide() - self.summary_hours_spin.hide() - self.resize(self.sizeHint().width(), self.sizeHint().height()) - self._recalc_totals() - - def _recalc_amounts(self) -> None: - # Called when rate changes - rate = self.rate_spin.value() - for r in range(self.table.rowCount()): - hours_widget = self.table.cellWidget(r, self.COL_HOURS) - if isinstance(hours_widget, QDoubleSpinBox): - hours = hours_widget.value() - amount = hours * rate - amount_item = self.table.item(r, self.COL_AMOUNT) - if amount_item: - amount_item.setText(f"{amount:.2f}") - self._recalc_totals() - - def _recalc_totals(self) -> None: - if self.rb_detailed.isChecked(): - items = self._detail_line_items() - else: - items = self._summary_line_items() - - rate_cents = int(round(self.rate_spin.value() * 100)) - total_hours = sum(li.hours for li in items) - subtotal_cents = int(round(total_hours * rate_cents)) - - tax_rate = self.tax_rate_spin.value() if self.tax_checkbox.isChecked() else 0.0 - tax_cents = int(round(subtotal_cents * (tax_rate / 100.0))) - total_cents = subtotal_cents + tax_cents - - self.subtotal_label.setText(f"{subtotal_cents / 100.0:.2f}") - self.tax_label_total.setText(f"{tax_cents / 100.0:.2f}") - self.total_label.setText(f"{total_cents / 100.0:.2f}") - - def _on_table_item_changed(self, item: QTableWidgetItem) -> None: - """Handle changes to table items, particularly checkbox toggles.""" - if item and item.column() == self.COL_INCLUDE: - self._recalc_totals() - - def _on_tax_toggled(self, checked: bool) -> None: - # if on, show the other tax fields - if checked: - self.tax_label.show() - self.tax_label_edit.show() - self.tax_rate_label.show() - self.tax_rate_spin.show() - else: - self.tax_label.hide() - self.tax_label_edit.hide() - self.tax_rate_label.hide() - self.tax_rate_spin.hide() - - # If user just turned tax ON and the rate is 0, give a sensible default - if checked and self.tax_rate_spin.value() == 0.0: - self.tax_rate_spin.setValue(10.0) - self.resize(self.sizeHint().width(), self.sizeHint().height()) - self._recalc_totals() - - def _on_client_company_changed(self, text: str) -> None: - text = text.strip() - if not text: - return - - details = self._db.get_client_by_company(text) - if not details: - # New client - leave other fields as-is - return - - # We don't touch the company combo text - user already chose/typed it. - client_name, client_company, client_address, client_email = details - if client_name: - self.client_name_edit.setText(client_name) - if client_address: - self.client_addr_edit.setPlainText(client_address) - if client_email: - self.client_email_edit.setText(client_email) - - def _on_save_clicked(self) -> None: - invoice_number = self.invoice_number_edit.text().strip() - if not invoice_number: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_number_required"), - ) - return - - issue_date = self.issue_date_edit.date() - due_date = self.due_date_edit.date() - issue_date_iso = issue_date.toString("yyyy-MM-dd") - due_date_iso = due_date.toString("yyyy-MM-dd") - - # Guard against due date before issue date - if due_date.isValid() and issue_date.isValid() and due_date < issue_date: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_due_before_issue"), - ) - return - - detail_mode = ( - InvoiceDetailMode.DETAILED - if self.rb_detailed.isChecked() - else InvoiceDetailMode.SUMMARY - ) - - # Build line items & collect time_log_ids - if detail_mode == InvoiceDetailMode.DETAILED: - items = self._detail_line_items() - time_log_ids: list[int] = [] - for r in range(self.table.rowCount()): - include_item = self.table.item(r, self.COL_INCLUDE) - if include_item and include_item.checkState() == Qt.Checked: - tl_id = int(include_item.data(Qt.UserRole)) - time_log_ids.append(tl_id) - else: - items = self._summary_line_items() - # In summary mode we still link all rows used for the report - time_log_ids = [tl[0] for tl in self._time_rows] - - if not items: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_no_items"), - ) - return - - # Rate & tax info - rate_cents = int(round(self.rate_spin.value() * 100)) - currency = self.currency_edit.text().strip() - tax_label = self.tax_label_edit.text().strip() or None - tax_rate_percent = ( - self.tax_rate_spin.value() if self.tax_checkbox.isChecked() else None - ) - - # Persist billing settings for this project (fills project_billing) - self._db.upsert_project_billing( - project_id=self._project_id, - hourly_rate_cents=rate_cents, - currency=currency, - tax_label=tax_label, - tax_rate_percent=tax_rate_percent, - client_name=self.client_name_edit.text().strip() or None, - client_company=self.client_company_combo.currentText().strip() or None, - client_address=self.client_addr_edit.toPlainText().strip() or None, - client_email=self.client_email_edit.text().strip() or None, - ) - - try: - # Create invoice in DB - invoice_id = self._db.create_invoice( - project_id=self._project_id, - invoice_number=invoice_number, - issue_date=issue_date_iso, - due_date=due_date_iso, - currency=currency, - tax_label=tax_label, - tax_rate_percent=tax_rate_percent, - detail_mode=detail_mode.value, - line_items=[(li.description, li.hours, li.rate_cents) for li in items], - time_log_ids=time_log_ids, - ) - - # Automatically create a reminder for the invoice due date - if self.cfg.reminders: - self._create_due_date_reminder(invoice_id, invoice_number, due_date_iso) - - except sqlite3.IntegrityError: - # (project_id, invoice_number) must be unique - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_number_unique"), - ) - return - - # Generate PDF - pdf_path = self._export_pdf(invoice_id, items) - # Save to Documents if the Documents feature is enabled - if pdf_path and self.cfg.documents: - doc_id = self._db.add_document_from_path( - self._project_id, - pdf_path, - description=f"Invoice {invoice_number}", - ) - self._db.set_invoice_document(invoice_id, doc_id) - - self.accept() - - def _export_pdf(self, invoice_id: int, items: list[InvoiceLineItem]) -> str | None: - proj_name = self._project_name() - safe_proj = proj_name.replace(" ", "_") or "project" - invoice_number = self.invoice_number_edit.text().strip() - filename = f"{safe_proj}_invoice_{invoice_number}.pdf" - - path, _ = QFileDialog.getSaveFileName( - self, - strings._("invoice_save_pdf_title"), - filename, - "PDF (*.pdf)", - ) - if not path: - return None - - printer = QPrinter(QPrinter.HighResolution) - printer.setOutputFormat(QPrinter.PdfFormat) - printer.setOutputFileName(path) - printer.setPageOrientation(QPageLayout.Portrait) - - doc = QTextDocument() - - # Load company profile before building HTML - profile = self._db.get_company_profile() - self._company_profile = None - if profile: - name, address, phone, email, tax_id, payment_details, logo_bytes = profile - self._company_profile = { - "name": name, - "address": address, - "phone": phone, - "email": email, - "tax_id": tax_id, - "payment_details": payment_details, - } - if logo_bytes: - img = QImage.fromData(logo_bytes) - if not img.isNull(): - doc.addResource( - QTextDocument.ImageResource, QUrl("company_logo"), img - ) - - html = self._build_invoice_html(items) - doc.setHtml(html) - doc.print_(printer) - - QDesktopServices.openUrl(QUrl.fromLocalFile(path)) - return path - - def _build_invoice_html(self, items: list[InvoiceLineItem]) -> str: - # Monetary values based on current labels (these are kept in sync by _recalc_totals) - try: - subtotal = float(self.subtotal_label.text()) - except ValueError: - subtotal = 0.0 - try: - tax_total = float(self.tax_label_total.text()) - except ValueError: - tax_total = 0.0 - total = subtotal + tax_total - - currency = self.currency_edit.text().strip() - issue = self.issue_date_edit.date().toString("yyyy-MM-dd") - due = self.due_date_edit.date().toString("yyyy-MM-dd") - inv_no = self.invoice_number_edit.text().strip() or "-" - proj = self._project_name() - - # --- Client block (Bill to) ------------------------------------- - client_lines = [ - self.client_company_combo.currentText().strip(), - self.client_name_edit.text().strip(), - self.client_addr_edit.toPlainText().strip(), - self.client_email_edit.text().strip(), - ] - client_lines = [ln for ln in client_lines if ln] - client_block = "
".join( - line.replace("&", "&") - .replace("<", "<") - .replace(">", ">") - .replace("\n", "
") - for line in client_lines - ) - - # --- Company block (From) --------------------------------------- - company_html = "" - if self._company_profile: - cp = self._company_profile - lines = [ - cp.get("name"), - cp.get("address"), - cp.get("phone"), - cp.get("email"), - "Tax ID/Business No: " + cp.get("tax_id"), - ] - lines = [ln for ln in lines if ln] - company_html = "
".join( - line.replace("&", "&") - .replace("<", "<") - .replace(">", ">") - .replace("\n", "
") - for line in lines - ) - - logo_html = "" - if self._company_profile: - # "company_logo" resource is registered in _export_pdf - logo_html = ( - '' - ) - - # --- Items table ------------------------------------------------- - item_rows_html = "" - for idx, li in enumerate(items, start=1): - desc = li.description or "" - desc = ( - desc.replace("&", "&") - .replace("<", "<") - .replace(">", ">") - .replace("\n", "
") - ) - hours_str = f"{li.hours:.2f}".rstrip("0").rstrip(".") - price = li.rate_cents / 100.0 - amount = li.amount_cents / 100.0 - item_rows_html += f""" - - - {desc} - - - {hours_str} - - - {price:,.2f} {currency} - - - {amount:,.2f} {currency} - - - """ - - if not item_rows_html: - item_rows_html = """ - - - (No items) - - - """ - - # --- Tax summary line ------------------------------------------- - if tax_total > 0.0: - tax_label = self.tax_label_edit.text().strip() or "Tax" - tax_summary_text = f"{tax_label} has been added." - tax_line_label = tax_label - invoice_title = "TAX INVOICE" - else: - tax_summary_text = "No tax has been charged." - tax_line_label = "Tax" - invoice_title = "INVOICE" - - # --- Optional payment / terms text ----------------------------- - if self._company_profile and self._company_profile.get("payment_details"): - raw_payment = self._company_profile["payment_details"] - else: - raw_payment = "Please pay by the due date. Thank you!" - - lines = [ln.strip() for ln in raw_payment.splitlines()] - payment_text = "\n".join(lines).strip() - - # --- Build final HTML ------------------------------------------- - html = f""" - - - - - - - - - - - - -
- {logo_html} -
- {company_html} -
- 		-
{invoice_title}
- - - - - - - - - - - - - - - - - -
Invoice no:{inv_no}
Invoice date:{issue}
Reference:{proj}
Due date:{due}
-
- - - - - - - - - -
-
BILL TO
-
{client_block}
- 		- - - - - - - - - - - - - -
Subtotal{subtotal:,.2f} {currency}
{tax_line_label}{tax_total:,.2f} {currency}
TOTAL{total:,.2f} {currency}
-
{tax_summary_text}
-
- - - - - - - - - - {item_rows_html} -
ITEMS AND DESCRIPTIONQTY/HRSPRICEAMOUNT ({currency})
- - - - - - - -
-
PAYMENT DETAILS
-
-{payment_text} -
- 		- - - - - - -
AMOUNT DUE{total:,.2f} {currency}
-
- - - - """ - - return html - - -class InvoicesDialog(QDialog): - """Manager for viewing and editing existing invoices.""" - - COL_NUMBER = 0 - COL_PROJECT = 1 - COL_ISSUE_DATE = 2 - COL_DUE_DATE = 3 - COL_CURRENCY = 4 - COL_TAX_LABEL = 5 - COL_TAX_RATE = 6 - COL_SUBTOTAL = 7 - COL_TAX = 8 - COL_TOTAL = 9 - COL_PAID_AT = 10 - COL_PAYMENT_NOTE = 11 - - remindersChanged = Signal() - - def __init__( - self, - db: DBManager, - parent: QWidget | None = None, - initial_project_id: int | None = None, - ) -> None: - super().__init__(parent) - self._db = db - self._reloading_invoices = False - self.cfg = load_db_config() - self.setWindowTitle(strings._("manage_invoices")) - self.resize(1100, 500) - - root = QVBoxLayout(self) - - # --- Project selector ------------------------------------------------- - form = QFormLayout() - form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.ExpandingFieldsGrow) - root.addLayout(form) - - proj_row = QHBoxLayout() - self.project_combo = QComboBox() - proj_row.addWidget(self.project_combo, 1) - form.addRow(strings._("project"), proj_row) - - self._reload_projects() - self._select_initial_project(initial_project_id) - - self.project_combo.currentIndexChanged.connect(self._on_project_changed) - - # --- Table of invoices ----------------------------------------------- - self.table = QTableWidget() - self.table.setColumnCount(12) - self.table.setHorizontalHeaderLabels( - [ - strings._("invoice_number"), # COL_NUMBER - strings._("project"), # COL_PROJECT - strings._("invoice_issue_date"), # COL_ISSUE_DATE - strings._("invoice_due_date"), # COL_DUE_DATE - strings._("invoice_currency"), # COL_CURRENCY - strings._("invoice_tax_label"), # COL_TAX_LABEL - strings._("invoice_tax_rate"), # COL_TAX_RATE - strings._("invoice_subtotal"), # COL_SUBTOTAL - strings._("invoice_tax_total"), # COL_TAX - strings._("invoice_total"), # COL_TOTAL - strings._("invoice_paid_at"), # COL_PAID_AT - strings._("invoice_payment_note"), # COL_PAYMENT_NOTE - ] - ) - - header = self.table.horizontalHeader() - header.setSectionResizeMode(self.COL_NUMBER, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_PROJECT, QHeaderView.Stretch) - header.setSectionResizeMode(self.COL_ISSUE_DATE, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_DUE_DATE, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_CURRENCY, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_TAX_LABEL, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_TAX_RATE, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_SUBTOTAL, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_TAX, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_TOTAL, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_PAID_AT, QHeaderView.ResizeToContents) - header.setSectionResizeMode(self.COL_PAYMENT_NOTE, QHeaderView.Stretch) - - self.table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) - self.table.setEditTriggers( - QAbstractItemView.EditTrigger.DoubleClicked - | QAbstractItemView.EditTrigger.EditKeyPressed - | QAbstractItemView.EditTrigger.SelectedClicked - ) - - root.addWidget(self.table, 1) - - # Connect after constructing the table - self.table.itemChanged.connect(self._on_item_changed) - - # --- Buttons ---------------------------------------------------------- - btn_row = QHBoxLayout() - btn_row.addStretch(1) - - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - btn_row.addWidget(close_btn) - - root.addLayout(btn_row) - - self._reload_invoices() - - # ------------------------------------------------------------------ helpers - - def _reload_projects(self) -> None: - """Populate the project combo box.""" - self.project_combo.blockSignals(True) - try: - self.project_combo.clear() - for proj_id, name in self._db.list_projects(): - self.project_combo.addItem(name, proj_id) - finally: - self.project_combo.blockSignals(False) - - def _select_initial_project(self, project_id: int | None) -> None: - if project_id is None: - if self.project_combo.count() > 0: - self.project_combo.setCurrentIndex(0) - return - - idx = self.project_combo.findData(project_id) - if idx >= 0: - self.project_combo.setCurrentIndex(idx) - elif self.project_combo.count() > 0: - self.project_combo.setCurrentIndex(0) - - def _current_project(self) -> int | None: - idx = self.project_combo.currentIndex() - if idx < 0: - return None - data = self.project_combo.itemData(idx) - return int(data) if data is not None else None - - # ----------------------------------------------------------------- reloading - - def _on_project_changed(self, idx: int) -> None: - _ = idx - self._reload_invoices() - - def _reload_invoices(self) -> None: - """Load invoices for the current project into the table.""" - self._reloading_invoices = True - try: - self.table.setRowCount(0) - project_id = self._current_project() - rows = self._db.get_all_invoices(project_id) - - self.table.setRowCount(len(rows) or 0) - - for row_idx, r in enumerate(rows): - inv_id = int(r["id"]) - proj_name = r["project_name"] or "" - invoice_number = r["invoice_number"] or "" - issue_date = r["issue_date"] or "" - due_date = r["due_date"] or "" - currency = r["currency"] or "" - tax_label = r["tax_label"] or "" - tax_rate = ( - r["tax_rate_percent"] if r["tax_rate_percent"] is not None else None - ) - subtotal_cents = r["subtotal_cents"] or 0 - tax_cents = r["tax_cents"] or 0 - total_cents = r["total_cents"] or 0 - paid_at = r["paid_at"] or "" - payment_note = r["payment_note"] or "" - - # Column 0: invoice number (store invoice_id in UserRole) - num_item = QTableWidgetItem(invoice_number) - num_item.setData(Qt.ItemDataRole.UserRole, inv_id) - self.table.setItem(row_idx, self.COL_NUMBER, num_item) - - # Column 1: project name (read-only) - proj_item = QTableWidgetItem(proj_name) - proj_item.setFlags(proj_item.flags() & ~Qt.ItemIsEditable) - self.table.setItem(row_idx, self.COL_PROJECT, proj_item) - - # Column 2: issue date - self.table.setItem( - row_idx, self.COL_ISSUE_DATE, QTableWidgetItem(issue_date) - ) - - # Column 3: due date - self.table.setItem( - row_idx, self.COL_DUE_DATE, QTableWidgetItem(due_date or "") - ) - - # Column 4: currency - self.table.setItem( - row_idx, self.COL_CURRENCY, QTableWidgetItem(currency) - ) - - # Column 5: tax label - self.table.setItem( - row_idx, self.COL_TAX_LABEL, QTableWidgetItem(tax_label or "") - ) - - # Column 6: tax rate - tax_rate_text = "" if tax_rate is None else f"{tax_rate:.2f}" - self.table.setItem( - row_idx, self.COL_TAX_RATE, QTableWidgetItem(tax_rate_text) - ) - - # Column 7-9: amounts (cents → dollars) - self.table.setItem( - row_idx, - self.COL_SUBTOTAL, - QTableWidgetItem(f"{subtotal_cents / 100.0:.2f}"), - ) - self.table.setItem( - row_idx, - self.COL_TAX, - QTableWidgetItem(f"{tax_cents / 100.0:.2f}"), - ) - self.table.setItem( - row_idx, - self.COL_TOTAL, - QTableWidgetItem(f"{total_cents / 100.0:.2f}"), - ) - - # Column 10: paid_at - self.table.setItem( - row_idx, self.COL_PAID_AT, QTableWidgetItem(paid_at or "") - ) - - # Column 11: payment note - self.table.setItem( - row_idx, - self.COL_PAYMENT_NOTE, - QTableWidgetItem(payment_note or ""), - ) - - finally: - self._reloading_invoices = False - - # ----------------------------------------------------------------- editing - - def _remove_invoice_due_reminder(self, row: int, inv_id: int) -> None: - """Delete any one-off reminder created for this invoice's due date. - - We look up reminders by the same text we used when creating them - to avoid needing extra schema just for this linkage. - """ - proj_item = self.table.item(row, self.COL_PROJECT) - num_item = self.table.item(row, self.COL_NUMBER) - if proj_item is None or num_item is None: - return - - project_name = proj_item.text().strip() - invoice_number = num_item.text().strip() - if not project_name or not invoice_number: - return - - target_text = _invoice_due_reminder_text(project_name, invoice_number) - - removed_any = False - - try: - reminders = self._db.get_all_reminders() - except Exception: - return - - for reminder in reminders: - if ( - reminder.id is not None - and reminder.reminder_type == ReminderType.ONCE - and reminder.text == target_text - ): - try: - self._db.delete_reminder(reminder.id) - removed_any = True - except Exception: - # Best effort; if deletion fails we silently continue. - pass - - if removed_any: - # Tell Reminders that reminders have changed - self.remindersChanged.emit() - - def _on_item_changed(self, item: QTableWidgetItem) -> None: - """Handle inline edits and write them back to the database.""" - if self._reloading_invoices: - return - - row = item.row() - col = item.column() - - base_item = self.table.item(row, self.COL_NUMBER) - if base_item is None: - return - - inv_id = base_item.data(Qt.ItemDataRole.UserRole) - if not inv_id: - return - - text = item.text().strip() - - def _reset_from_db(field: str, formatter=lambda v: v) -> None: - """Reload a single field from DB and reset the cell.""" - self._reloading_invoices = True - try: - row_db = self._db.get_invoice_field_by_id(inv_id, field) - - if row_db is None: - return - value = row_db[field] - item.setText("" if value is None else formatter(value)) - finally: - self._reloading_invoices = False - - # ---- Invoice number (unique per project) ---------------------------- - if col == self.COL_NUMBER: - if not text: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_number_required"), - ) - _reset_from_db("invoice_number", lambda v: v or "") - return - try: - self._db.update_invoice_number(inv_id, text) - except sqlite3.IntegrityError: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_number_unique"), - ) - _reset_from_db("invoice_number", lambda v: v or "") - return - - # ---- Dates: issue, due, paid_at (YYYY-MM-DD) ------------------------ - if col in (self.COL_ISSUE_DATE, self.COL_DUE_DATE, self.COL_PAID_AT): - new_date: QDate | None = None - if text: - new_date = QDate.fromString(text, "yyyy-MM-dd") - if not new_date.isValid(): - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_invalid_date_format"), - ) - field = { - self.COL_ISSUE_DATE: "issue_date", - self.COL_DUE_DATE: "due_date", - self.COL_PAID_AT: "paid_at", - }[col] - _reset_from_db(field, lambda v: v or "") - return - - # Cross-field validation: due/paid must not be before issue date - issue_item = self.table.item(row, self.COL_ISSUE_DATE) - issue_qd: QDate | None = None - if issue_item is not None: - issue_text = issue_item.text().strip() - if issue_text: - issue_qd = QDate.fromString(issue_text, "yyyy-MM-dd") - if not issue_qd.isValid(): - issue_qd = None - - if issue_qd is not None and new_date is not None: - if col == self.COL_DUE_DATE and new_date < issue_qd: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_due_before_issue"), - ) - _reset_from_db("due_date", lambda v: v or "") - return - if col == self.COL_PAID_AT and new_date < issue_qd: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_paid_before_issue"), - ) - _reset_from_db("paid_at", lambda v: v or "") - return - - field = { - self.COL_ISSUE_DATE: "issue_date", - self.COL_DUE_DATE: "due_date", - self.COL_PAID_AT: "paid_at", - }[col] - - self._db.set_invoice_field_by_id(inv_id, field, text or None) - - # If the invoice has just been marked as paid, remove any - # auto-created reminder for its due date. - if col == self.COL_PAID_AT and text and self.cfg.reminders: - self._remove_invoice_due_reminder(row, inv_id) - - return - - # ---- Simple text fields: currency, tax label, payment_note --- - if col in ( - self.COL_CURRENCY, - self.COL_TAX_LABEL, - self.COL_PAYMENT_NOTE, - ): - field = { - self.COL_CURRENCY: "currency", - self.COL_TAX_LABEL: "tax_label", - self.COL_PAYMENT_NOTE: "payment_note", - }[col] - - self._db.set_invoice_field_by_id(inv_id, field, text or None) - - if col == self.COL_CURRENCY and text: - # Normalize currency code display - self._reloading_invoices = True - try: - item.setText(text.upper()) - finally: - self._reloading_invoices = False - return - - # ---- Tax rate percent (float) --------------------------------------- - if col == self.COL_TAX_RATE: - if text: - try: - rate = float(text) - except ValueError: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_invalid_tax_rate"), - ) - _reset_from_db( - "tax_rate_percent", - lambda v: "" if v is None else f"{v:.2f}", - ) - return - value = rate - else: - value = None - - self._db.set_invoice_field_by_id(inv_id, "tax_rate_percent", value) - return - - # ---- Monetary fields (subtotal, tax, total) in dollars -------------- - if col in (self.COL_SUBTOTAL, self.COL_TAX, self.COL_TOTAL): - field = { - self.COL_SUBTOTAL: "subtotal_cents", - self.COL_TAX: "tax_cents", - self.COL_TOTAL: "total_cents", - }[col] - if not text: - cents = 0 - else: - try: - value = float(text.replace(",", "")) - except ValueError: - QMessageBox.warning( - self, - strings._("error"), - strings._("invoice_invalid_amount"), - ) - _reset_from_db( - field, - lambda v: f"{(v or 0) / 100.0:.2f}", - ) - return - cents = int(round(value * 100)) - - self._db.set_invoice_field_by_id(inv_id, field, cents) - - # Normalise formatting in the table - self._reloading_invoices = True - try: - item.setText(f"{cents / 100.0:.2f}") - finally: - self._reloading_invoices = False - return diff --git a/bouquin/key_prompt.py b/bouquin/key_prompt.py index 866f682..bef0571 100644 --- a/bouquin/key_prompt.py +++ b/bouquin/key_prompt.py @@ -1,107 +1,47 @@ from __future__ import annotations -from pathlib import Path - from PySide6.QtWidgets import ( QDialog, - QDialogButtonBox, - QFileDialog, - QHBoxLayout, + QVBoxLayout, QLabel, QLineEdit, QPushButton, - QVBoxLayout, + QDialogButtonBox, ) -from . import strings - class KeyPrompt(QDialog): def __init__( self, parent=None, - title: str = strings._("key_prompt_enter_key"), - message: str = strings._("key_prompt_enter_key"), - initial_db_path: str | Path | None = None, - show_db_change: bool = False, + title: str = "Enter key", + message: str = "Enter key", ): """ Prompt the user for the key required to decrypt the database. Used when opening the app, unlocking the idle locked screen, or when rekeying. - - If show_db_change is true, also show a QFileDialog allowing to - select a database file, else the default from settings is used. """ super().__init__(parent) self.setWindowTitle(title) - - self._db_path: Path | None = Path(initial_db_path) if initial_db_path else None - v = QVBoxLayout(self) - v.addWidget(QLabel(message)) - - # DB chooser - self.path_edit: QLineEdit | None = None - if show_db_change: - path_row = QHBoxLayout() - self.path_edit = QLineEdit() - if self._db_path is not None: - self.path_edit.setText(str(self._db_path)) - - browse_btn = QPushButton(strings._("select_notebook")) - - def _browse(): - start_dir = str(self._db_path or "") - fname, _ = QFileDialog.getOpenFileName( - self, - strings._("select_notebook"), - start_dir, - "SQLCipher DB (*.db);;All files (*)", - ) - if fname: - self._db_path = Path(fname) - if self.path_edit is not None: - self.path_edit.setText(fname) - - browse_btn.clicked.connect(_browse) - - path_row.addWidget(self.path_edit, 1) - path_row.addWidget(browse_btn) - v.addLayout(path_row) - - # Key entry - self.key_entry = QLineEdit() - self.key_entry.setEchoMode(QLineEdit.Password) - v.addWidget(self.key_entry) - - toggle = QPushButton(strings._("show")) + self.edit = QLineEdit() + self.edit.setEchoMode(QLineEdit.Password) + v.addWidget(self.edit) + toggle = QPushButton("Show") toggle.setCheckable(True) toggle.toggled.connect( - lambda c: self.key_entry.setEchoMode( + lambda c: self.edit.setEchoMode( QLineEdit.Normal if c else QLineEdit.Password ) ) v.addWidget(toggle) - bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) bb.accepted.connect(self.accept) bb.rejected.connect(self.reject) v.addWidget(bb) - self.key_entry.setFocus() - self.resize(500, self.sizeHint().height()) - def key(self) -> str: - return self.key_entry.text() - - def db_path(self) -> Path | None: - """Return the chosen DB path (or None if unchanged/not shown).""" - p = self._db_path - if self.path_edit is not None: - text = self.path_edit.text().strip() - if text: - p = Path(text) - return p + return self.edit.text() diff --git a/bouquin/keys/mig5.asc b/bouquin/keys/mig5.asc deleted file mode 100644 index 81d5fc7..0000000 --- a/bouquin/keys/mig5.asc +++ /dev/null @@ -1,109 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBGQiioEBEAD2hJIaDsfkURHpA9KUXQQezeNhSiUcIheT3vP7Tb8nU2zkIgdy -gvwvuUcXKjUn22q+paqbQu+skYEjtLEFo59ZlS2VOQ6f9ukTGu2O6HWqFWncH3Vv -Pf0UeitNOoWi+qA14mtC7c/SxuHtMG4hmlHILGZg9mlSZfpt7oyczFtV7YG9toRe -gvyM8h2BRSi3EXigsymVMgpYcW3bESVxOnNJdNEFP8fKzR9Bu7rc99abRPm5p6gw -cYo9FAdLoiE8QcNU79hQ5UTAULWXFo3hduQfAs3y0f+g8FGJZUF40Gb8YJDtarRA -J7B9/XdfDNDZE00/QxV2gUGbLVTbVjqn6dKhEOTfuvSmfQxqNNy2a1ewpJrNnsvh -XGvSzZVLNy/c4CEROisRqDCa8xUb/snnHy7gGEuD5DXqQL3wnbTXu92N8gVxLegS -fr9NW2I6/eXWrlXhWJdP5ZH9yq7FVkWha2gTByP6bcxDBvQCzKyYg4JbY9bQDtJf -z7W2W9V6QHMiGJ9/ApfgTjKn0peiouGS8GGCPqLLyVGblEIJmSfEU+0BPq9PurRH -RR/T7E4wVi3bgOfj9G5Z8dMBWh5BzN7PqxQvO1lCx7ZZteNkt/wXglLHB0eghnD0 -BCxuZ7lN12NW+lTf9s/kc0PS8YgZ0/AIFv45PHX1sVcxXizT49HQUbHa1wARAQAB -tBpNaWd1ZWwgSmFjcSA8bWlnQG1pZzUubmV0PokCVAQTAQoAPhYhBACugXwkoQwl -QEYanB183gI020WNBQJkIoqBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYCAwEAAh4B -AheAAAoJEB183gI020WN+2AQALJ58Qr4P3/lON50ulG/RgIYxXlPnyy4Ai1bDJiI -t3pLOWGQkGza6lw07rEh8Bs6w9sQ7WrpfzLRaYgqhfkBNbMtim8hRNZUuE/8O+v3 -k9GRVYCe9RWazKhno+RljJy4TaqiqBeGxnryDJWxk8O4dXmQAnsFPF09xNpktgOC -mGbclA+rM8dY3bgq5wJ5Bh10zW4psfoAT1wFYX/oV19vlHbhRx3bavoWDS4lmXYv -oWy9xwacDVoZYcbGPif3xbMbttdKH7ijf+asM3wYUsIrHeOPdHl+YK45e6AGdjwL -mvp0P4YQo8Yk3yfH3L/km/no8rwcrPbk7+lX06x2GEjOiM2OIKAZYMZnL0BREgt4 -XsD2hcQpuowxHmI2X2CHk8TnPhAXyNdX7Ss/geQ6Zx/q1Ts+mhhfQVa9AIRS+HDm -LURQRdZKBD1mB2hJsuF2WCyczuJ8jhBc+wSX/WXnQHLi2cG3OAC1udxrdDIckWb8 -4CojEbk05cnMLR3dPV/g1JeXunib569RNTAijaTr39VRBZepYJX/sO46iag2+0A4 -q41FgId2BwUS3GoyaIFZc5+MwLn65uYMgbIkfVlNkWEujoWV/aVLMrRa0udq4ZRE -ymPU8pfMhEWb3uvYCv+ed7sVxsVUMWeuQpyBQuPP1qlIzmsrEkRKryYH+ij4Vzri -OWvbuQINBGQiizkBEAC07TI3uqEUWKivXf5Mg1HnMAhpmv6yimr8PDfh3Dczy0eP -oCB6iq5wKCjYsp12E3kv3dcW4Ox8T+5U/B5ZP2lro63yeLSORUSz+jMq27rgtGmV -QFZNdKkzBzfPyzjKiZz4KaYE7Pn6v15In65SRqwqAXYUTkEoii+Ykk32qzZWIVCR -ixpRQGbBi+/XipONp8KCQANOSWSzTf8s7U1y4yhW1yCeUOK67LsSRlCtBpDWD7ki -MfX/nzSQyaXHDOrhkfVshU8eiln2Qf3mYg8gJmfFOb0zILhvCf3Sk312GtdxJo1m -B95TrDY8/7+1+l0wVrTq69tJXjQjBSmk1PBvNthSXCvuADnF8NxQlQuZtyI+rC4T -VInuLTr58YrmRIbGzOrFz+z6c532SB9F2PZvezjJ8LPDGCwW8dM6ADQxIw5cV0YE -hb5liFpeIX/NOnd1kus8Q6jyS0vzFqfgZC9kBFUTaXBM+mpDg1GYB4WS7baBQn3P -Z+7wvcN7VkfSBT2B79gJK0vfutJWBuK3p2435/KkD4PcAm6uBYL52b+Za06PQfgu -GaKxXRLREq/KCbYm4IKBkD8HRH9dmdd2U8YsApNWQ/oAHCfWvimhYUD9YOJimDwp -hX7FkaF/xHdi1/8hG8h2lok4cCtbaZPGXAUKuKHDhDFAI/OiIgv4nxq+A5kzfwAR -AQABiQRyBBgBCgAmFiEEAK6BfCShDCVARhqcHXzeAjTbRY0FAmQiizkCGwIFCQWj -moACQAkQHXzeAjTbRY3BdCAEGQEKAB0WIQQ4BFZaXvpsEa/aDlNZs/DCQTXGqQUC -ZCKLOQAKCRBZs/DCQTXGqTv6D/9eFMA3ReSg1sfPsyEFj9JiJ3H3aOJX5R5/2xdI -QZLTjH0iapgGm3h8v+bFdr4+y3xWHpcaxBJsccyOZxzr0xjr+qt5t6OZrE+e1pQh -Hw/Kt7m5SiCmbGM6I3aECv8zU4EpGUf/FXLcaBaot4eR4uPRjBLatngzLw+5Mjk1 -ZBjmyA5OaAqQzrDXPhFBItsSlHJeBOrpbzqxdjQi2AHD+L50itgfsoDOfVtmELZN -heW7xn83U2iqgu3bEq4Ug8lqh2KVBHELoxErQR+wTAIxgj/CwhVDQdrKhQ4ypbLh -O/oPlMmGFcBoMhCATNWitdqQUu7EHAECGyWCns8hm1OksqHMnbNhOzmRkl18UroZ -a1CJPFpeaEC25U37+yPEUiG4dJE8iiZAfyjv0AN1TbXzov5g9g/Xz+BmVALtOYBJ -fWKH/aTg5CU2GY9ts+bYDz+mli39h7FQQfcW+zjVWft2P4R7FvG0DBEJkbyw053R -++CEO1ARsMyygy2ukwkA06nYPlbaH5wEpQl2NV5PeYt66eU4epgL7y89/DhOSBig -JJJk+OASEh3o7rC/EkrlF/GQD8ZwO1oBO11ueDft7QU6P/TAzNqyywqZiy76kzdw -1qU77vhXlGtZQCuxbfgvpLin1ivhOaR/6gfDmsfUlSne5kp+uUrgoRhhEc/krOci -fGSFcutPD/4pziVea31UcngwJRo/s9AfHkjviVMpGJIQo3vtejq53UQu8yWWc/uW -G5z+pxOuK3QdTjtzrmOiCGj1bWZ+I33K+fBbZcf7C+o4HV9KaexW1db3wBtwUFWO -7TFezkBDaKbgxgaryh1+RcetQP7cdN2Chcy0EWf10S8/N8whj2ZyAcIuIoT8wM7i -xWmnQRiI2l2+7AhQfqGFUk+PEYRvRyRtjF8X9buYVBh/9rFrScH6aK+gicCcU1gJ -Zpc51QEDDSfAYF6wV8pWnILKcXqdDZhEh1hnTUitUL9mlZEaenGjSPCtcGVg3s9l -CuXJij89s74IyfCdjJsmy9K5GxQyhUJb0nyy5wOpGPGmDueTiP32JuXOxNeEp+gY -3rxygMNzAmL2QjLajLpE6kj+mEMBYSTWyni1W7c5i0PnOsi22yXV+2W+XaeC+9Pm -424uM8e2Y0+C9lI6AqDziL58fP2V6FxJTpbzBxANqKwSh5N0we1Cfw/ZPC0LyebZ -KbmPcNoSoqaOYXo3h0LFsDL2aA0PTJroAV1p/xxVoxDeGkX+hJXh+6ErVhEOb+gv -+LiUabBFtHTa7yPVtQWLFWf4njFQIytt8iDTpFDfK1OApe25xilrTRZT147KtKwL -5tDl33hFKbspcqALa7ozwE1Tr8/yrddainGQSIfx4CAfk8P5aqi19LkCDQRkIotT -ARAAxjaJMoCvKYNWaJ5m9K9KsfoKss8CXiy3SEhbcqh/Yy4osiODjoWjS+lsz58G -uyPphLXjdhIn9DWPnYKKoV7sB1y2RTCLsZ9jJaqHBL3e+gL78zS8hNHcq3HxWEwb -SYRHr8pBKWL7/X4m+2cuMC/wnK+QWIGB4S03yMZGMbC8GTfuj6tdO4GZYfCGVWHi -gv1ERGaArlqmXk+TkQQmTUpfhdqNBKWllZK56/oUMDNGsRrgEP8TzU4z+YbJK0FJ -7V9dY1j28K8oqLDgA+/aiLv2gpS+qsmowMhxKN/axvF+FCZbGS3+/h4subZMIcbI -xxDHSPqPgA+f0GQHIHsy9gELMQtkXTP5xzZuoDGX+F2LFb68wHd3jCNpfFVEfTP2 -8CcyLbjciyY8wod6WLa7q0VNDlSGEXH5thaNnidCwynNCF+NaFQMVf027jThp6S/ -nWtUZFPCMGx9jj8mbopkSsfF7E9fErRtCI8dAnmcE/ottvueAN7Q3XAUlsilLM8M -HhkSZobaUBynewcEIpHSY4vOfRWnhQI60WGfD7x7dMuIakao9euSg9g/u7WMCV6U -ShElJdYdpZA/H/jMFb17zuH9yp5cGNNMeUP2WvEWtUHA36nGI4+oE3SszOSRF4+E -YAozF6Hh1MrC/hXe3NShoDq68hG5e1SsndLZ1B9Gt/nAqiEAEQEAAYkCPAQYAQoA -JhYhBACugXwkoQwlQEYanB183gI020WNBQJkIotTAhsMBQkFo5qAAAoJEB183gI0 -20WNldAP/17KozqrwUA8mlYU3zpc/P0HdBtL/rn5Fx87MZ2E8RPuVMyNg6I4KoU5 -Kmh0vy6cL8vG7fqYXM1ieiy9wTMxiGaWDL7QZY3LBXQ2mFfGd2rAAhwloTEcPn6i -Ro/X0C5aBGGy5iACOfpRA774XsNQG6cgBY/Jq0/D2Jom78Vv0k3H0oD1L5BrRO/H -5L9TriBW9el4F/USpaQDjR/KiSfsBr6HLpht1OQJ+21kUbGgvse7DdTtZeK4q3wR -1v4OV9EX1m09WUL+7Cra1OFSc9bZ0fcVY98zGXm8LTtipiBc//ZrDjMutRdOj4ct -RHDiKHBEYFxHGeAj87Xwc9q6ph2MspjXS4qHVJRWtyx5DQcrf6gY3bH73SByhOXj -SVDpfeDvO4BpQ+8q4d9AjcGa6NqGTXR8P5Y8jnZG68buwGstBbz2J2fHBs0SrBMg -3T6HSB3z4gD/WkPE8bT/9oMpSLD0mdHQAYJviOa39rRGII6Jzkd1EL9tVDU9QenX -hVx2v3ZWL8Iq1Bm8zwiDAGsiHcHmxY8sQmfuwWQdYXhxXBcG0kBNKz+158uyFr9u -Skp8e1INBDShReAQuQ5PAGBIrZ5aElPaK/2puNeAmd3cholvpeu0CuEaxpLi0Tq3 -y/xhPPFMdZ4llt90sotKeYnHmvsYUJe2on8afl9bwotz8On484vVuQINBGQii2cB -EAC/YnmAiKO05oN129GedPTDrvJk6PbXHUYb5UtNisAwLVXeKSpo5OWyckDZ1IoV -9xvOdH+TWJvgX5x7gPZoD9COYHfMQRZeysZ89wCocH55PsAwmvjM87rAKLbkyZl8 -sehgsri09amBlMoSeTVN49U5lt9EZWVKZeACtDk9D86OX7r154NM7uSxvQVeydth -Bj/Rdh15RUfsKTZYxmzZ/1x3FnHzOLTDkX5QmBIBlthVN2IaT8U8pfKpoStOlBza -j1MdrdhtkDH4YAFi2X9KlkoP3Z2fYCefVcLJw+k3D8nwPyXmGuJhG0oHsPyesQGz -FSnIM6ZWhqh76yS1EQxK125NKu9FeHJBAEOg0RISpe/LhNNLjUQ0dC9gRx9l+p46 -hIMUXwMPNENMFihNqP4tRLvF/0KI1oj7634rei+dZKWuja6yk/QaOcztmcyS2Aca -n3llExISb3beNncQHaAYg8ADHR+852RZQ81yUFUF7yrxclSJmF5zO4fJAedacClA -FuGnQvIQZv01YULOtDn3fTq8eY912VZx+SxpO2IwTObYCdnSBHigQBp13UTcg5WV -HhmfwJKI328GaPkBa0eIqxc5gR7X6PmrLvxlCbrMC9IHjlwd203eKMhqRoIJYXEv -Ebsx02Zceh4tMH9RDH2XNpHLt604rCLJTReRORXsAH/zBQARAQABiQI8BBgBCgAm -FiEEAK6BfCShDCVARhqcHXzeAjTbRY0FAmQii2cCGyAFCQWjmoAACgkQHXzeAjTb -RY1TiA/+N4dIfoHMsEZ53DwrbRqDXlzTfkfqWd99tE72Lecsns2ih4/4wHOgzV7z -SV6002SZK/PHRYikmxSSxmoNbx5yNMp9vI8j031YShAJd6QU+NVjY3oB4ivF6wRa -vP2OYO0vamwTw54e5quKmg+ZntFhWY55YNWCqqcYZdHI4GtvbhsCEuS/ceZ1XoXY -xbtaNJHAn5yG+/VLNu2fiAiu+e4+xEQ2UjV8rC60MU9tZafMbALlHUXGDY0tUCzv -/BF3GDQk3dxN+fEBnassVXgZm30dOB2XqVIF5g+l6iufmT9WcDTbnXyYbEBRVTJ1 -DpTbmtwUpuYdSX41NPPojK3XcesP+PR8x7tWU7AEWzV827I4sx54HjJVMj2TWSGB -X+xDgthbqqtm1VZPNL2yHJzxHgIPqo6iQLaAGphR/L+ULFeJnFNjgOatt7vcG7pr -ZVLK1Kq+gc0X+73grlm89XC5R3mNFNOUMWXJ7YniqzCzsTiOwyGP40pvY1vP8v61 -509UcUjfXyIhls6vAl1jo/BA0jLuUODQ9P4QqWm4wy7MzMfWBmWKsaubCiiHuala -rXFaJVtIgM/bl089klXVzxD3Beo0PCnuU/6qBgkM6ulS+/wxqU7chW6ClHwdY8U0 -NU3X/uocFtQrI3WLcE0vMc0IHa8VjDb8r6ztC9Vsti6iPMdScOM= -=IfFs ------END PGP PUBLIC KEY BLOCK----- diff --git a/bouquin/locales/en.json b/bouquin/locales/en.json deleted file mode 100644 index 6c13e42..0000000 --- a/bouquin/locales/en.json +++ /dev/null @@ -1,432 +0,0 @@ -{ - "db_sqlcipher_integrity_check_failed": "SQLCipher integrity check failed", - "db_issues_reported": "issue(s) reported", - "db_reopen_failed_after_rekey": "Re-open failed after rekey", - "db_version_id_does_not_belong_to_the_given_date": "version_id does not belong to the given date", - "db_key_incorrect": "The key is probably incorrect", - "db_database_error": "Database error", - "database_maintenance": "Database maintenance", - "database_compact": "Compact the database", - "database_compact_explanation": "Compacting runs VACUUM on the database. This can help reduce its size.", - "database_compacted_successfully": "Database compacted successfully!", - "encryption": "Encryption", - "remember_key": "Remember key", - "change_encryption_key": "Change encryption key", - "enter_a_new_encryption_key": "Enter a new encryption key", - "reenter_the_new_key": "Re-enter the new key", - "key_mismatch": "Key mismatch", - "key_mismatch_explanation": "The two entries did not match.", - "empty_key": "Empty key", - "empty_key_explanation": "The key cannot be empty.", - "key_changed": "Key changed", - "key_changed_explanation": "The notebook was re-encrypted with the new key!", - "error": "Error", - "success": "Success", - "close": "&Close", - "find": "Find", - "file": "File", - "locale": "Language", - "locale_restart": "Please restart the application to load the new language.", - "settings": "Settings", - "theme": "Theme", - "system": "System", - "light": "Light", - "dark": "Dark", - "never": "Never", - "close_tab": "Close tab", - "previous": "Previous", - "previous_day": "Previous day", - "next": "Next", - "next_day": "Next day", - "today": "Today", - "show": "Show", - "edit": "Edit", - "delete": "Delete", - "history": "History", - "export_accessible_flag": "&Export", - "export_entries": "Export entries", - "export_complete": "Export complete", - "export_failed": "Export failed", - "backup": "Backup", - "backup_complete": "Backup complete", - "backup_failed": "Backup failed", - "quit": "Quit", - "cancel": "Cancel", - "save": "Save", - "help": "Help", - "saved": "Saved", - "saved_to": "Saved to", - "documentation": "Documentation", - "couldnt_open": "Couldn't open", - "report_a_bug": "Report a bug", - "version": "Version", - "update": "Update", - "check_for_updates": "Check for updates", - "could_not_check_for_updates": "Could not check for updates:\n", - "update_server_returned_an_empty_version_string": "Update server returned an empty version string", - "you_are_running_the_latest_version": "You are running the latest version:\n", - "there_is_a_new_version_available": "There is a new version available:\n", - "download_the_appimage": "Download the AppImage?", - "downloading": "Downloading", - "download_cancelled": "Download cancelled", - "failed_to_download_update": "Failed to download update:\n", - "could_not_read_bundled_gpg_public_key": "Could not read bundled GPG public key:\n", - "could_not_find_gpg_executable": "Could not find the 'gpg' executable to verify the download.", - "gpg_signature_verification_failed": "GPG signature verification failed. The downloaded files have been deleted.\n\n", - "downloaded_and_verified_new_appimage": "Downloaded and verified new AppImage:\n\n", - "navigate": "Navigate", - "current": "current", - "selected": "selected", - "find_on_page": "Find on page", - "find_next": "Find next", - "find_previous": "Find previous", - "find_bar_type_to_search": "Type to search", - "find_bar_match_case": "Match case", - "history_dialog_preview": "Preview", - "history_dialog_diff": "Diff", - "history_dialog_revert_to_selected": "&Revert to selected", - "history_dialog_revert_failed": "Revert failed", - "history_dialog_delete": "&Delete revision", - "history_dialog_delete_failed": "Could not delete revision", - "key_prompt_enter_key": "Enter key", - "lock_overlay_locked": "Locked", - "lock_overlay_unlock": "Unlock", - "main_window_lock_screen_accessibility": "&Lock screen", - "main_window_ready": "Ready", - "main_window_save_a_version": "Save a version", - "main_window_settings_accessible_flag": "Settin&gs", - "set_an_encryption_key": "Set an encryption key", - "set_an_encryption_key_explanation": "Bouquin encrypts your data.\n\nPlease create a strong passphrase to encrypt the notebook.\n\nYou can always change it later!", - "unlock_encrypted_notebook": "Unlock encrypted notebook", - "unlock_encrypted_notebook_explanation": "Enter your key to unlock the notebook", - "open_in_new_tab": "Open in new tab", - "autosave": "autosave", - "unchecked_checkbox_items_moved_to_next_day": "Unchecked checkbox items moved to next day", - "move_unchecked_todos_to_today_on_startup": "Automatically move unchecked TODOs\nfrom the last 7 days to next weekday", - "move_todos_include_weekends": "Allow moving unchecked TODOs to a weekend\nrather than next weekday", - "insert_images": "Insert images", - "images": "Images", - "reopen_failed": "Re-open failed", - "unlock_failed": "Unlock failed", - "could_not_unlock_database_at_new_path": "Could not unlock database at new path.", - "unencrypted_export": "Unencrypted export", - "unencrypted_export_warning": "Exporting the database will be unencrypted!\nAre you sure you want to continue?\nIf you want an encrypted backup, choose Backup instead of Export.", - "unrecognised_extension": "Unrecognised extension!", - "backup_encrypted_notebook": "Backup encrypted notebook", - "enter_a_name_for_this_version": "Enter a name for this version", - "new_version_i_saved_at": "New version I saved at", - "appearance": "Appearance", - "security": "Security", - "features": "Features", - "database": "Database", - "save_key_warning": "If you don't want to be prompted for your encryption key, check this to remember it.\nWARNING: the key is saved to disk and could be recoverable if your disk is compromised.", - "lock_screen_when_idle": "Lock screen when idle", - "autolock_explanation": "Bouquin will automatically lock the notepad after this length of time, after which you'll need to re-enter the key to unlock it.\nSet to 0 (never) to never lock.", - "font_size": "Font size", - "font_size_explanation": "Changing this value will change the size of all paragraph text in all tabs. It does not affect heading or code block size", - "search_for_notes_here": "Search for notes here", - "toolbar_format": "Format", - "toolbar_bold": "Bold", - "toolbar_italic": "Italic", - "toolbar_strikethrough": "Strikethrough", - "toolbar_normal_paragraph_text": "Normal paragraph text", - "toolbar_font_smaller": "Smaller text", - "toolbar_font_larger": "Larger text", - "toolbar_bulleted_list": "Bulleted list", - "toolbar_numbered_list": "Numbered list", - "toolbar_code_block": "Code block", - "toolbar_heading": "Heading", - "toolbar_toggle_checkboxes": "Toggle checkboxes", - "tags": "Tags", - "tag": "Tag", - "manage_tags": "Manage tags", - "add_tag_placeholder": "Add a tag and press Enter", - "tag_browser_title": "Tag Browser", - "tag_browser_instructions": "Click a tag to expand and see all pages with that tag. Click a date to open it. Select a tag to edit its name, change its color, or delete it globally.", - "color_hex": "Colour", - "date": "Date", - "page_or_document": "Page / Document", - "add_a_tag": "Add a tag", - "edit_tag_name": "Edit tag name", - "new_tag_name": "New tag name:", - "change_color": "Change colour", - "delete_tag": "Delete tag", - "delete_tag_confirm": "Are you sure you want to delete the tag '{name}'? This will remove it from all pages.", - "tag_already_exists_with_that_name": "A tag already exists with that name", - "statistics": "Statistics", - "main_window_statistics_accessible_flag": "Stat&istics", - "stats_group_pages": "Pages", - "stats_group_tags": "Tags", - "stats_group_documents": "Documents", - "stats_group_time_logging": "Time logging", - "stats_group_reminders": "Reminders", - "stats_pages_with_content": "Pages with content (current version)", - "stats_total_revisions": "Total revisions", - "stats_page_most_revisions": "Page with most revisions", - "stats_total_words": "Total words (current versions)", - "stats_unique_tags": "Unique tags", - "stats_page_most_tags": "Page with most tags", - "stats_activity_heatmap": "Activity heatmap", - "stats_heatmap_metric": "Colour by", - "stats_metric_words": "Words", - "stats_metric_revisions": "Revisions", - "stats_metric_documents": "Documents", - "stats_total_documents": "Total documents", - "stats_date_most_documents": "Date with most documents", - "stats_no_data": "No statistics available yet.", - "stats_time_total_hours": "Total hours logged", - "stats_time_day_most_hours": "Day with most hours logged", - "stats_time_project_most_hours": "Project with most hours logged", - "stats_time_activity_most_hours": "Activity with most hours logged", - "stats_total_reminders": "Total reminders", - "stats_date_most_reminders": "Day with most reminders", - "stats_metric_hours": "Hours", - "stats_metric_reminders": "Reminders", - "select_notebook": "Select notebook", - "bug_report_explanation": "Describe what went wrong, what you expected to happen, and any steps to reproduce.\n\nWe do not collect anything else except the Bouquin version number.\n\nIf you wish to be contacted, please leave contact information.\n\nYour request will be sent over HTTPS.", - "bug_report_placeholder": "Type your bug report here", - "bug_report_empty": "Please enter some details about the bug before sending.", - "bug_report_send_failed": "Could not send bug report.", - "bug_report_sent_ok": "Bug report sent. Thank you!", - "send": "Send", - "reminder": "Reminder", - "set_reminder": "Set reminder prompt", - "reminder_no_text_fallback": "You scheduled a reminder to alert you now!", - "invalid_time_title": "Invalid time", - "invalid_time_message": "Please enter a time in the format HH:MM", - "dismiss": "Dismiss", - "toolbar_alarm": "Set reminder alarm", - "activities": "Activities", - "activity": "Activity", - "note": "Note", - "activity_delete_error_message": "A problem occurred deleting the activity", - "activity_delete_error_title": "Problem deleting activity", - "activity_rename_error_message": "A problem occurred renaming the activity", - "activity_rename_error_title": "Problem renaming activity", - "activity_required_message": "An activity name is required", - "activity_required_title": "Activity name required", - "add_activity": "Add activity", - "add_project": "Add project", - "add_time_entry": "Add time entry", - "time_period": "Time period", - "dont_group": "Don't group", - "by_activity": "by activity", - "by_day": "by day", - "by_month": "by month", - "by_week": "by week", - "date_range": "Date range", - "custom_range": "Custom", - "last_week": "Last week", - "this_week": "This week", - "this_month": "This month", - "this_year": "This year", - "all_projects": "All projects", - "delete_activity": "Delete activity", - "delete_activity_confirm": "Are you sure you want to delete this activity?", - "delete_activity_title": "Delete activity - are you sure?", - "delete_project": "Delete project", - "delete_project_confirm": "Are you sure you want to delete this project?", - "delete_project_title": "Delete project - are you sure?", - "delete_time_entry": "Delete time entry", - "group_by": "Group by", - "hours": "Hours", - "created_at": "Created at", - "invalid_activity_message": "The activity is invalid", - "invalid_activity_title": "Invalid activity", - "invalid_project_message": "The project is invalid", - "invalid_project_title": "Invalid project", - "manage_activities": "Manage activities", - "manage_projects": "Manage projects", - "manage_projects_activities": "Manage project activities", - "open_time_log": "Open time log", - "project": "Project", - "project_delete_error_message": "A problem occurred deleting the project", - "project_delete_error_title": "Problem deleting project", - "project_rename_error_message": "A problem occurred renaming the project", - "project_rename_error_title": "Problem renaming project", - "project_required_message": "A project is required", - "project_required_title": "Project required", - "projects": "Projects", - "rename_activity": "Rename activity", - "rename_project": "Rename project", - "reporting": "Reporting", - "reporting_and_invoicing": "Reporting and Invoicing", - "run_report": "Run report", - "add_activity_title": "Add activity", - "add_activity_label": "Add an activity", - "rename_activity_label": "Rename activity", - "add_project_title": "Add project", - "add_project_label": "Add a project", - "rename_activity_title": "Rename this activity", - "rename_project_label": "Rename project", - "rename_project_title": "Rename this project", - "select_activity_message": "Select an activity", - "select_activity_title": "Select activity", - "select_project_message": "Select a project", - "select_project_title": "Select project", - "time_log": "Time log", - "time_log_collapsed_hint": "Time log", - "date_label": "Date: {date}", - "change_date": "Change date", - "select_date_title": "Select date", - "for": "For {date}", - "time_log_no_date": "Time log", - "time_log_no_entries": "No time entries yet", - "time_log_report": "Time log report", - "time_log_report_title": "Time log for {project}", - "time_log_report_meta": "From {start} to {end}, grouped {granularity}", - "time_log_total_hours": "Total time spent", - "time_log_with_total": "Time log ({hours:.2f}h)", - "time_log_total_hours": "Total for day: {hours:.2f}h", - "update_time_entry": "Update time entry", - "time_report_total": "Total: {hours:.2f} hours", - "no_report_title": "No report", - "no_report_message": "Please run a report before exporting.", - "total": "Total", - "export_csv": "Export CSV", - "export_csv_error_title": "Export failed", - "export_csv_error_message": "Could not write CSV file:\n{error}", - "export_pdf": "Export PDF", - "export_pdf_error_title": "PDF export failed", - "export_pdf_error_message": "Could not write PDF file:\n{error}", - "enable_tags_feature": "Enable Tags", - "enable_time_log_feature": "Enable Time Logging", - "enable_reminders_feature": "Enable Reminders", - "reminders_webhook_section_title": "Send Reminders to a webhook", - "reminders_webhook_url_label":"Webhook URL", - "reminders_webhook_secret_label": "Webhook Secret (sent as\nX-Bouquin-Secret header)", - "enable_documents_feature": "Enable storing of documents", - "pomodoro_time_log_default_text": "Focus session", - "toolbar_pomodoro_timer": "Time-logging timer", - "set_code_language": "Set code language", - "cut": "Cut", - "copy": "Copy", - "paste": "Paste", - "start": "Start", - "pause": "Pause", - "resume": "Resume", - "stop_and_log": "Stop and log", - "manage_reminders": "Manage Reminders", - "upcoming_reminders": "Upcoming Reminders", - "no_upcoming_reminders": "No upcoming reminders", - "once": "once", - "daily": "daily", - "weekdays": "weekdays", - "weekly": "weekly", - "add_reminder": "Add Reminder", - "set_reminder": "Set Reminder", - "edit_reminder": "Edit Reminder", - "delete_reminder": "Delete Reminder", - "delete_reminders": "Delete Reminders", - "deleting_it_will_remove_all_future_occurrences": "Deleting it will remove all future occurrences.", - "this_is_a_reminder_of_type": "Note: This is a reminder of type", - "this_will_delete_the_actual_reminders": "Note: This will delete the actual reminders, not just individual occurrences.", - "reminder": "Reminder", - "reminders": "Reminders", - "time": "Time", - "once": "Once", - "every_day": "Every day", - "every_weekday": "Every weekday (Mon-Fri)", - "every_week": "Every week", - "every_fortnight": "Every 2 weeks", - "every_month": "Every month (same date)", - "every_month_nth_weekday": "Every month (e.g. 3rd Monday)", - "week_in_month": "Week in month", - "fortnightly": "Fortnightly", - "monthly_same_date": "Monthly (same date)", - "monthly_nth_weekday": "Monthly (nth weekday)", - "repeat": "Repeat", - "monday": "Monday", - "tuesday": "Tuesday", - "wednesday": "Wednesday", - "thursday": "Thursday", - "friday": "Friday", - "saturday": "Saturday", - "sunday": "Sunday", - "monday_short": "Mon", - "tuesday_short": "Tue", - "wednesday_short": "Wed", - "thursday_short": "Thu", - "friday_short": "Fri", - "saturday_short": "Sat", - "sunday_short": "Sun", - "day": "Day", - "text": "Text", - "type": "Type", - "active": "Active", - "actions": "Actions", - "edit_code_block": "Edit code block", - "delete_code_block": "Delete code block", - "search_result_heading_document": "Document", - "toolbar_documents": "Documents Manager", - "project_documents_title": "Project documents", - "documents_col_file": "File", - "documents_col_description": "Description", - "documents_col_added": "Added", - "documents_col_path": "Path", - "documents_col_tags": "Tags", - "documents_col_size": "Size", - "documents_add": "&Add", - "documents_add_document": "Add a document", - "documents_open": "&Open", - "documents_delete": "&Delete", - "documents_no_project_selected": "Please choose a project first.", - "documents_file_filter_all": "All files (*)", - "documents_add_failed": "Could not add document: {error}", - "documents_open_failed": "Could not open document: {error}", - "documents_missing_file": "The file does not exist:\n{path}", - "documents_confirm_delete": "Remove this document from the project?\n(The file on disk will not be deleted.)", - "documents_search_label": "Search", - "documents_search_placeholder": "Type to search documents (all projects)", - "todays_documents": "Documents from this day", - "todays_documents_none": "No documents yet.", - "manage_invoices": "Manage Invoices", - "create_invoice": "Create Invoice", - "invoice_amount": "Amount", - "invoice_apply_tax": "Apply Tax", - "invoice_client_address": "Client Address", - "invoice_client_company": "Client Company", - "invoice_client_email": "Client E-mail", - "invoice_client_name": "Client Contact", - "invoice_currency": "Currency", - "invoice_dialog_title": "Create Invoice", - "invoice_due_date": "Due Date", - "invoice_hourly_rate": "Hourly Rate", - "invoice_hours": "Hours", - "invoice_issue_date": "Issue Date", - "invoice_mode_detailed": "Detailed mode", - "invoice_mode_summary": "Summary mode", - "invoice_number": "Invoice Number", - "invoice_save_and_export": "Save and export", - "invoice_save_pdf_title": "Save PDF", - "invoice_subtotal": "Subtotal", - "invoice_summary_default_desc": "Consultant services for the month of", - "invoice_summary_desc": "Summary description", - "invoice_summary_hours": "Summary hours", - "invoice_tax": "Tax details", - "invoice_tax_label": "Tax type", - "invoice_tax_rate": "Tax rate", - "invoice_tax_total": "Tax total", - "invoice_total": "Total", - "invoice_paid_at": "Paid on", - "invoice_payment_note": "Payment notes", - "invoice_project_required_title": "Project required", - "invoice_project_required_message": "Please select a specific project before trying to create an invoice.", - "invoice_need_report_title": "Report required", - "invoice_need_report_message": "Please run a time report before trying to create an invoice from it.", - "invoice_due_before_issue": "Due date cannot be earlier than the issue date.", - "invoice_paid_before_issue": "Paid date cannot be earlier than the issue date.", - "enable_invoicing_feature": "Enable Invoicing (requires Time Logging)", - "invoice_company_profile": "Business Profile", - "invoice_company_name": "Business Name", - "invoice_company_address": "Address", - "invoice_company_phone": "Phone", - "invoice_company_email": "E-mail", - "invoice_company_tax_id": "Tax number", - "invoice_company_payment_details": "Payment details", - "invoice_company_logo": "Logo", - "invoice_company_logo_choose": "Choose logo", - "invoice_company_logo_set": "Logo has been set", - "invoice_company_logo_not_set": "Logo not set", - "invoice_number_unique": "Invoice number must be unique. This invoice number already exists." -} diff --git a/bouquin/locales/fr.json b/bouquin/locales/fr.json deleted file mode 100644 index f77ebb1..0000000 --- a/bouquin/locales/fr.json +++ /dev/null @@ -1,290 +0,0 @@ -{ - "db_sqlcipher_integrity_check_failed": "Échec de la vérification d'intégrité SQLCipher", - "db_issues_reported": "problème(s) signalé(s)", - "db_reopen_failed_after_rekey": "Échec de la réouverture après changement de clé", - "db_version_id_does_not_belong_to_the_given_date": "version_id ne correspond pas à la date indiquée", - "db_key_incorrect": "La clé est probablement incorrecte", - "db_database_error": "Erreur de base de données", - "database_maintenance": "Maintenance de la base de données", - "database_compact": "Compacter la base de données", - "database_compact_explanation": "La compaction exécute VACUUM sur la base de données. Cela peut aider à réduire sa taille.", - "database_compacted_successfully": "Base de données compactée avec succès !", - "encryption": "Chiffrement", - "remember_key": "Se souvenir de la clé", - "change_encryption_key": "Changer la clé de chiffrement", - "enter_a_new_encryption_key": "Saisir une nouvelle clé de chiffrement", - "reenter_the_new_key": "Saisir de nouveau la nouvelle clé", - "key_mismatch": "Les clés ne correspondent pas", - "key_mismatch_explanation": "Les deux saisies ne correspondent pas.", - "empty_key": "La clé est vide", - "empty_key_explanation": "La clé ne peut pas être vide.", - "key_changed": "La clé a été modifiée", - "key_changed_explanation": "Le bouquin a été rechiffré avec la nouvelle clé !", - "error": "Erreur", - "success": "Succès", - "close": "Fermer", - "find": "Rechercher", - "file": "Fichier", - "locale": "Langue", - "locale_restart": "Veuillez redémarrer l'application pour appliquer la nouvelle langue.", - "settings": "Paramètres", - "theme": "Thème", - "system": "Système", - "light": "Clair", - "dark": "Sombre", - "never": "Jamais", - "close_tab": "Fermer l'onglet", - "previous": "Précédent", - "previous_day": "Jour précédent", - "next": "Suivant", - "next_day": "Jour suivant", - "today": "Aujourd'hui", - "show": "Afficher", - "history": "Historique", - "export_accessible_flag": "E&xporter", - "export_entries": "Exporter les entrées", - "export_complete": "Exportation terminée", - "export_failed": "Échec de l'exportation", - "backup": "Sauvegarder", - "backup_complete": "Sauvegarde terminée", - "backup_failed": "Échec de la sauvegarde", - "quit": "Quitter", - "cancel": "Annuler", - "save": "Enregistrer", - "help": "Aide", - "saved": "Enregistré", - "saved_to": "Enregistré dans", - "documentation": "Documentation", - "couldnt_open": "Impossible d'ouvrir", - "report_a_bug": "Signaler un bug", - "version": "Version", - "update": "Mise à jour", - "check_for_updates": "Rechercher des mises à jour", - "could_not_check_for_updates": "Impossible de vérifier les mises à jour:\n", - "update_server_returned_an_empty_version_string": "Le serveur de mise à jour a renvoyé une chaîne de version vide", - "you_are_running_the_latest_version": "Vous utilisez déjà la dernière version:\n", - "there_is_a_new_version_available": "Une nouvelle version est disponible:\n", - "download_the_appimage": "Télécharger l'AppImage ?", - "downloading": "Téléchargement en cours", - "download_cancelled": "Téléchargement annulé", - "failed_to_download_update": "Échec du téléchargement de la mise à jour:\n", - "could_not_read_bundled_gpg_public_key": "Impossible de lire la clé publique GPG fournie:\n", - "could_not_find_gpg_executable": "Impossible de trouver l'exécutable 'gpg' pour vérifier le téléchargement.", - "gpg_signature_verification_failed": "Échec de la vérification de la signature GPG. Les fichiers téléchargés ont été supprimés.\n\n", - "downloaded_and_verified_new_appimage": "Nouvelle AppImage téléchargée et vérifiée:\n\n", - "navigate": "Naviguer", - "current": "actuel", - "selected": "sélectionné", - "find_on_page": "Rechercher dans la page", - "find_next": "Rechercher le suivant", - "find_previous": "Rechercher le précédent", - "find_bar_type_to_search": "Tapez pour rechercher", - "find_bar_match_case": "Respecter la casse", - "history_dialog_preview": "Aperçu", - "history_dialog_diff": "Différences", - "history_dialog_revert_to_selected": "Revenir à la sélection", - "history_dialog_revert_failed": "Échec de la restauration", - "history_dialog_delete": "Supprimer la révision", - "history_dialog_delete_failed": "Impossible de supprimer la révision", - "key_prompt_enter_key": "Saisir la clé", - "lock_overlay_locked": "Verrouillé", - "lock_overlay_unlock": "Déverrouiller", - "main_window_lock_screen_accessibility": "&Verrouiller l'écran", - "main_window_ready": "Prêt", - "main_window_save_a_version": "Enregistrer une version", - "main_window_settings_accessible_flag": "&Paramètres", - "set_an_encryption_key": "Définir une clé de chiffrement", - "set_an_encryption_key_explanation": "Bouquin chiffre vos données.\n\nVeuillez créer une phrase de passe robuste pour chiffrer le bouquin.\n\nVous pourrez toujours la modifier plus tard !", - "unlock_encrypted_notebook": "Déverrouiller le bouquin chiffré", - "unlock_encrypted_notebook_explanation": "Saisir votre clé pour déverrouiller le bouquin", - "open_in_new_tab": "Ouvrir dans un nouvel onglet", - "autosave": "enregistrement automatique", - "unchecked_checkbox_items_moved_to_next_day": "Les cases non cochées ont été reportées au jour suivant", - "move_unchecked_todos_to_today_on_startup": "Déplacer automatiquement les TODO non cochés\ndes 7 derniers jours vers le prochain jour ouvrable", - "insert_images": "Insérer des images", - "images": "Images", - "reopen_failed": "Échec de la réouverture", - "unlock_failed": "Échec du déverrouillage", - "could_not_unlock_database_at_new_path": "Impossible de déverrouiller la base de données au nouveau chemin.", - "unencrypted_export": "Export non chiffré", - "unencrypted_export_warning": "L'exportation de la base de données ne sera pas chiffrée !\nÊtes-vous sûr de vouloir continuer ?\nSi vous voulez une sauvegarde chiffrée, choisissez Sauvegarde plutôt qu'Export.", - "unrecognised_extension": "Extension non reconnue !", - "backup_encrypted_notebook": "Sauvegarder le bouquin chiffré", - "enter_a_name_for_this_version": "Saisir un nom pour cette version", - "new_version_i_saved_at": "Nouvelle version que j'ai enregistrée à", - "appearance": "Apparence", - "security": "Sécurité", - "features": "Fonctionnalités", - "database": "Base de données", - "save_key_warning": "Si vous ne voulez pas que l'on vous demande votre clé de chiffrement, cochez cette case pour la mémoriser.\nAVERTISSEMENT : la clé est enregistrée sur le disque et pourrait être récupérée si votre disque est compromis.", - "lock_screen_when_idle": "Verrouiller l'écran en cas d'inactivité", - "autolock_explanation": "Bouquin verrouillera automatiquement le bouquin après cette durée, après quoi vous devrez ressaisir la clé pour le déverrouiller.\nMettre à 0 (jamais) pour ne jamais verrouiller.", - "font_size": "Taille de police", - "font_size_explanation": "La modification de cette valeur change la taille de tout le texte de paragraphe dans tous les onglets. Cela n'affecte pas la taille des titres ni des blocs de code.", - "search_for_notes_here": "Recherchez des notes ici", - "toolbar_format": "Format", - "toolbar_bold": "Gras", - "toolbar_italic": "Italique", - "toolbar_strikethrough": "Barré", - "toolbar_normal_paragraph_text": "Texte de paragraphe normal", - "toolbar_font_smaller": "Texte plus petit", - "toolbar_font_larger": "Texte plus grand", - "toolbar_bulleted_list": "Liste à puces", - "toolbar_numbered_list": "Liste numérotée", - "toolbar_code_block": "Bloc de code", - "toolbar_heading": "Titre", - "toolbar_toggle_checkboxes": "Cocher/Décocher les cases", - "tags": "Étiquettes", - "tag": "Étiquette", - "manage_tags": "Gérer les étiquettes", - "add_tag_placeholder": "Ajouter une étiquette puis appuyez sur Entrée", - "tag_browser_title": "Navigateur d'étiquettes", - "tag_browser_instructions": "Cliquez sur une étiquette pour l'étendre et voir toutes les pages avec cette étiquette. Cliquez sur une date pour l'ouvrir. Sélectionnez une étiquette pour modifier son nom, changer sa couleur ou la supprimer globalement.", - "color_hex": "Couleur", - "date": "Date", - "add_a_tag": "Ajouter une étiquette", - "edit_tag_name": "Modifier le nom de l'étiquette", - "new_tag_name": "Nouveau nom de l'étiquette :", - "change_color": "Changer la couleur", - "delete_tag": "Supprimer l'étiquette", - "delete_tag_confirm": "Êtes-vous sûr de vouloir supprimer l'étiquette '{name}' ? Cela la supprimera de toutes les pages.", - "tag_already_exists_with_that_name": "Une étiquette portant ce nom existe déjà", - "statistics": "Statistiques", - "main_window_statistics_accessible_flag": "Stat&istiques", - "stats_pages_with_content": "Pages avec contenu (version actuelle)", - "stats_total_revisions": "Nombre total de révisions", - "stats_page_most_revisions": "Page avec le plus de révisions", - "stats_total_words": "Nombre total de mots (versions actuelles)", - "stats_unique_tags": "Étiquettes uniques", - "stats_page_most_tags": "Page avec le plus d'étiquettes", - "stats_activity_heatmap": "Carte de chaleur d'activité", - "stats_heatmap_metric": "Colorer selon", - "stats_metric_words": "Mots", - "stats_metric_revisions": "Révisions", - "stats_no_data": "Aucune statistique disponible pour le moment.", - "select_notebook": "Sélectionner un bouquin", - "bug_report_explanation": "Décrivez ce qui s'est mal passé, ce que vous attendiez et les étapes pour reproduire le problème.\n\nNous ne collectons rien d'autre que le numéro de version de Bouquin.\n\nSi vous souhaitez être contacté, veuillez laisser vos coordonnées.\n\nVotre demande sera envoyée via HTTPS.", - "bug_report_placeholder": "Saisissez votre rapport de bug ici", - "bug_report_empty": "Veuillez saisir quelques détails sur le bug avant l'envoi.", - "bug_report_send_failed": "Impossible d'envoyer le rapport de bug.", - "bug_report_sent_ok": "Rapport de bug envoyé. Merci !", - "send": "Envoyer", - "reminder": "Rappel", - "set_reminder": "Définir le rappel", - "reminder_no_text_fallback": "Vous avez programmé un rappel pour maintenant !", - "invalid_time_title": "Heure invalide", - "invalid_time_message": "Veuillez saisir une heure au format HH:MM", - "dismiss": "Ignorer", - "toolbar_alarm": "Régler l'alarme de rappel", - "activities": "Activités", - "activity": "Activité", - "note": "Note", - "activity_delete_error_message": "Un problème est survenu lors de la suppression de l'activité", - "activity_delete_error_title": "Problème lors de la suppression de l'activité", - "activity_rename_error_message": "Un problème est survenu lors du renommage de l'activité", - "activity_rename_error_title": "Problème lors du renommage de l'activité", - "activity_required_message": "Un nom d'activité est requis", - "activity_required_title": "Nom d'activité requis", - "add_activity": "Ajouter une activité", - "add_project": "Ajouter un projet", - "add_time_entry": "Ajouter une entrée de temps", - "time_period": "Période", - "by_day": "par jour", - "by_month": "par mois", - "by_week": "par semaine", - "date_range": "Plage de dates", - "delete_activity": "Supprimer l'activité", - "delete_activity_confirm": "Êtes-vous sûr de vouloir supprimer cette activité ?", - "delete_activity_title": "Supprimer l'activité - êtes-vous sûr ?", - "delete_project": "Supprimer le projet", - "delete_project_confirm": "Êtes-vous sûr de vouloir supprimer ce projet ?", - "delete_project_title": "Supprimer le projet - êtes-vous sûr ?", - "delete_time_entry": "Supprimer l'entrée de temps", - "group_by": "Grouper par", - "hours": "Heures", - "invalid_activity_message": "L'activité est invalide", - "invalid_activity_title": "Activité invalide", - "invalid_project_message": "Le projet est invalide", - "invalid_project_title": "Projet invalide", - "manage_activities": "Gérer les activités", - "manage_projects": "Gérer les projets", - "manage_projects_activities": "Gérer les activités du projet", - "open_time_log": "Ouvrir le journal de temps", - "project": "Projet", - "project_delete_error_message": "Un problème est survenu lors de la suppression du projet", - "project_delete_error_title": "Problème lors de la suppression du projet", - "project_rename_error_message": "Un problème est survenu lors du renommage du projet", - "project_rename_error_title": "Problème lors du renommage du projet", - "project_required_message": "Un projet est requis", - "project_required_title": "Projet requis", - "projects": "Projets", - "rename_activity": "Renommer l'activité", - "rename_project": "Renommer le projet", - "run_report": "Exécuter le rapport", - "add_activity_title": "Ajouter une activité", - "add_activity_label": "Ajouter une activité", - "rename_activity_label": "Renommer l'activité", - "add_project_title": "Ajouter un projet", - "add_project_label": "Ajouter un projet", - "rename_activity_title": "Renommer cette activité", - "rename_project_label": "Renommer le projet", - "rename_project_title": "Renommer ce projet", - "select_activity_message": "Sélectionner une activité", - "select_activity_title": "Sélectionner une activité", - "select_project_message": "Sélectionner un projet", - "select_project_title": "Sélectionner un projet", - "time_log": "Journal de temps", - "time_log_collapsed_hint": "Journal de temps", - "time_log_date_label": "Date du journal de temps : {date}", - "time_log_for": "Journal de temps pour {date}", - "time_log_no_date": "Journal de temps", - "time_log_no_entries": "Aucune entrée de temps pour l'instant", - "time_log_report": "Rapport de temps", - "time_log_report_title": "Journal de temps pour {project}", - "time_log_report_meta": "Du {start} au {end}, groupé par {granularity}", - "time_log_total_hours": "Total pour la journée : {hours:.2f}h", - "time_log_with_total": "Journal de temps ({hours:.2f}h)", - "update_time_entry": "Mettre à jour l'entrée de temps", - "time_report_total": "Total : {hours:.2f} heures", - "no_report_title": "Aucun rapport", - "no_report_message": "Veuillez exécuter un rapport avant d'exporter.", - "total": "Total", - "export_csv": "Exporter en CSV", - "export_csv_error_title": "Échec de l'exportation", - "export_csv_error_message": "Impossible d'écrire le fichier CSV:\n{error}", - "export_pdf": "Exporter en PDF", - "export_pdf_error_title": "Échec de l'exportation PDF", - "export_pdf_error_message": "Impossible d'écrire le fichier PDF:\n{error}", - "enable_tags_feature": "Activer les étiquettes", - "enable_time_log_feature": "Activer le journal de temps", - "enable_reminders_feature": "Activer les rappels", - "pomodoro_time_log_default_text": "Session de concentration", - "toolbar_pomodoro_timer": "Minuteur de suivi du temps", - "set_code_language": "Définir le langage du code", - "cut": "Couper", - "copy": "Copier", - "paste": "Coller", - "start": "Démarrer", - "pause": "Pause", - "resume": "Reprendre", - "stop_and_log": "Arrêter et enregistrer", - "once": "une fois", - "daily": "quotidien", - "weekdays": "jours de semaine", - "weekly": "hebdomadaire", - "edit_reminder": "Modifier le rappel", - "time": "Heure", - "once": "Une fois (aujourd'hui)", - "every_day": "Tous les jours", - "every_weekday": "Tous les jours de semaine (lun-ven)", - "every_week": "Toutes les semaines", - "repeat": "Répéter", - "monday": "Lundi", - "tuesday": "Mardi", - "wednesday": "Mercredi", - "thursday": "Jeudi", - "friday": "Vendredi", - "saturday": "Samedi", - "sunday": "Dimanche", - "day": "Jour" -} diff --git a/bouquin/locales/it.json b/bouquin/locales/it.json deleted file mode 100644 index 6be0955..0000000 --- a/bouquin/locales/it.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "db_sqlcipher_integrity_check_failed": "Controllo di integrità SQLCipher fallito", - "db_issues_reported": "problema/i segnalato/i", - "db_reopen_failed_after_rekey": "Riapertura fallita dopo il cambio chiave", - "db_version_id_does_not_belong_to_the_given_date": "version_id non appartiene alla data indicata", - "db_database_error": "Errore del database", - "db_key_incorrect": "La chiave è probabilmente errata", - "database_maintenance": "Manutenzione del database", - "database_compact": "Compatta il database", - "database_compact_explanation": "La compattazione esegue VACUUM sul database. Può aiutare a ridurne le dimensioni.", - "database_compacted_successfully": "Database compattato con successo!", - "encryption": "Crittografia", - "remember_key": "Ricorda la chiave", - "change_encryption_key": "Cambia chiave di crittografia", - "enter_a_new_encryption_key": "Inserisci una nuova chiave di crittografia", - "reenter_the_new_key": "Reinserisci la nuova chiave", - "key_mismatch": "Le chiavi non corrispondono", - "key_mismatch_explanation": "Le due chiavi inserite non corrispondono.", - "empty_key": "Chiave vuota", - "empty_key_explanation": "La chiave non può essere vuota.", - "key_changed": "Chiave cambiata", - "key_changed_explanation": "Il blocco note è stato criptato nuovamente con la nuova chiave!", - "error": "Errore", - "success": "Successo", - "close": "Chiudi", - "find": "Trova", - "file": "File", - "locale": "Lingua", - "locale_restart": "Per favore riavvia l'applicazione per caricare la nuova lingua.", - "settings": "Impostazioni", - "theme": "Tema", - "system": "Sistema", - "light": "Chiaro", - "dark": "Scuro", - "never": "Mai", - "previous": "Precedente", - "previous_day": "Giorno precedente", - "next": "Successivo", - "next_day": "Giorno successivo", - "today": "Oggi", - "show": "Mostra", - "history": "Cronologia", - "export_accessible_flag": "&Esporta", - "export_entries": "Esporta voci", - "export_complete": "Esportazione completata", - "export_failed": "Esportazione fallita", - "backup": "Backup", - "backup_complete": "Backup completato", - "backup_failed": "Backup fallito", - "quit": "Esci", - "help": "Aiuto", - "saved": "Salvato", - "saved_to": "Salvato in", - "documentation": "Documentazione", - "couldnt_open": "Impossibile aprire", - "report_a_bug": "Segnala un bug", - "version": "Versione", - "navigate": "Naviga", - "current": "corrente", - "selected": "selezionato", - "find_on_page": "Trova nella pagina", - "find_next": "Trova successivo", - "find_previous": "Trova precedente", - "find_bar_type_to_search": "Digita per cercare", - "find_bar_match_case": "Distingui maiuscole/minuscole", - "history_dialog_preview": "Anteprima", - "history_dialog_diff": "Differenze", - "history_dialog_revert_to_selected": "Ripristina alla versione selezionata", - "history_dialog_revert_failed": "Ripristino fallito", - "key_prompt_enter_key": "Inserisci la chiave", - "lock_overlay_locked": "Bloccato", - "lock_overlay_unlock": "Sblocca", - "main_window_ready": "Pronto", - "main_window_save_a_version": "Salva versione", - "main_window_settings_accessible_flag": "Impo&stazioni", - "set_an_encryption_key": "Imposta una chiave di crittografia", - "set_an_encryption_key_explanation": "Bouquin cripta i tuoi dati.\n\nCrea una passphrase sicura per criptare il blocco note.\n\nPuoi sempre cambiarla in seguito!", - "unlock_encrypted_notebook": "Sblocca il blocco note criptato", - "unlock_encrypted_notebook_explanation": "Inserisci la chiave per sbloccare il blocco note", - "open_in_new_tab": "Apri in una nuova scheda", - "autosave": "salvataggio automatico", - "unchecked_checkbox_items_moved_to_next_day": "Le caselle non spuntate sono state spostate al giorno successivo", - "move_unchecked_todos_to_today_on_startup": "Sposta i TODO non completati a oggi all'avvio", - "insert_images": "Inserisci immagini", - "images": "Immagini", - "reopen_failed": "Riapertura fallita", - "unlock_failed": "Sblocco fallito", - "could_not_unlock_database_at_new_path": "Impossibile sbloccare il database nel nuovo percorso.", - "unencrypted_export": "Esportazione non criptata", - "unencrypted_export_warning": "L'esportazione del database sarà non criptata!\nVuoi davvero continuare?\nSe desideri un backup criptato, scegli Backup invece di Esporta.", - "unrecognised_extension": "Estensione non riconosciuta!", - "backup_encrypted_notebook": "Backup del blocco note criptato", - "enter_a_name_for_this_version": "Inserisci un nome per questa versione", - "new_version_i_saved_at": "Nuova versione salvata il", - "save_key_warning": "Se non vuoi che ti venga richiesta la chiave di crittografia, seleziona questa opzione per ricordarla.\nATTENZIONE: la chiave viene salvata sul disco e potrebbe essere recuperabile se il disco fosse compromesso.", - "lock_screen_when_idle": "Blocca lo schermo quando inattivo", - "autolock_explanation": "Bouquin bloccherà automaticamente il blocco note dopo questo intervallo di tempo, dopodiché sarà necessario reinserire la chiave per sbloccarlo.\nImposta a 0 (mai) per non bloccarlo mai.", - "search_for_notes_here": "Cerca note qui", - "toolbar_format": "Formato", - "toolbar_bold": "Grassetto", - "toolbar_italic": "Corsivo", - "toolbar_strikethrough": "Barrato", - "toolbar_normal_paragraph_text": "Testo normale", - "toolbar_bulleted_list": "Elenco puntato", - "toolbar_numbered_list": "Elenco numerato", - "toolbar_code_block": "Blocco di codice", - "toolbar_heading": "Titolo", - "toolbar_toggle_checkboxes": "Attiva/disattiva caselle di controllo", - "tags": "Tag", - "manage_tags": "Gestisci tag", - "add_tag_placeholder": "Aggiungi un tag e premi Invio", - "tag_browser_title": "Browser dei tag", - "tag_browser_instructions": "Fai clic su un tag per espandere e vedere tutte le pagine con quel tag. Fai clic su una data per aprirla. Seleziona un tag per modificarne il nome, cambiarne il colore o eliminarlo globalmente.", - "color_hex": "Colore", - "date": "Data", - "add_a_tag": "Aggiungi un tag", - "edit_tag_name": "Modifica nome tag", - "new_tag_name": "Nuovo nome tag:", - "change_color": "Cambia colore", - "delete_tag": "Elimina tag", - "delete_tag_confirm": "Sei sicuro di voler eliminare il tag '{name}'? Questo lo rimuoverà da tutte le pagine.", - "tag_already_exists_with_that_name": "Esiste già un tag con questo nome", - "cancel": "Annulla", - "select_notebook": "Seleziona blocco note", - "save": "Salva", - "history_dialog_delete": "Cancella versione", - "check_for_updates": "Controlla aggiornamenti", - "close": "Chiudi", - "send": "Invia", - "time_log": "Registro Attività", - "time_log_no_entries": "Nessuna Attività", - "close_tab": "Chiudi scheda", - "toolbar_font_smaller": "Rimpicciolisci testo", - "toolbar_font_larger": "Ingrandisci testo", - "toolbar_alarm": "Imposta promemoria", - "statistics": "Statistiche", - "main_window_statistics_accessible_flag": "Stat&istiche", - "main_window_lock_screen_accessibility": "B&locca Schermo", - "font_size": "Dimensione carattere", - "font_size_explanation": "Cambiare questo valore camberà la dimensione di tutto il testo in tutte le schede. Dimensione di titoli e blocchi di codice rimarranno invariati", - "enable_tags_feature": "Abilita Tags", - "enable_time_log_feature": "Abilita Traccuamento del tempo", - "appearance": "Interfaccia", - "features": "Funzionalità", - "security": "Sicurezza", - "bug_report_explanation": "Descrivi il problema, cosa dovrebbe succedere e istruzioni per riprodurlo.\n Non raccogliamo nessun dato all'infuori del numero di versione di Bouquin.\n\nSe volessi essere contattato, per favore lascia un contatto.", - "bug_report_placeholder": "Scrivi la tua segnalazione qui", - "update": "Aggiornamento", - "you_are_running_the_latest_version": "La tua versione di Bouquin è la più recente:\n", - "cut": "Taglia", - "copy": "Copia", - "paste": "Incolla", - "monday": "Lunedì", - "tuesday": "Martedì", - "wednesday": "Mercoledì", - "thursday": "Giovedì", - "friday": "Venerdì", - "saturday": "Sabato", - "sunday": "Domenica", - "day": "Giorno" -} diff --git a/bouquin/lock_overlay.py b/bouquin/lock_overlay.py index 90c12a8..5534b62 100644 --- a/bouquin/lock_overlay.py +++ b/bouquin/lock_overlay.py @@ -1,9 +1,8 @@ from __future__ import annotations -from PySide6.QtCore import QEvent, Qt -from PySide6.QtWidgets import QLabel, QPushButton, QVBoxLayout, QWidget +from PySide6.QtCore import Qt, QEvent +from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel, QPushButton -from . import strings from .theme import ThemeManager @@ -18,16 +17,17 @@ class LockOverlay(QWidget): self.setFocusPolicy(Qt.StrongFocus) self.setGeometry(parent.rect()) + self._last_dark: bool | None = None + lay = QVBoxLayout(self) lay.addStretch(1) - msg = QLabel(strings._("lock_overlay_locked"), self) + msg = QLabel("Locked due to inactivity", self) msg.setObjectName("lockLabel") msg.setAlignment(Qt.AlignCenter) - self._btn = QPushButton(strings._("lock_overlay_unlock"), self) + self._btn = QPushButton("Unlock", self) self._btn.setObjectName("unlockButton") - self._btn.setShortcut("Ctrl+Shift+U") self._btn.setFixedWidth(200) self._btn.setCursor(Qt.PointingHandCursor) self._btn.setAutoDefault(True) diff --git a/bouquin/main.py b/bouquin/main.py index 6883755..a481480 100644 --- a/bouquin/main.py +++ b/bouquin/main.py @@ -1,14 +1,10 @@ from __future__ import annotations import sys -from pathlib import Path - -from PySide6.QtGui import QIcon from PySide6.QtWidgets import QApplication -from . import strings -from .main_window import MainWindow from .settings import APP_NAME, APP_ORG, get_settings +from .main_window import MainWindow from .theme import Theme, ThemeConfig, ThemeManager @@ -16,11 +12,6 @@ def main(): app = QApplication(sys.argv) app.setApplicationName(APP_NAME) app.setOrganizationName(APP_ORG) - # Icon - BASE_DIR = Path(__file__).resolve().parent - ICON_PATH = BASE_DIR / "icons" / "bouquin.svg" - icon = QIcon(str(ICON_PATH)) - app.setWindowIcon(icon) s = get_settings() theme_str = s.value("ui/theme", "system") @@ -28,7 +19,6 @@ def main(): themes = ThemeManager(app, cfg) themes.apply(cfg.theme) - strings.load_strings(s.value("ui/locale", "en")) win = MainWindow(themes=themes) win.show() sys.exit(app.exec()) diff --git a/bouquin/main_window.py b/bouquin/main_window.py index 9b812b4..9c96c5b 100644 --- a/bouquin/main_window.py +++ b/bouquin/main_window.py @@ -2,21 +2,19 @@ from __future__ import annotations import datetime import os -import re import sys -from pathlib import Path +import re +from pathlib import Path from PySide6.QtCore import ( QDate, - QDateTime, - QEvent, - QSettings, - QSignalBlocker, - Qt, - QTime, QTimer, - QUrl, + Qt, + QSettings, Slot, + QUrl, + QEvent, + QSignalBlocker, ) from PySide6.QtGui import ( QAction, @@ -27,19 +25,17 @@ from PySide6.QtGui import ( QFont, QGuiApplication, QKeySequence, + QTextCharFormat, QTextCursor, QTextListFormat, ) from PySide6.QtWidgets import ( - QApplication, QCalendarWidget, QDialog, QFileDialog, - QLabel, QMainWindow, QMenu, QMessageBox, - QPushButton, QSizePolicy, QSplitter, QTableView, @@ -48,27 +44,18 @@ from PySide6.QtWidgets import ( QWidget, ) -from . import strings -from .bug_report_dialog import BugReportDialog from .db import DBManager -from .documents import DocumentsDialog, TodaysDocumentsWidget +from .markdown_editor import MarkdownEditor from .find_bar import FindBar from .history_dialog import HistoryDialog from .key_prompt import KeyPrompt from .lock_overlay import LockOverlay -from .markdown_editor import MarkdownEditor -from .pomodoro_timer import PomodoroManager -from .reminders import UpcomingRemindersWidget, ReminderWebHook from .save_dialog import SaveDialog from .search import Search -from .settings import APP_NAME, APP_ORG, load_db_config, save_db_config +from .settings import APP_ORG, APP_NAME, load_db_config, save_db_config from .settings_dialog import SettingsDialog -from .statistics_dialog import StatisticsDialog -from .tags_widget import PageTagsWidget -from .theme import ThemeManager -from .time_log import TimeLogWidget from .toolbar import ToolBar -from .version_check import VersionChecker +from .theme import ThemeManager class MainWindow(QMainWindow): @@ -78,7 +65,6 @@ class MainWindow(QMainWindow): self.setMinimumSize(1000, 650) self.themes = themes # Store the themes manager - self.version_checker = VersionChecker(self) self.cfg = load_db_config() if not os.path.exists(self.cfg.path): @@ -94,8 +80,6 @@ class MainWindow(QMainWindow): else: self._try_connect() - self.settings = QSettings(APP_ORG, APP_NAME) - # ---- UI: Left fixed panel (calendar) + right editor ----------------- self.calendar = QCalendarWidget() self.calendar.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) @@ -107,22 +91,6 @@ class MainWindow(QMainWindow): self.search.openDateRequested.connect(self._load_selected_date) self.search.resultDatesChanged.connect(self._on_search_dates_changed) - # Features - self.time_log = TimeLogWidget(self.db, themes=self.themes) - - self.tags = PageTagsWidget(self.db) - self.tags.tagActivated.connect(self._on_tag_activated) - self.tags.tagAdded.connect(self._on_tag_added) - - self.upcoming_reminders = UpcomingRemindersWidget(self.db) - self.upcoming_reminders.reminderTriggered.connect(self._send_reminder_webhook) - self.upcoming_reminders.reminderTriggered.connect(self._show_flashing_reminder) - - # When invoices change reminders (e.g. invoice paid), refresh the Reminders widget - self.time_log.remindersChanged.connect(self.upcoming_reminders.refresh) - - self.pomodoro_manager = PomodoroManager(self.db, self) - # Lock the calendar to the left panel at the top to stop it stretching # when the main window is resized. left_panel = QWidget() @@ -130,11 +98,6 @@ class MainWindow(QMainWindow): left_layout.setContentsMargins(8, 8, 8, 8) left_layout.addWidget(self.calendar) left_layout.addWidget(self.search) - left_layout.addWidget(self.upcoming_reminders) - self.todays_documents = TodaysDocumentsWidget(self.db, self._current_date_iso()) - left_layout.addWidget(self.todays_documents) - left_layout.addWidget(self.time_log) - left_layout.addWidget(self.tags) left_panel.setFixedWidth(self.calendar.sizeHint().width() + 16) # Create tab widget to hold multiple editors @@ -191,6 +154,8 @@ class MainWindow(QMainWindow): self._locked = False # reset idle timer on any key press anywhere in the app + from PySide6.QtWidgets import QApplication + QApplication.instance().installEventFilter(self) # Focus on the editor @@ -204,7 +169,7 @@ class MainWindow(QMainWindow): ) # Status bar for feedback - self.statusBar().showMessage(strings._("main_window_ready"), 800) + self.statusBar().showMessage("Ready", 800) # Add findBar and add it to the statusBar # FindBar will get the current editor dynamically via a callable self.findBar = FindBar(lambda: self.editor, shortcut_parent=self, parent=self) @@ -214,159 +179,113 @@ class MainWindow(QMainWindow): # Menu bar (File) mb = self.menuBar() - file_menu = mb.addMenu("&" + strings._("file")) - act_save = QAction("&" + strings._("main_window_save_a_version"), self) + file_menu = mb.addMenu("&File") + act_save = QAction("&Save a version", self) act_save.setShortcut("Ctrl+S") act_save.triggered.connect(lambda: self._save_current(explicit=True)) file_menu.addAction(act_save) - act_history = QAction("&" + strings._("history"), self) - act_history.setShortcut("Ctrl+Shift+H") + act_history = QAction("History", self) + act_history.setShortcut("Ctrl+H") act_history.setShortcutContext(Qt.ApplicationShortcut) act_history.triggered.connect(self._open_history) file_menu.addAction(act_history) - act_settings = QAction(strings._("main_window_settings_accessible_flag"), self) - act_settings.setShortcut("Ctrl+Shift+.") + act_settings = QAction("Settin&gs", self) + act_settings.setShortcut("Ctrl+G") act_settings.triggered.connect(self._open_settings) file_menu.addAction(act_settings) - act_export = QAction(strings._("export_accessible_flag"), self) - act_export.setShortcut("Ctrl+Shift+E") + act_export = QAction("&Export", self) + act_export.setShortcut("Ctrl+E") act_export.triggered.connect(self._export) file_menu.addAction(act_export) - act_backup = QAction("&" + strings._("backup"), self) + act_backup = QAction("&Backup", self) act_backup.setShortcut("Ctrl+Shift+B") act_backup.triggered.connect(self._backup) file_menu.addAction(act_backup) - act_stats = QAction(strings._("main_window_statistics_accessible_flag"), self) - act_stats.setShortcut("Ctrl+Shift+S") - act_stats.triggered.connect(self._open_statistics) - file_menu.addAction(act_stats) - act_lock = QAction(strings._("main_window_lock_screen_accessibility"), self) - act_lock.setShortcut("Ctrl+Shift+L") - act_lock.triggered.connect(self._enter_lock) - file_menu.addAction(act_lock) file_menu.addSeparator() - act_quit = QAction("&" + strings._("quit"), self) + act_quit = QAction("&Quit", self) act_quit.setShortcut("Ctrl+Q") act_quit.triggered.connect(self.close) file_menu.addAction(act_quit) # Navigate menu with next/previous/today - nav_menu = mb.addMenu("&" + strings._("navigate")) - act_prev = QAction(strings._("previous_day"), self) + nav_menu = mb.addMenu("&Navigate") + act_prev = QAction("Previous Day", self) act_prev.setShortcut("Ctrl+Shift+P") act_prev.setShortcutContext(Qt.ApplicationShortcut) act_prev.triggered.connect(lambda: self._adjust_day(-1)) nav_menu.addAction(act_prev) self.addAction(act_prev) - act_next = QAction(strings._("next_day"), self) + act_next = QAction("Next Day", self) act_next.setShortcut("Ctrl+Shift+N") act_next.setShortcutContext(Qt.ApplicationShortcut) act_next.triggered.connect(lambda: self._adjust_day(1)) nav_menu.addAction(act_next) self.addAction(act_next) - act_today = QAction(strings._("today"), self) + act_today = QAction("Today", self) act_today.setShortcut("Ctrl+Shift+T") act_today.setShortcutContext(Qt.ApplicationShortcut) act_today.triggered.connect(self._adjust_today) nav_menu.addAction(act_today) self.addAction(act_today) - act_close_tab = QAction(strings._("close_tab"), self) - act_close_tab.setShortcut("Ctrl+W") - act_close_tab.setShortcutContext(Qt.ApplicationShortcut) - act_close_tab.triggered.connect(self._close_current_tab) - nav_menu.addAction(act_close_tab) - self.addAction(act_close_tab) - - act_find = QAction(strings._("find_on_page"), self) + act_find = QAction("Find on page", self) act_find.setShortcut(QKeySequence.Find) act_find.triggered.connect(self.findBar.show_bar) nav_menu.addAction(act_find) self.addAction(act_find) - act_find_next = QAction(strings._("find_next"), self) + act_find_next = QAction("Find Next", self) act_find_next.setShortcut(QKeySequence.FindNext) act_find_next.triggered.connect(self.findBar.find_next) nav_menu.addAction(act_find_next) self.addAction(act_find_next) - act_find_prev = QAction(strings._("find_previous"), self) + act_find_prev = QAction("Find Previous", self) act_find_prev.setShortcut(QKeySequence.FindPrevious) act_find_prev.triggered.connect(self.findBar.find_prev) nav_menu.addAction(act_find_prev) self.addAction(act_find_prev) # Help menu with drop-down - help_menu = mb.addMenu("&" + strings._("help")) - act_docs = QAction(strings._("documentation"), self) - act_docs.setShortcut("Ctrl+Shift+D") + help_menu = mb.addMenu("&Help") + act_docs = QAction("Documentation", self) + act_docs.setShortcut("Ctrl+D") act_docs.setShortcutContext(Qt.ApplicationShortcut) act_docs.triggered.connect(self._open_docs) help_menu.addAction(act_docs) self.addAction(act_docs) - act_bugs = QAction(strings._("report_a_bug"), self) - act_bugs.setShortcut("Ctrl+Shift+R") + act_bugs = QAction("Report a bug", self) + act_bugs.setShortcut("Ctrl+R") act_bugs.setShortcutContext(Qt.ApplicationShortcut) act_bugs.triggered.connect(self._open_bugs) help_menu.addAction(act_bugs) self.addAction(act_bugs) - act_version = QAction(strings._("version"), self) - act_version.setShortcut("Ctrl+Shift+V") - act_version.setShortcutContext(Qt.ApplicationShortcut) - act_version.triggered.connect(self._open_version) - help_menu.addAction(act_version) - self.addAction(act_version) # Autosave self._dirty = False self._save_timer = QTimer(self) self._save_timer.setSingleShot(True) self._save_timer.timeout.connect(self._save_current) - - # Reminders / alarms - self._reminder_timers: list[QTimer] = [] + # Note: textChanged will be connected per-editor in _create_new_tab # First load + mark dates in calendar with content - if not self._load_unchecked_todos(): + if not self._load_yesterday_todos(): self._load_selected_date() self._refresh_calendar_marks() - # Hide tags and time log widgets if not enabled - if not self.cfg.tags: - self.tags.hide() - if not self.cfg.time_log: - self.time_log.hide() - self.toolBar.actTimer.setVisible(False) - if not self.cfg.reminders: - self.upcoming_reminders.hide() - self.toolBar.actAlarm.setVisible(False) - if not self.cfg.documents: - self.todays_documents.hide() - self.toolBar.actDocuments.setVisible(False) - # Restore window position from settings + self.settings = QSettings(APP_ORG, APP_NAME) self._restore_window_position() # re-apply all runtime color tweaks when theme changes self.themes.themeChanged.connect(lambda _t: self._retheme_overrides()) + self._apply_calendar_text_colors() # apply once on startup so links / calendar colors are set immediately self._retheme_overrides() - # Build any alarms for *today* from stored markdown - self._rebuild_reminders_for_today() - - # Rollover unchecked todos automatically when the calendar day changes - self._day_change_timer = QTimer(self) - self._day_change_timer.setSingleShot(True) - self._day_change_timer.timeout.connect(self._on_day_changed) - self._schedule_next_day_change() - - # Ensure toolbar is definitely visible - self.toolBar.setVisible(True) - @property def editor(self) -> MarkdownEditor | None: """Get the currently active editor.""" @@ -387,40 +306,30 @@ class MainWindow(QMainWindow): try: self.db = DBManager(self.cfg) ok = self.db.connect() - return ok except Exception as e: if str(e) == "file is not a database": - error = strings._("db_key_incorrect") + error = "The key is probably incorrect." else: error = str(e) - QMessageBox.critical(self, strings._("db_database_error"), error) + QMessageBox.critical(self, "Database Error", error) return False + return ok def _prompt_for_key_until_valid(self, first_time: bool) -> bool: """ Prompt for the SQLCipher key. """ if first_time: - title = strings._("set_an_encryption_key") - message = strings._("set_an_encryption_key_explanation") + title = "Set an encryption key" + message = "Bouquin encrypts your data.\n\nPlease create a strong passphrase to encrypt the notebook.\n\nYou can always change it later!" else: - title = strings._("unlock_encrypted_notebook") - message = strings._("unlock_encrypted_notebook_explanation") + title = "Unlock encrypted notebook" + message = "Enter your key to unlock the notebook" while True: - dlg = KeyPrompt( - self, title, message, initial_db_path=self.cfg.path, show_db_change=True - ) + dlg = KeyPrompt(self, title, message) if dlg.exec() != QDialog.Accepted: return False self.cfg.key = dlg.key() - - # Update DB path if the user changed it - new_path = dlg.db_path() - if new_path is not None and new_path != self.cfg.path: - self.cfg.path = new_path - # Persist immediately so next run is pre-filled with this file - save_db_config(self.cfg) - if self._try_connect(): return True @@ -497,7 +406,7 @@ class MainWindow(QMainWindow): idx = self._tab_index_for_date(date) if idx != -1: self.tab_widget.setCurrentIndex(idx) - # keep calendar selection in sync (don't trigger load) + # keep calendar selection in sync (don’t trigger load) from PySide6.QtCore import QSignalBlocker with QSignalBlocker(self.calendar): @@ -508,7 +417,6 @@ class MainWindow(QMainWindow): return self._create_new_tab(date) def _create_new_tab(self, date: QDate | None = None) -> MarkdownEditor: - """Create a new editor tab and return the editor instance.""" if date is None: date = self.calendar.selectedDate() @@ -518,11 +426,9 @@ class MainWindow(QMainWindow): self.tab_widget.setCurrentIndex(existing) return self.tab_widget.widget(existing) + """Create a new editor tab and return the editor instance.""" editor = MarkdownEditor(self.themes) - # Apply user's preferred font size - self._apply_font_size(editor) - # Set up the editor's event connections editor.currentCharFormatChanged.connect(lambda _f: self._sync_toolbar()) editor.cursorPositionChanged.connect(self._sync_toolbar) @@ -563,12 +469,6 @@ class MainWindow(QMainWindow): self.tab_widget.removeTab(index) - def _close_current_tab(self): - """Close the currently active tab via shortcuts (Ctrl+W).""" - idx = self.tab_widget.currentIndex() - if idx >= 0: - self._close_tab(idx) - def _on_tab_changed(self, index: int): """Handle tab change - reconnect toolbar and sync UI.""" if index < 0: @@ -590,10 +490,6 @@ class MainWindow(QMainWindow): with QSignalBlocker(self.calendar): self.calendar.setSelectedDate(editor.current_date) - # update per-page tags for the active tab - date_iso = editor.current_date.toString("yyyy-MM-dd") - self._update_tag_views_for_date(date_iso) - # Reconnect toolbar to new active editor self._sync_toolbar() @@ -695,7 +591,7 @@ class MainWindow(QMainWindow): clicked_date = self._date_from_calendar_pos(pos) menu = QMenu(self) - open_in_new_tab_action = menu.addAction(strings._("open_in_new_tab")) + open_in_new_tab_action = menu.addAction("Open in New Tab") action = menu.exec_(self.calendar.mapToGlobal(pos)) self._showing_context_menu = False @@ -709,20 +605,6 @@ class MainWindow(QMainWindow): date_iso = self._current_date_iso() qd = QDate.fromString(date_iso, "yyyy-MM-dd") - current_index = self.tab_widget.currentIndex() - - # Check if this date is already open in a *different* tab - existing_idx = self._tab_index_for_date(qd) - if existing_idx != -1 and existing_idx != current_index: - # Date is already open in another tab - just switch to that tab - self.tab_widget.setCurrentIndex(existing_idx) - # Keep calendar in sync - with QSignalBlocker(self.calendar): - self.calendar.setSelectedDate(qd) - QTimer.singleShot(0, self._focus_editor_now) - return - - # Date not open in any other tab - load it into current tab # Keep calendar in sync with QSignalBlocker(self.calendar): self.calendar.setSelectedDate(qd) @@ -731,15 +613,13 @@ class MainWindow(QMainWindow): self.editor.current_date = qd # Update tab title + current_index = self.tab_widget.currentIndex() if current_index >= 0: self.tab_widget.setTabText(current_index, date_iso) # Keep tabs sorted by date self._reorder_tabs_by_date() - # sync tags - self._update_tag_views_for_date(date_iso) - def _load_date_into_editor(self, date: QDate, extra_data=False): """Load a specific date's content into a given editor.""" date_iso = date.toString("yyyy-MM-dd") @@ -794,14 +674,11 @@ class MainWindow(QMainWindow): def _save_editor_content(self, editor: MarkdownEditor): """Save a specific editor's content to its associated date.""" - # Skip if DB is missing or not connected somehow. - if not getattr(self, "db", None) or getattr(self.db, "conn", None) is None: - return if not hasattr(editor, "current_date"): return date_iso = editor.current_date.toString("yyyy-MM-dd") md = editor.to_markdown() - self.db.save_new_version(date_iso, md, note=strings._("autosave")) + self.db.save_new_version(date_iso, md, note="autosave") def _on_text_changed(self): self._dirty = True @@ -817,228 +694,45 @@ class MainWindow(QMainWindow): today = QDate.currentDate() self._create_new_tab(today) - def _rollover_target_date(self, day: QDate) -> QDate: - """ - Given a 'new day' (system date), return the date we should move - unfinished todos *to*. + def _load_yesterday_todos(self): + if not self.cfg.move_todos: + return + yesterday_str = QDate.currentDate().addDays(-1).toString("yyyy-MM-dd") + text = self.db.get_entry(yesterday_str) + unchecked_items = [] - By default, if the new day is Saturday or Sunday we skip ahead to the - next Monday (i.e., "next available weekday"). If the optional setting - `move_todos_include_weekends` is enabled, we move to the very next day - even if it's a weekend. - """ - if getattr(self.cfg, "move_todos_include_weekends", False): - return day - # Qt: Monday=1 ... Sunday=7 - dow = day.dayOfWeek() - if dow >= 6: # Saturday (6) or Sunday (7) - return day.addDays(8 - dow) # 6 -> +2, 7 -> +1 (next Monday) - return day + # Split into lines and find unchecked checkbox items + lines = text.split("\n") + remaining_lines = [] - def _schedule_next_day_change(self) -> None: - """ - Schedule a one-shot timer to fire shortly after the next midnight. - """ - now = QDateTime.currentDateTime() - tomorrow = now.date().addDays(1) - # A couple of minutes after midnight to be safe - next_run = QDateTime(tomorrow, QTime(0, 2)) - msecs = max(60_000, now.msecsTo(next_run)) # at least 1 minute - self._day_change_timer.start(msecs) - - @Slot() - def _on_day_changed(self) -> None: - """ - Called when we've crossed into a new calendar day (according to the timer). - Re-runs the rollover logic and refreshes the UI. - """ - # Make the calendar show the *real* new day first - today = QDate.currentDate() - with QSignalBlocker(self.calendar): - self.calendar.setSelectedDate(today) - - # Same logic as on startup - if not self._load_unchecked_todos(): - self._load_selected_date() - - self._refresh_calendar_marks() - self._rebuild_reminders_for_today() - self._schedule_next_day_change() - - def _load_unchecked_todos(self, days_back: int = 7) -> bool: - """ - Move unchecked checkbox items from the last `days_back` days - into the rollover target date (today, or next Monday if today - is a weekend). - - Returns True if any items were moved, False otherwise. - """ - if not getattr(self.cfg, "move_todos", False): - return False - - if not getattr(self, "db", None): - return False - - today = QDate.currentDate() - target_date = self._rollover_target_date(today) - target_iso = target_date.toString("yyyy-MM-dd") - - # Regexes for markdown headings and checkboxes - heading_re = re.compile(r"^\s{0,3}(#+)\s+(.*)$") - unchecked_re = re.compile(r"^\s*-\s*\[[\s☐]\]\s+") - - def _normalize_heading(text: str) -> str: - """ - Strip trailing closing hashes and whitespace, e.g. - "## Foo ###" -> "Foo" - """ - text = text.strip() - text = re.sub(r"\s+#+\s*$", "", text) - return text.strip() - - def _insert_todos_under_heading( - target_lines: list[str], - heading_level: int, - heading_text: str, - todos: list[str], - ) -> list[str]: - """Ensure a heading exists and append todos to the end of its section.""" - normalized = _normalize_heading(heading_text) - - # 1) Find existing heading with same text (any level) - start_idx = None - effective_level = None - for idx, line in enumerate(target_lines): - m = heading_re.match(line) - if not m: - continue - level = len(m.group(1)) - text = _normalize_heading(m.group(2)) - if text == normalized: - start_idx = idx - effective_level = level - break - - # 2) If not found, create a new heading at the end - if start_idx is None: - if target_lines and target_lines[-1].strip(): - target_lines.append("") # blank line before new heading - target_lines.append(f"{'#' * heading_level} {heading_text}") - start_idx = len(target_lines) - 1 - effective_level = heading_level - - # 3) Find the end of this heading's section - end_idx = len(target_lines) - for i in range(start_idx + 1, len(target_lines)): - m = heading_re.match(target_lines[i]) - if m and len(m.group(1)) <= effective_level: - end_idx = i - break - - # 4) Insert before any trailing blank lines in the section - insert_at = end_idx - while ( - insert_at > start_idx + 1 and target_lines[insert_at - 1].strip() == "" + for line in lines: + # Check for unchecked markdown checkboxes: - [ ] or - [☐] + if re.match(r"^\s*-\s*\[\s*\]\s+", line) or re.match( + r"^\s*-\s*\[☐\]\s+", line ): - insert_at -= 1 - - for todo in todos: - target_lines.insert(insert_at, todo) - insert_at += 1 - - return target_lines - - # Collect moved todos as (heading_info, item_text) - # heading_info is either None or (level, heading_text) - moved_items: list[tuple[tuple[int, str] | None, str]] = [] - any_moved = False - - # Look back N days (yesterday = 1, up to `days_back`) - for delta in range(1, days_back + 1): - src_date = today.addDays(-delta) - src_iso = src_date.toString("yyyy-MM-dd") - text = self.db.get_entry(src_iso) - if not text: - continue - - lines = text.split("\n") - remaining_lines: list[str] = [] - moved_from_this_day = False - current_heading: tuple[int, str] | None = None - - for line in lines: - # Track the last seen heading (# / ## / ###) - m_head = heading_re.match(line) - if m_head: - level = len(m_head.group(1)) - heading_text = _normalize_heading(m_head.group(2)) - if level <= 3: - current_heading = (level, heading_text) - # Keep headings in the original day - remaining_lines.append(line) - continue - - # Unchecked markdown checkboxes: "- [ ] " or "- [☐] " - if unchecked_re.match(line): - item_text = unchecked_re.sub("", line) - moved_items.append((current_heading, item_text)) - moved_from_this_day = True - any_moved = True - else: - remaining_lines.append(line) - - if moved_from_this_day: - modified_text = "\n".join(remaining_lines) - # Save the cleaned-up source day - self.db.save_new_version( - src_iso, - modified_text, - strings._("unchecked_checkbox_items_moved_to_next_day"), - ) - - if not any_moved: - return False - - # --- Merge all moved items into the *target* date --- - - target_text = self.db.get_entry(target_iso) or "" - target_lines = target_text.split("\n") if target_text else [] - - by_heading: dict[tuple[int, str], list[str]] = {} - plain_items: list[str] = [] - - for heading_info, item_text in moved_items: - todo_line = f"- [ ] {item_text}" - if heading_info is None: - # No heading above this checkbox in the source: behave as before - plain_items.append(todo_line) + # Extract the text after the checkbox + item_text = re.sub(r"^\s*-\s*\[[\s☐]\]\s+", "", line) + unchecked_items.append(f"- [ ] {item_text}") else: - by_heading.setdefault(heading_info, []).append(todo_line) + # Keep all other lines + remaining_lines.append(line) - # First insert all items that have headings - for (level, heading_text), todos in by_heading.items(): - target_lines = _insert_todos_under_heading( - target_lines, level, heading_text, todos + # Save modified content back if we moved items + if unchecked_items: + modified_text = "\n".join(remaining_lines) + self.db.save_new_version( + yesterday_str, + modified_text, + "Unchecked checkbox items moved to next day", ) - # Then append all items without headings at the end, like before - if plain_items: - if target_lines and target_lines[-1].strip(): - target_lines.append("") # one blank line before the "unsectioned" todos - target_lines.extend(plain_items) + # Join unchecked items into markdown format + unchecked_str = "\n".join(unchecked_items) + "\n" - new_target_text = "\n".join(target_lines) - if not new_target_text.endswith("\n"): - new_target_text += "\n" - - # Save the updated target date and load it into the editor - self.db.save_new_version( - target_iso, - new_target_text, - strings._("unchecked_checkbox_items_moved_to_next_day"), - ) - self._load_selected_date(target_iso) - return True + # Load the unchecked items into the current editor + self._load_selected_date(False, unchecked_str) + else: + return False def _on_date_changed(self): """ @@ -1060,30 +754,16 @@ class MainWindow(QMainWindow): prev_date_iso = self.editor.current_date.toString("yyyy-MM-dd") self._save_date(prev_date_iso, explicit=False) - # Now load the newly selected date + # Now load the newly selected date into the current tab new_date = self.calendar.selectedDate() - current_index = self.tab_widget.currentIndex() - - # Check if this date is already open in a *different* tab - existing_idx = self._tab_index_for_date(new_date) - if existing_idx != -1 and existing_idx != current_index: - # Date is already open in another tab - just switch to that tab - self.tab_widget.setCurrentIndex(existing_idx) - QTimer.singleShot(0, self._focus_editor_now) - return - - # Date not open in any other tab - load it into current tab self._load_date_into_editor(new_date) self.editor.current_date = new_date # Update tab title + current_index = self.tab_widget.currentIndex() if current_index >= 0: self.tab_widget.setTabText(current_index, new_date.toString("yyyy-MM-dd")) - # Update tags for the newly loaded page - date_iso = new_date.toString("yyyy-MM-dd") - self._update_tag_views_for_date(date_iso) - # Keep tabs sorted by date self._reorder_tabs_by_date() @@ -1092,13 +772,9 @@ class MainWindow(QMainWindow): Save editor contents into the given date. Shows status on success. explicit=True means user invoked Save: show feedback even if nothing changed. """ - # Bail out if there is no DB connection (can happen during construction/teardown) - if not getattr(self.db, "conn", None): - return - if not self._dirty and not explicit: return - text = self.editor.to_markdown() if hasattr(self, "editor") else "" + text = self.editor.to_markdown() self.db.save_new_version(date_iso, text, note) self._dirty = False self._refresh_calendar_marks() @@ -1106,7 +782,7 @@ class MainWindow(QMainWindow): from datetime import datetime as _dt self.statusBar().showMessage( - strings._("saved") + f" {date_iso}: {_dt.now().strftime('%H:%M:%S')}", 2000 + f"Saved {date_iso} at {_dt.now().strftime('%H:%M:%S')}", 2000 ) def _save_current(self, explicit: bool = False): @@ -1123,7 +799,7 @@ class MainWindow(QMainWindow): return note = dlg.note_text() else: - note = strings._("autosave") + note = "autosave" # Save the current editor's date date_iso = self.editor.current_date.toString("yyyy-MM-dd") self._save_date(date_iso, explicit, note) @@ -1133,22 +809,21 @@ class MainWindow(QMainWindow): pass # ----------------- Some theme helpers -------------------# - def _apply_font_size(self, editor: MarkdownEditor) -> None: - """Apply the saved font size to a newly created editor.""" - size = self.cfg.font_size - editor.qfont.setPointSize(size) - editor.setFont(editor.qfont) - self.cfg.font_size = size - # save size to settings - cfg = load_db_config() - cfg.font_size = self.cfg.font_size - save_db_config(cfg) - def _retheme_overrides(self): + self._apply_calendar_text_colors() self._apply_search_highlights(getattr(self, "_search_highlighted_dates", set())) self.calendar.update() self.editor.viewport().update() + def _apply_calendar_text_colors(self): + pal = self.palette() + txt = pal.windowText().color() + fmt = QTextCharFormat() + fmt.setForeground(txt) + # Use normal text color for weekends + self.calendar.setWeekdayTextFormat(Qt.Saturday, fmt) + self.calendar.setWeekdayTextFormat(Qt.Sunday, fmt) + # --------------- Search sidebar/results helpers ---------------- # def _on_search_dates_changed(self, date_strs: list[str]): @@ -1191,14 +866,13 @@ class MainWindow(QMainWindow): fmt.setFontWeight(QFont.Weight.Normal) # remove bold only self.calendar.setDateTextFormat(d, fmt) self._marked_dates = set() - if self.db.conn is not None: - for date_iso in self.db.dates_with_content(): - qd = QDate.fromString(date_iso, "yyyy-MM-dd") - if qd.isValid(): - fmt = self.calendar.dateTextFormat(qd) - fmt.setFontWeight(QFont.Weight.Bold) # add bold only - self.calendar.setDateTextFormat(qd, fmt) - self._marked_dates.add(qd) + for date_iso in self.db.dates_with_content(): + qd = QDate.fromString(date_iso, "yyyy-MM-dd") + if qd.isValid(): + fmt = self.calendar.dateTextFormat(qd) + fmt.setFontWeight(QFont.Weight.Bold) # add bold only + self.calendar.setDateTextFormat(qd, fmt) + self._marked_dates.add(qd) # -------------------- UI handlers ------------------- # @@ -1216,11 +890,6 @@ class MainWindow(QMainWindow): self._tb_bullets = lambda: self._call_editor("toggle_bullets") self._tb_numbers = lambda: self._call_editor("toggle_numbers") self._tb_checkboxes = lambda: self._call_editor("toggle_checkboxes") - self._tb_alarm = self._on_alarm_requested - self._tb_timer = self._on_timer_requested - self._tb_documents = self._on_documents_requested - self._tb_font_larger = self._on_font_larger_requested - self._tb_font_smaller = self._on_font_smaller_requested tb.boldRequested.connect(self._tb_bold) tb.italicRequested.connect(self._tb_italic) @@ -1230,13 +899,9 @@ class MainWindow(QMainWindow): tb.bulletsRequested.connect(self._tb_bullets) tb.numbersRequested.connect(self._tb_numbers) tb.checkboxesRequested.connect(self._tb_checkboxes) - tb.alarmRequested.connect(self._tb_alarm) - tb.timerRequested.connect(self._tb_timer) - tb.documentsRequested.connect(self._tb_documents) - tb.insertImageRequested.connect(self._on_insert_image) + tb.historyRequested.connect(self._open_history) - tb.fontSizeLargerRequested.connect(self._tb_font_larger) - tb.fontSizeSmallerRequested.connect(self._tb_font_smaller) + tb.insertImageRequested.connect(self._on_insert_image) self._toolbar_bound = True @@ -1282,194 +947,6 @@ class MainWindow(QMainWindow): self.toolBar.actBullets.setChecked(bool(bullets_on)) self.toolBar.actNumbers.setChecked(bool(numbers_on)) - def _change_font_size(self, delta: int) -> None: - """Change font size for all editor tabs and save the setting.""" - old_size = self.cfg.font_size - new_size = old_size + delta - - self.cfg.font_size = new_size - # save size to settings - cfg = load_db_config() - cfg.font_size = self.cfg.font_size - save_db_config(cfg) - - # Apply font size change to all open editors - self._apply_font_size_to_all_tabs(new_size) - - def _apply_font_size_to_all_tabs(self, size: int) -> None: - for i in range(self.tab_widget.count()): - ed = self.tab_widget.widget(i) - if not isinstance(ed, MarkdownEditor): - continue - ed.qfont.setPointSize(size) - ed.setFont(ed.qfont) - - def _on_font_larger_requested(self) -> None: - self._change_font_size(+1) - - def _on_font_smaller_requested(self) -> None: - self._change_font_size(-1) - - # ----------- Alarms handler ------------# - def _on_alarm_requested(self): - self.upcoming_reminders._add_reminder() - - def _on_timer_requested(self): - """Toggle the embedded Pomodoro timer for the current line.""" - action = self.toolBar.actTimer - - # Turned on -> start a new timer for the current line - if action.isChecked(): - editor = getattr(self, "editor", None) - if editor is None: - # No editor; immediately reset the toggle - action.setChecked(False) - return - - # Get the current line text - line_text = editor.get_current_line_task_text() - if not line_text: - line_text = strings._("pomodoro_time_log_default_text") - - # Get current date - date_iso = self.editor.current_date.toString("yyyy-MM-dd") - - # Start the timer embedded in the sidebar - self.pomodoro_manager.start_timer_for_line(line_text, date_iso) - else: - # Turned off -> cancel any running timer and remove the widget - self.pomodoro_manager.cancel_timer() - - def _send_reminder_webhook(self, text: str): - if self.cfg.reminders and self.cfg.reminders_webhook_url: - reminder_webhook = ReminderWebHook(text) - reminder_webhook._send() - - def _show_flashing_reminder(self, text: str): - """ - Show a small flashing dialog and request attention from the OS. - Called by reminder timers. - """ - # Ask OS to flash / bounce our app in the dock/taskbar - QApplication.alert(self, 0) - - # Try to bring the window to the front - self.showNormal() - self.raise_() - self.activateWindow() - - # Simple dialog with a flashing background to reinforce the alert - dlg = QDialog(self) - dlg.setWindowTitle(strings._("reminder")) - dlg.setModal(True) - dlg.setMinimumWidth(400) - - layout = QVBoxLayout(dlg) - label = QLabel(text) - label.setWordWrap(True) - layout.addWidget(label) - - btn = QPushButton(strings._("dismiss")) - btn.clicked.connect(dlg.accept) - layout.addWidget(btn) - - flash_timer = QTimer(dlg) - flash_state = {"on": False} - - def toggle(): - flash_state["on"] = not flash_state["on"] - if flash_state["on"]: - dlg.setStyleSheet("background-color: #3B3B3B;") - else: - dlg.setStyleSheet("") - - flash_timer.timeout.connect(toggle) - flash_timer.start(500) # ms - - dlg.exec() - - flash_timer.stop() - - def _clear_reminder_timers(self): - """Stop and delete any existing reminder timers.""" - for t in self._reminder_timers: - try: - t.stop() - t.deleteLater() - except Exception: - pass - self._reminder_timers = [] - - def _rebuild_reminders_for_today(self): - """ - Scan the markdown for today's date and create QTimers - only for alarms on the *current day* (system date). - """ - # We only ever set timers for the real current date - today = QDate.currentDate() - today_iso = today.toString("yyyy-MM-dd") - - # Clear any previously scheduled "today" reminders - self._clear_reminder_timers() - - # Prefer live editor content if it is showing today's page - text = "" - if ( - hasattr(self, "editor") - and hasattr(self.editor, "current_date") - and self.editor.current_date == today - ): - text = self.editor.to_markdown() - else: - # Fallback to DB: still only today's date - text = self.db.get_entry(today_iso) if hasattr(self, "db") else "" - - if not text: - return - - now = QDateTime.currentDateTime() - - for line in text.splitlines(): - # Look for "⏰ HH:MM" anywhere in the line - m = re.search(r"⏰\s*(\d{1,2}):(\d{2})", line) - if not m: - continue - - hour = int(m.group(1)) - minute = int(m.group(2)) - - t = QTime(hour, minute) - if not t.isValid(): - continue - - target = QDateTime(today, t) - - # Skip alarms that are already in the past - if target <= now: - continue - - # The reminder text is the part before the symbol - reminder_text = line.split("⏰", 1)[0].strip() - if not reminder_text: - reminder_text = strings._("reminder_no_text_fallback") - - msecs = now.msecsTo(target) - timer = QTimer(self) - timer.setSingleShot(True) - timer.timeout.connect( - lambda txt=reminder_text: self._show_flashing_reminder(txt) - ) - timer.start(msecs) - self._reminder_timers.append(timer) - - # ----------- Documents handler ------------# - def _on_documents_requested(self): - documents_dlg = DocumentsDialog(self.db, self) - documents_dlg.exec() - # Refresh recent documents after any changes - if hasattr(self, "todays_documents"): - self.todays_documents.reload() - # ----------- History handler ------------# def _open_history(self): if hasattr(self.editor, "current_date"): @@ -1477,7 +954,7 @@ class MainWindow(QMainWindow): else: date_iso = self._current_date_iso() - dlg = HistoryDialog(self.db, date_iso, self, themes=self.themes) + dlg = HistoryDialog(self.db, date_iso, self) if dlg.exec() == QDialog.Accepted: # refresh editor + calendar (head pointer may have changed) self._load_selected_date(date_iso) @@ -1488,9 +965,9 @@ class MainWindow(QMainWindow): # Let the user pick one or many images paths, _ = QFileDialog.getOpenFileNames( self, - strings._("insert_images"), + "Insert image(s)", "", - strings._("images") + "(*.png *.jpg *.jpeg *.bmp *.gif *.webp)", + "Images (*.png *.jpg *.jpeg *.bmp *.gif *.webp)", ) if not paths: return @@ -1498,63 +975,6 @@ class MainWindow(QMainWindow): for path_str in paths: self.editor.insert_image_from_path(Path(path_str)) - # ----------- Tags handler ----------------# - def _update_tag_views_for_date(self, date_iso: str): - if hasattr(self, "tags"): - self.tags.set_current_date(date_iso) - if hasattr(self, "time_log"): - self.time_log.set_current_date(date_iso) - if hasattr(self, "todays_documents"): - self.todays_documents.set_current_date(date_iso) - - def _on_tag_added(self): - """Called when a tag is added - trigger autosave for current page""" - # Use QTimer to defer the save slightly, avoiding re-entrancy issues - from PySide6.QtCore import QTimer - - QTimer.singleShot(0, self._do_tag_save) - - def _do_tag_save(self): - """Actually perform the save after tag is added""" - if hasattr(self, "editor") and hasattr(self.editor, "current_date"): - date_iso = self.editor.current_date.toString("yyyy-MM-dd") - - # Get current editor content - text = self.editor.to_markdown() - - # Save the content (or blank if page is empty) - # This ensures the page shows up in tag browser - self.db.save_new_version(date_iso, text, note="Tag added") - self._dirty = False - self._refresh_calendar_marks() - from datetime import datetime as _dt - - self.statusBar().showMessage( - strings._("saved") + f" {date_iso}: {_dt.now().strftime('%H:%M:%S')}", - 2000, - ) - - def _on_tag_activated(self, tag_name_or_date: str): - # If it's a date (YYYY-MM-DD format), load it - if len(tag_name_or_date) == 10 and tag_name_or_date.count("-") == 2: - self._load_selected_date(tag_name_or_date) - else: - # It's a tag name, open the tag browser - from .tag_browser import TagBrowserDialog - - dlg = TagBrowserDialog(self.db, self, focus_tag=tag_name_or_date) - dlg.openDateRequested.connect(self._load_selected_date) - dlg.tagsModified.connect(self._refresh_current_page_tags) - dlg.exec() - - def _refresh_current_page_tags(self): - """Refresh the tag chips for the current page (after tag browser changes)""" - if hasattr(self, "tags") and hasattr(self.editor, "current_date"): - date_iso = self.editor.current_date.toString("yyyy-MM-dd") - self.tags.set_current_date(date_iso) - if self.tags.toggle_btn.isChecked(): - self.tags._reload_tags() - # ----------- Settings handler ------------# def _open_settings(self): dlg = SettingsDialog(self.cfg, self.db, self) @@ -1570,83 +990,24 @@ class MainWindow(QMainWindow): self.cfg.idle_minutes = getattr(new_cfg, "idle_minutes", self.cfg.idle_minutes) self.cfg.theme = getattr(new_cfg, "theme", self.cfg.theme) self.cfg.move_todos = getattr(new_cfg, "move_todos", self.cfg.move_todos) - self.cfg.move_todos_include_weekends = getattr( - new_cfg, - "move_todos_include_weekends", - getattr(self.cfg, "move_todos_include_weekends", False), - ) - self.cfg.tags = getattr(new_cfg, "tags", self.cfg.tags) - self.cfg.time_log = getattr(new_cfg, "time_log", self.cfg.time_log) - self.cfg.reminders = getattr(new_cfg, "reminders", self.cfg.reminders) - self.cfg.reminders_webhook_url = getattr( - new_cfg, "reminders_webhook_url", self.cfg.reminders_webhook_url - ) - self.cfg.reminders_webhook_secret = getattr( - new_cfg, "reminders_webhook_secret", self.cfg.reminders_webhook_secret - ) - self.cfg.documents = getattr(new_cfg, "documents", self.cfg.documents) - self.cfg.invoicing = getattr(new_cfg, "invoicing", self.cfg.invoicing) - self.cfg.locale = getattr(new_cfg, "locale", self.cfg.locale) - self.cfg.font_size = getattr(new_cfg, "font_size", self.cfg.font_size) # Persist once save_db_config(self.cfg) + # Apply idle setting immediately (restart the timer with new interval if it changed) self._apply_idle_minutes(self.cfg.idle_minutes) - # Apply font size to all tabs - self._apply_font_size_to_all_tabs(self.cfg.font_size) # If the DB path changed, reconnect if self.cfg.path != old_path: self.db.close() if not self._prompt_for_key_until_valid(first_time=False): QMessageBox.warning( - self, - strings._("reopen_failed"), - strings._("could_not_unlock_database_at_new_path"), + self, "Reopen failed", "Could not unlock database at new path." ) return self._load_selected_date() self._refresh_calendar_marks() - # Show or hide the tags and time_log features depending on what the settings are now. - self.tags.hide() if not self.cfg.tags else self.tags.show() - if not self.cfg.time_log: - self.time_log.hide() - self.toolBar.actTimer.setVisible(False) - else: - self.time_log.show() - self.toolBar.actTimer.setVisible(True) - if not self.cfg.reminders: - self.upcoming_reminders.hide() - self.toolBar.actAlarm.setVisible(False) - else: - self.upcoming_reminders.show() - self.toolBar.actAlarm.setVisible(True) - if not self.cfg.documents: - self.todays_documents.hide() - self.toolBar.actDocuments.setVisible(False) - else: - self.todays_documents.show() - self.toolBar.actDocuments.setVisible(True) - - # ------------ Statistics handler --------------- # - - def _open_statistics(self): - if not getattr(self, "db", None) or self.db.conn is None: - return - - dlg = StatisticsDialog(self.db, self) - - if hasattr(dlg, "_heatmap"): - - def on_date_clicked(d: datetime.date): - qd = QDate(d.year, d.month, d.day) - self._open_date_in_tab(qd) - - dlg._heatmap.date_clicked.connect(on_date_clicked) - dlg.exec() - # ------------ Window positioning --------------- # def _restore_window_position(self): geom = self.settings.value("main/geometry", None) @@ -1684,8 +1045,14 @@ class MainWindow(QMainWindow): # ----------------- Export handler ----------------- # @Slot() def _export(self): - warning_title = strings._("unencrypted_export") - warning_message = strings._("unencrypted_export_warning") + warning_title = "Unencrypted export" + warning_message = """ +Exporting the database will be unencrypted! + +Are you sure you want to continue? + +If you want an encrypted backup, choose Backup instead of Export. +""" dlg = QMessageBox() dlg.setWindowTitle(warning_title) dlg.setText(warning_message) @@ -1697,6 +1064,7 @@ class MainWindow(QMainWindow): return False filters = ( + "Text (*.txt);;" "JSON (*.json);;" "CSV (*.csv);;" "HTML (*.html);;" @@ -1706,25 +1074,28 @@ class MainWindow(QMainWindow): start_dir = os.path.join(os.path.expanduser("~"), "Documents") filename, selected_filter = QFileDialog.getSaveFileName( - self, strings._("export_entries"), start_dir, filters + self, "Export entries", start_dir, filters ) if not filename: return # user cancelled default_ext = { + "Text (*.txt)": ".txt", "JSON (*.json)": ".json", "CSV (*.csv)": ".csv", "HTML (*.html)": ".html", "Markdown (*.md)": ".md", "SQL (*.sql)": ".sql", - }.get(selected_filter, ".md") + }.get(selected_filter, ".txt") if not Path(filename).suffix: filename += default_ext try: entries = self.db.get_all_entries() - if selected_filter.startswith("JSON"): + if selected_filter.startswith("Text"): + self.db.export_txt(entries, filename) + elif selected_filter.startswith("JSON"): self.db.export_json(entries, filename) elif selected_filter.startswith("CSV"): self.db.export_csv(entries, filename) @@ -1735,15 +1106,11 @@ class MainWindow(QMainWindow): elif selected_filter.startswith("SQL"): self.db.export_sql(filename) else: - raise ValueError(strings._("unrecognised_extension")) + raise ValueError("Unrecognised extension!") - QMessageBox.information( - self, - strings._("export_complete"), - strings._("saved_to") + f" {filename}", - ) + QMessageBox.information(self, "Export complete", f"Saved to:\n{filename}") except Exception as e: - QMessageBox.critical(self, strings._("export_failed"), str(e)) + QMessageBox.critical(self, "Export failed", str(e)) # ----------------- Backup handler ----------------- # @Slot() @@ -1755,7 +1122,7 @@ class MainWindow(QMainWindow): os.path.expanduser("~"), "Documents", f"bouquin_backup_{now}.db" ) filename, selected_filter = QFileDialog.getSaveFileName( - self, strings._("backup_encrypted_notebook"), start_dir, filters + self, "Backup encrypted notebook", start_dir, filters ) if not filename: return # user cancelled @@ -1771,12 +1138,10 @@ class MainWindow(QMainWindow): if selected_filter.startswith("SQL"): self.db.export_sqlcipher(filename) QMessageBox.information( - self, - strings._("backup_complete"), - strings._("saved_to") + f" {filename}", + self, "Backup complete", f"Saved to:\n{filename}" ) except Exception as e: - QMessageBox.critical(self, strings._("backup_failed"), str(e)) + QMessageBox.critical(self, "Backup failed", str(e)) # ----------------- Help handlers ----------------- # @@ -1785,17 +1150,16 @@ class MainWindow(QMainWindow): url = QUrl.fromUserInput(url_str) if not QDesktopServices.openUrl(url): QMessageBox.warning( - self, - strings._("documentation"), - strings._("couldnt_open") + url.toDisplayString(), + self, "Open Documentation", f"Couldn't open:\n{url.toDisplayString()}" ) def _open_bugs(self): - dlg = BugReportDialog(self) - dlg.exec() - - def _open_version(self): - self.version_checker.show_version_dialog() + url_str = "https://nr.mig5.net/forms/mig5/contact" + url = QUrl.fromUserInput(url_str) + if not QDesktopServices.openUrl(url): + QMessageBox.warning( + self, "Open Documentation", f"Couldn't open:\n{url.toDisplayString()}" + ) # ----------------- Idle handlers ----------------- # def _apply_idle_minutes(self, minutes: int): @@ -1840,15 +1204,11 @@ class MainWindow(QMainWindow): self.menuBar().setEnabled(False) if self.statusBar(): self.statusBar().setEnabled(False) - self.statusBar().hide() tb = getattr(self, "toolBar", None) if tb: tb.setEnabled(False) - tb.hide() self._lock_overlay.show() self._lock_overlay.raise_() - lock_msg = strings._("lock_overlay_locked") - self.setWindowTitle(f"{APP_NAME} ({lock_msg})") @Slot() def _on_unlock_clicked(self): @@ -1859,7 +1219,7 @@ class MainWindow(QMainWindow): try: ok = self._prompt_for_key_until_valid(first_time=False) except Exception as e: - QMessageBox.critical(self, strings._("unlock_failed"), str(e)) + QMessageBox.critical(self, "Unlock failed", str(e)) return if ok: self._locked = False @@ -1868,50 +1228,25 @@ class MainWindow(QMainWindow): self.menuBar().setEnabled(True) if self.statusBar(): self.statusBar().setEnabled(True) - self.statusBar().show() tb = getattr(self, "toolBar", None) if tb: tb.setEnabled(True) - tb.show() self._idle_timer.start() QTimer.singleShot(0, self._focus_editor_now) - self.setWindowTitle(APP_NAME) # ----------------- Close handlers ----------------- # def closeEvent(self, event): - # Persist geometry if settings exist (window might be half-initialized). - if getattr(self, "settings", None) is not None: - try: - self.settings.setValue("main/geometry", self.saveGeometry()) - self.settings.setValue("main/windowState", self.saveState()) - self.settings.setValue("main/maximized", self.isMaximized()) - except Exception: - pass - - # Stop timers if present to avoid late autosaves firing during teardown. - for _t in ("_autosave_timer", "_idle_timer"): - t = getattr(self, _t, None) - if t: - t.stop() - - # Save content from tabs if the database is still connected - db = getattr(self, "db", None) - conn = getattr(db, "conn", None) - tw = getattr(self, "tab_widget", None) - if db is not None and conn is not None and tw is not None: - try: - for i in range(tw.count()): - editor = tw.widget(i) - if editor is not None: - self._save_editor_content(editor) - except Exception: - # Don't let teardown crash if one tab fails to save. - pass - try: - db.close() - except Exception: - pass + # Save window position + self.settings.setValue("main/geometry", self.saveGeometry()) + self.settings.setValue("main/windowState", self.saveState()) + self.settings.setValue("main/maximized", self.isMaximized()) + # Ensure we save all tabs before closing + for i in range(self.tab_widget.count()): + editor = self.tab_widget.widget(i) + if editor: + self._save_editor_content(editor) + self.db.close() super().closeEvent(event) # ----------------- Below logic helps focus the editor ----------------- # diff --git a/bouquin/markdown_editor.py b/bouquin/markdown_editor.py index 3d30889..a38ca1f 100644 --- a/bouquin/markdown_editor.py +++ b/bouquin/markdown_editor.py @@ -3,30 +3,22 @@ from __future__ import annotations import base64 import re from pathlib import Path -from typing import Optional, Tuple -from PySide6.QtCore import QRect, Qt, QTimer, QUrl from PySide6.QtGui import ( - QDesktopServices, QFont, - QFontDatabase, QFontMetrics, QImage, - QMouseEvent, - QTextBlock, - QTextBlockFormat, QTextCharFormat, QTextCursor, QTextDocument, QTextFormat, QTextImageFormat, ) -from PySide6.QtWidgets import QDialog, QTextEdit +from PySide6.QtCore import Qt, QRect, QTimer +from PySide6.QtWidgets import QTextEdit -from . import strings -from .code_block_editor_dialog import CodeBlockEditorDialog -from .markdown_highlighter import MarkdownHighlighter from .theme import ThemeManager +from .markdown_highlighter import MarkdownHighlighter class MarkdownEditor(QTextEdit): @@ -46,27 +38,10 @@ class MarkdownEditor(QTextEdit): # We accept plain text, not rich text (markdown is plain text) self.setAcceptRichText(False) - # Load in our preferred fonts - base_dir = Path(__file__).resolve().parent - - # Load regular text font (primary) - regular_font_path = base_dir / "fonts" / "DejaVuSans.ttf" - regular_font_id = QFontDatabase.addApplicationFont(str(regular_font_path)) - - # Load Symbols font (fallback) - symbols_font_path = base_dir / "fonts" / "NotoSansSymbols2-Regular.ttf" - symbols_font_id = QFontDatabase.addApplicationFont(str(symbols_font_path)) - symbols_families = QFontDatabase.applicationFontFamilies(symbols_font_id) - self.symbols_font_family = symbols_families[0] - - # Use the regular Noto Sans family as the editor font - regular_families = QFontDatabase.applicationFontFamilies(regular_font_id) - if regular_families: - self.text_font_family = regular_families[0] - self.qfont = QFont(self.text_font_family, 11) - self.setFont(self.qfont) - - self._apply_line_spacing() # 1.25× initial spacing + # Normal text + font = QFont() + font.setPointSize(10) + self.setFont(font) # Checkbox characters (Unicode for display, markdown for storage) self._CHECK_UNCHECKED_DISPLAY = "☐" @@ -74,17 +49,8 @@ class MarkdownEditor(QTextEdit): self._CHECK_UNCHECKED_STORAGE = "[ ]" self._CHECK_CHECKED_STORAGE = "[x]" - # Bullet character (Unicode for display, "- " for markdown) - self._BULLET_DISPLAY = "•" - self._BULLET_STORAGE = "-" - # Install syntax highlighter - self.highlighter = MarkdownHighlighter(self.document(), theme_manager, self) - - # Initialize code block metadata - from .code_highlighter import CodeBlockMetadata - - self._code_metadata = CodeBlockMetadata() + self.highlighter = MarkdownHighlighter(self.document(), theme_manager) # Track current list type for smart enter handling self._last_enter_was_empty = False @@ -92,20 +58,6 @@ class MarkdownEditor(QTextEdit): # Track if we're currently updating text programmatically self._updating = False - # Help avoid double-click selecting of checkbox - self._suppress_next_checkbox_double_click = False - - # Guard to avoid recursive selection tweaks - self._adjusting_selection = False - - # Track when the current selection is being created via mouse drag, - # so we can treat it differently from triple-click / keyboard selections. - self._mouse_drag_selecting = False - - # After selections change, trim list prefixes from full-line selections - # (e.g. after triple-clicking a list item to select the line). - self.selectionChanged.connect(self._maybe_trim_list_prefix_from_line_selection) - # Connect to text changes for smart formatting self.textChanged.connect(self._on_text_changed) self.textChanged.connect(self._update_code_block_row_backgrounds) @@ -115,43 +67,14 @@ class MarkdownEditor(QTextEdit): # Enable mouse tracking for checkbox clicking self.viewport().setMouseTracking(True) - # Also mark links as mouse-accessible - flags = self.textInteractionFlags() - self.setTextInteractionFlags( - flags | Qt.TextInteractionFlag.LinksAccessibleByMouse - ) def setDocument(self, doc): - # Recreate the highlighter for the new document - # (the old one gets deleted with the old document) - if doc is None: - return - super().setDocument(doc) - if hasattr(self, "highlighter") and hasattr(self, "theme_manager"): - self.highlighter = MarkdownHighlighter( - self.document(), self.theme_manager, self - ) - self._apply_line_spacing() - self._apply_code_block_spacing() + # reattach the highlighter to the new document + if hasattr(self, "highlighter") and self.highlighter: + self.highlighter.setDocument(self.document()) QTimer.singleShot(0, self._update_code_block_row_backgrounds) - def setFont(self, font: QFont) -> None: # type: ignore[override] - """ - Ensure that whenever the base editor font changes, our highlighter - re-computes checkbox / bullet formats. - """ - # Keep qfont in sync - self.qfont = QFont(font) - super().setFont(self.qfont) - - # If the highlighter is already attached, let it rebuild its formats - highlighter = getattr(self, "highlighter", None) - if highlighter is not None: - refresh = getattr(highlighter, "refresh_for_font_change", None) - if callable(refresh): - refresh() - def showEvent(self, e): super().showEvent(e) # First time the widget is shown, Qt may rebuild layout once more. @@ -169,7 +92,7 @@ class MarkdownEditor(QTextEdit): line = block.text() pos_in_block = c.position() - block.position() - # Transform markdown checkboxes and 'TODO' to unicode checkboxes + # Transform markldown checkboxes and 'TODO' to unicode checkboxes def transform_line(s: str) -> str: s = s.replace( f"- {self._CHECK_CHECKED_STORAGE} ", @@ -214,321 +137,12 @@ class MarkdownEditor(QTextEdit): b = b.previous() return inside - def _update_code_block_row_backgrounds(self) -> None: - """Paint a full-width background behind each fenced ``` code block.""" - + def _update_code_block_row_backgrounds(self): + """Paint a full-width background for each line that is in a fenced code block.""" doc = self.document() - if doc is None: - return - - if not hasattr(self, "highlighter") or self.highlighter is None: - return - - bg_brush = self.highlighter.code_block_format.background() - - selections: list[QTextEdit.ExtraSelection] = [] - - inside = False - block = doc.begin() - block_start_pos: int | None = None - - while block.isValid(): - text = block.text() - stripped = text.strip() - is_fence = stripped.startswith("```") - - if is_fence: - if not inside: - # Opening fence: remember where this block starts - inside = True - block_start_pos = block.position() - else: - # Closing fence: create ONE selection from opening fence - # to the end of this closing fence block. - inside = False - if block_start_pos is not None: - sel = QTextEdit.ExtraSelection() - fmt = QTextCharFormat() - fmt.setBackground(bg_brush) - fmt.setProperty(QTextFormat.FullWidthSelection, True) - fmt.setProperty(QTextFormat.UserProperty, "codeblock_bg") - sel.format = fmt - - cursor = QTextCursor(doc) - cursor.setPosition(block_start_pos) - # extend to the end of the closing fence block - cursor.setPosition( - block.position() + block.length() - 1, - QTextCursor.MoveMode.KeepAnchor, - ) - sel.cursor = cursor - - selections.append(sel) - block_start_pos = None - - block = block.next() - - # If the document ends while we're still inside a code block, - # extend the selection to the end of the document. - if inside and block_start_pos is not None: - sel = QTextEdit.ExtraSelection() - fmt = QTextCharFormat() - fmt.setBackground(bg_brush) - fmt.setProperty(QTextFormat.FullWidthSelection, True) - fmt.setProperty(QTextFormat.UserProperty, "codeblock_bg") - sel.format = fmt - - cursor = QTextCursor(doc) - cursor.setPosition(block_start_pos) - cursor.movePosition(QTextCursor.End, QTextCursor.MoveMode.KeepAnchor) - sel.cursor = cursor - - selections.append(sel) - - # Keep any other extraSelections (current-line highlight etc.) - others = [ - s - for s in self.extraSelections() - if s.format.property(QTextFormat.UserProperty) != "codeblock_bg" - ] - self.setExtraSelections(others + selections) - - def _find_code_block_bounds( - self, block: QTextBlock - ) -> Optional[Tuple[QTextBlock, QTextBlock]]: - """ - Given a block that is either inside a fenced code block or on a fence, - return (opening_fence_block, closing_fence_block). - Returns None if we can't find a proper pair. - """ - if not block.isValid(): - return None - - def is_fence(b: QTextBlock) -> bool: - return b.isValid() and b.text().strip().startswith("```") - - # If we're on a fence line, decide if it's opening or closing - if is_fence(block): - # If we're "inside" just before this fence, this one closes. - if self._is_inside_code_block(block.previous()): - close_block = block - open_block = block.previous() - while open_block.isValid() and not is_fence(open_block): - open_block = open_block.previous() - if not is_fence(open_block): - return None - return open_block, close_block - else: - # Treat as opening fence; search downward for the closing one. - open_block = block - close_block = open_block.next() - while close_block.isValid() and not is_fence(close_block): - close_block = close_block.next() - if not is_fence(close_block): - return None - return open_block, close_block - - # Normal interior line: search up for opening fence, down for closing. - open_block = block.previous() - while open_block.isValid() and not is_fence(open_block): - open_block = open_block.previous() - if not is_fence(open_block): - return None - - close_block = open_block.next() - while close_block.isValid() and not is_fence(close_block): - close_block = close_block.next() - if not is_fence(close_block): - return None - - return open_block, close_block - - def _get_code_block_text( - self, open_block: QTextBlock, close_block: QTextBlock - ) -> str: - """Return the inner text (between fences) as a normal '\\n'-joined string.""" - lines = [] - b = open_block.next() - while b.isValid() and b != close_block: - lines.append(b.text()) - b = b.next() - return "\n".join(lines) - - def _replace_code_block_text( - self, open_block: QTextBlock, close_block: QTextBlock, new_text: str - ) -> None: - """ - Replace everything between the two fences with `new_text`. - Fences themselves are left untouched. - """ - doc = self.document() - if doc is None: - return - - cursor = QTextCursor(doc) - - # Start just after the opening fence's newline - start_pos = open_block.position() + len(open_block.text()) - # End at the start of the closing fence - end_pos = close_block.position() - - cursor.setPosition(start_pos) - cursor.setPosition(end_pos, QTextCursor.MoveMode.KeepAnchor) - - cursor.beginEditBlock() - # Normalise trailing newline(s) - new_text = new_text.rstrip("\n") - if new_text: - cursor.removeSelectedText() - cursor.insertText("\n" + new_text + "\n") - else: - # Empty block - keep one blank line inside the fences - cursor.removeSelectedText() - cursor.insertText("\n\n") - cursor.endEditBlock() - - # Re-apply spacing and backgrounds - if hasattr(self, "_apply_code_block_spacing"): - self._apply_code_block_spacing() - if hasattr(self, "_update_code_block_row_backgrounds"): - self._update_code_block_row_backgrounds() - - # Trigger rehighlight - if hasattr(self, "highlighter"): - self.highlighter.rehighlight() - - def _edit_code_block(self, block: QTextBlock) -> bool: - """Open a popup editor for the code block containing `block`. - - Returns True if a dialog was shown (regardless of OK/Cancel), - False if no well-formed fenced block was found. - """ - bounds = self._find_code_block_bounds(block) - if not bounds: - return False - - open_block, close_block = bounds - - # Current language from metadata (if any) - lang = None - if hasattr(self, "_code_metadata"): - lang = self._code_metadata.get_language(open_block.blockNumber()) - - code_text = self._get_code_block_text(open_block, close_block) - - dlg = CodeBlockEditorDialog(code_text, lang, parent=self, allow_delete=True) - result = dlg.exec() - if result != QDialog.DialogCode.Accepted: - # Dialog was shown but user cancelled; event is "handled". - return True - - # If the user requested deletion, remove the whole block - if hasattr(dlg, "was_deleted") and dlg.was_deleted(): - self._delete_code_block(open_block) - return True - - new_code = dlg.code() - new_lang = dlg.language() - - # Update document text but keep fences - self._replace_code_block_text(open_block, close_block, new_code) - - # Update metadata language if changed - if new_lang is not None: - if not hasattr(self, "_code_metadata"): - from .code_highlighter import CodeBlockMetadata - - self._code_metadata = CodeBlockMetadata() - self._code_metadata.set_language(open_block.blockNumber(), new_lang) - if hasattr(self, "highlighter"): - self.highlighter.rehighlight() - - return True - - def _delete_code_block(self, block: QTextBlock) -> bool: - """Delete the fenced code block containing `block`. - - Returns True if a block was deleted, False otherwise. - """ - bounds = self._find_code_block_bounds(block) - if not bounds: - return False - - open_block, close_block = bounds - fence_block_num = open_block.blockNumber() - - doc = self.document() - if doc is None: - return False - - # Remove from the opening fence down to just before the block after - # the closing fence (so we also remove the trailing blank line). - start_pos = open_block.position() - after_block = close_block.next() - if after_block.isValid(): - end_pos = after_block.position() - else: - end_pos = close_block.position() + len(close_block.text()) - - cursor = QTextCursor(doc) - cursor.beginEditBlock() - cursor.setPosition(start_pos) - cursor.setPosition(end_pos, QTextCursor.MoveMode.KeepAnchor) - cursor.removeSelectedText() - cursor.endEditBlock() - - # Clear language metadata for this block, if supported - if hasattr(self, "_code_metadata"): - clear = getattr(self._code_metadata, "clear_language", None) - if clear is not None and fence_block_num != -1: - clear(fence_block_num) - - # Refresh visuals (spacing + backgrounds + syntax) - if hasattr(self, "_apply_code_block_spacing"): - self._apply_code_block_spacing() - if hasattr(self, "_update_code_block_row_backgrounds"): - self._update_code_block_row_backgrounds() - if hasattr(self, "highlighter"): - self.highlighter.rehighlight() - - # Move caret to where the block used to be - cursor = self.textCursor() - cursor.setPosition(start_pos) - self.setTextCursor(cursor) - self.setFocus() - - return True - - def _apply_line_spacing(self, height: float = 125.0): - """Apply proportional line spacing to the whole document.""" - doc = self.document() - if doc is None: - return - - cursor = QTextCursor(doc) - cursor.beginEditBlock() - cursor.select(QTextCursor.Document) - - fmt = QTextBlockFormat() - fmt.setLineHeight( - height, # 125.0 = 1.25× - QTextBlockFormat.LineHeightTypes.ProportionalHeight.value, - ) - cursor.mergeBlockFormat(fmt) - cursor.endEditBlock() - - def _apply_code_block_spacing(self): - """ - Make all fenced code-block lines (including ``` fences) single-spaced - and give them a solid background. - """ - doc = self.document() - if doc is None: - return - - cursor = QTextCursor(doc) - cursor.beginEditBlock() + sels = [] + # Use the same bg color as the highlighter's code block bg_brush = self.highlighter.code_block_format.background() inside = False @@ -537,55 +151,36 @@ class MarkdownEditor(QTextEdit): text = block.text() stripped = text.strip() is_fence = stripped.startswith("```") - is_code_line = is_fence or inside - fmt = block.blockFormat() - - if is_code_line: - # Single spacing for code lines - fmt.setLineHeight( - 0.0, - QTextBlockFormat.LineHeightTypes.SingleHeight.value, - ) - # Solid background for the whole line (no seams) + paint_this_line = is_fence or inside + if paint_this_line: + sel = QTextEdit.ExtraSelection() + fmt = QTextCharFormat() fmt.setBackground(bg_brush) - else: - # Not in a code block → clear any stale background - fmt.clearProperty(QTextFormat.BackgroundBrush) + fmt.setProperty(QTextFormat.FullWidthSelection, True) + # mark so we can merge with other selections safely + fmt.setProperty(QTextFormat.UserProperty, "codeblock_bg") + sel.format = fmt - cursor.setPosition(block.position()) - cursor.setBlockFormat(fmt) + cur = QTextCursor(doc) + cur.setPosition( + block.position() + ) # collapsed cursor = whole line when FullWidthSelection + sel.cursor = cur + + sels.append(sel) if is_fence: inside = not inside block = block.next() - cursor.endEditBlock() - - def _ensure_escape_line_after_closing_fence(self, fence_block: QTextBlock) -> None: - """ - Ensure there is at least one block *after* the given closing fence line. - - If the fence is the last block in the document, we append a newline, - so the caret can always move outside the code block. - """ - doc = self.document() - if doc is None or not fence_block.isValid(): - return - - after = fence_block.next() - if after.isValid(): - # There's already a block after the fence; nothing to do. - return - - # No block after fence → create a blank line - cursor = QTextCursor(doc) - cursor.beginEditBlock() - endpos = fence_block.position() + len(fence_block.text()) - cursor.setPosition(endpos) - cursor.insertText("\n") - cursor.endEditBlock() + others = [ + s + for s in self.extraSelections() + if s.format.property(QTextFormat.UserProperty) != "codeblock_bg" + ] + self.setExtraSelections(others + sels) def to_markdown(self) -> str: """Export current content as markdown.""" @@ -600,19 +195,6 @@ class MarkdownEditor(QTextEdit): f"{self._CHECK_UNCHECKED_DISPLAY} ", f"- {self._CHECK_UNCHECKED_STORAGE} " ) - # Convert Unicode bullets back to "- " at the start of a line - text = re.sub( - rf"(?m)^(\s*){re.escape(self._BULLET_DISPLAY)}\s+", - rf"\1{self._BULLET_STORAGE} ", - text, - ) - - # Append code block metadata if present - if hasattr(self, "_code_metadata"): - metadata_str = self._code_metadata.serialize() - if metadata_str: - text = text.rstrip() + "\n\n" + metadata_str - return text def _extract_images_to_markdown(self) -> str: @@ -651,16 +233,6 @@ class MarkdownEditor(QTextEdit): def from_markdown(self, markdown_text: str): """Load markdown text into the editor.""" - # Extract and load code block metadata if present - from .code_highlighter import CodeBlockMetadata - - if not hasattr(self, "_code_metadata"): - self._code_metadata = CodeBlockMetadata() - - self._code_metadata.deserialize(markdown_text) - # Remove metadata comment from displayed text - markdown_text = re.sub(r"\s*\s*$", "", markdown_text) - # Convert markdown checkboxes to Unicode for display display_text = markdown_text.replace( f"- {self._CHECK_CHECKED_STORAGE} ", f"{self._CHECK_CHECKED_DISPLAY} " @@ -675,14 +247,6 @@ class MarkdownEditor(QTextEdit): display_text, ) - # Convert simple markdown bullets ("- ", "* ", "+ ") to Unicode bullets, - # but skip checkbox lines (- [ ] / - [x]) - display_text = re.sub( - r"(?m)^([ \t]*)[-*+]\s+(?!\[[ xX]\])", - rf"\1{self._BULLET_DISPLAY} ", - display_text, - ) - self._updating = True try: self.setPlainText(display_text) @@ -691,9 +255,6 @@ class MarkdownEditor(QTextEdit): finally: self._updating = False - self._apply_line_spacing() - self._apply_code_block_spacing() - # Render any embedded images self._render_images() @@ -751,104 +312,6 @@ class MarkdownEditor(QTextEdit): cursor.select(QTextCursor.SelectionType.LineUnderCursor) return cursor.selectedText() - def _list_prefix_length_for_block(self, block) -> int: - """Return the length (in chars) of the visual list prefix for the given - block (including leading indentation), or 0 if it's not a list item. - """ - line = block.text() - stripped = line.lstrip() - leading_spaces = len(line) - len(stripped) - - # Checkbox (Unicode display) - if stripped.startswith( - f"{self._CHECK_UNCHECKED_DISPLAY} " - ) or stripped.startswith(f"{self._CHECK_CHECKED_DISPLAY} "): - return leading_spaces + 2 # icon + space - - # Unicode bullet - if stripped.startswith(f"{self._BULLET_DISPLAY} "): - return leading_spaces + 2 # bullet + space - - # Markdown bullet list (-, *, +) - if re.match(r"^[-*+]\s", stripped): - return leading_spaces + 2 # marker + space - - # Numbered list: e.g. "1. " - m = re.match(r"^(\d+\.\s)", stripped) - if m: - return leading_spaces + leading_spaces + (len(m.group(1)) - leading_spaces) - - return 0 - - def _maybe_trim_list_prefix_from_line_selection(self) -> None: - """ - If the current selection looks like a full-line selection on a list item - (for example, from a triple-click), trim the selection so that it starts - just *after* the visual list prefix (checkbox / bullet / number), and - ends at the end of the text on that line (not on the next line's newline). - """ - # When the user is actively dragging with the mouse, we *do* want the - # checkbox/bullet to be part of the selection (for deleting whole rows). - # So don't rewrite the selection in that case. - if getattr(self, "_mouse_drag_selecting", False): - return - - # Avoid re-entry when we move the cursor ourselves. - if getattr(self, "_adjusting_selection", False): - return - - cursor = self.textCursor() - if not cursor.hasSelection(): - return - - start = cursor.selectionStart() - end = cursor.selectionEnd() - if start == end: - return - - doc = self.document() - # 'end' is exclusive; use end - 1 so we land in the last selected block. - start_block = doc.findBlock(start) - end_block = doc.findBlock(end - 1) - if not start_block.isValid() or start_block != end_block: - # Only adjust single-line selections. - return - - # How much list prefix (indent + checkbox/bullet/number) this block has - prefix_len = self._list_prefix_length_for_block(start_block) - if prefix_len <= 0: - return - - block_start = start_block.position() - prefix_end = block_start + prefix_len - - # If the selection already starts after the prefix, nothing to do. - if start >= prefix_end: - return - - line_text = start_block.text() - line_end = block_start + len(line_text) # end of visible text on this line - - # Only treat it as a "full line" selection if it reaches the end of the - # visible text. Triple-click usually selects to at least here (often +1 for - # the newline). - if end < line_end: - return - - # Clamp the selection so that it ends at the end of this line's text, - # *not* at the newline / start of the next block. This keeps the caret - # blinking on the selected line instead of the next line. - visual_end = line_end - - self._adjusting_selection = True - try: - new_cursor = self.textCursor() - new_cursor.setPosition(prefix_end) - new_cursor.setPosition(visual_end, QTextCursor.KeepAnchor) - self.setTextCursor(new_cursor) - finally: - self._adjusting_selection = False - def _detect_list_type(self, line: str) -> tuple[str | None, str]: """ Detect if line is a list item. Returns (list_type, prefix). @@ -863,11 +326,7 @@ class MarkdownEditor(QTextEdit): ): return ("checkbox", f"{self._CHECK_UNCHECKED_DISPLAY} ") - # Bullet list - Unicode bullet - if line.startswith(f"{self._BULLET_DISPLAY} "): - return ("bullet", f"{self._BULLET_DISPLAY} ") - - # Bullet list - markdown bullet + # Bullet list if re.match(r"^[-*+]\s", line): match = re.match(r"^([-*+]\s)", line) return ("bullet", match.group(1)) @@ -881,101 +340,39 @@ class MarkdownEditor(QTextEdit): return (None, "") - def _url_at_pos(self, pos) -> str | None: - """ - Return the URL under the given widget position, or None if there isn't one. - """ - cursor = self.cursorForPosition(pos) - block = cursor.block() - text = block.text() - if not text: - return None - - # Position of the cursor inside this block - pos_in_block = cursor.position() - block.position() - - # Same pattern as in MarkdownHighlighter - url_pattern = re.compile(r"(https?://[^\s<>()]+)") - for m in url_pattern.finditer(text): - start, end = m.span(1) - if start <= pos_in_block < end: - return m.group(1) - - return None - def keyPressEvent(self, event): """Handle special key events for markdown editing.""" - c = self.textCursor() - block = c.block() - in_code = self._is_inside_code_block(block) - is_fence_line = block.text().strip().startswith("```") - - # --- NEW: 3rd backtick shortcut → open code block dialog --- - # Only when we're *not* already in a code block or on a fence line. - if event.text() == "`" and not (in_code or is_fence_line): + # --- Auto-close code fences when typing the 3rd backtick at line start --- + if event.text() == "`": + c = self.textCursor() + block = c.block() line = block.text() pos_in_block = c.position() - block.position() + + # text before caret on this line before = line[:pos_in_block] - # "before" currently contains whatever's before the *third* backtick. - # We trigger only when the line is (whitespace + "``") before the caret. + # If we've typed exactly two backticks at line start (or after whitespace), + # treat this backtick as the "third" and expand to a full fenced block. if before.endswith("``") and before.strip() == "``": - doc = self.document() - if doc is not None: - # Remove the two backticks that were already typed - start = block.position() + pos_in_block - 2 - edit = QTextCursor(doc) - edit.beginEditBlock() - edit.setPosition(start) - edit.setPosition(start + 2, QTextCursor.KeepAnchor) - edit.removeSelectedText() - edit.endEditBlock() + start = ( + block.position() + pos_in_block - 2 + ) # start of the two backticks - # Move caret to where the code block should start - c.setPosition(start) - self.setTextCursor(c) + edit = QTextCursor(self.document()) + edit.beginEditBlock() + edit.setPosition(start) + edit.setPosition(start + 2, QTextCursor.KeepAnchor) + edit.insertText("```\n\n```\n") + edit.endEditBlock() - # Now behave exactly like the toolbar button - self.apply_code() + # place caret on the blank line between the fences + new_pos = start + 4 # after "```\n" + c.setPosition(new_pos) + self.setTextCursor(c) return - # ------------------------------------------------------------ - - # If we're anywhere in a fenced code block (including the fences), - # treat the text as read-only and route edits through the dialog. - if in_code or is_fence_line: - key = event.key() - - # Navigation keys that are safe to pass through. - nav_keys_no_down = ( - Qt.Key.Key_Left, - Qt.Key.Key_Right, - Qt.Key.Key_Up, - Qt.Key.Key_Home, - Qt.Key.Key_End, - Qt.Key.Key_PageUp, - Qt.Key.Key_PageDown, - ) - - # Let these through: - # - pure navigation (except Down, which we handle specially later) - # - Enter/Return and Down, which are handled by dedicated logic below - if key in nav_keys_no_down: - super().keyPressEvent(event) - return - - if key in (Qt.Key.Key_Return, Qt.Key.Key_Enter, Qt.Key.Key_Down): - # Let the existing Enter/Down code see these. - pass - else: - # Any other key (Backspace, Delete, characters, Tab, etc.) - # opens the code-block editor instead of editing inline. - if not self._edit_code_block(block): - # Fallback if bounds couldn't be found for some reason. - super().keyPressEvent(event) - return - - # --- Step out of a code block with Down at EOF --- + # Step out of a code block with Down at EOF if event.key() == Qt.Key.Key_Down: c = self.textCursor() b = c.block() @@ -986,8 +383,7 @@ class MarkdownEditor(QTextEdit): nb = bb.next() return nb.isValid() and nb.text().strip().startswith("```") - # Case A: caret is on the line BEFORE the closing fence, at EOL - # → jump after the fence + # Case A: caret is on the line BEFORE the closing fence, at EOL → jump after the fence if ( self._is_inside_code_block(b) and pos_in_block >= len(line) @@ -1008,8 +404,7 @@ class MarkdownEditor(QTextEdit): self._update_code_block_row_backgrounds() return - # Case B: caret is ON the closing fence, and it's EOF - # → create a line and move to it + # Case B: caret is ON the closing fence, and it's EOF → create a line and move to it if ( b.text().strip().startswith("```") and self._is_inside_code_block(b) @@ -1024,103 +419,6 @@ class MarkdownEditor(QTextEdit): self._update_code_block_row_backgrounds() return - # Handle Backspace on empty list items so the marker itself can be deleted - if event.key() == Qt.Key.Key_Backspace: - cursor = self.textCursor() - # Let Backspace behave normally when deleting a selection. - if not cursor.hasSelection(): - block = cursor.block() - prefix_len = self._list_prefix_length_for_block(block) - - if prefix_len > 0: - block_start = block.position() - line = block.text() - pos_in_block = cursor.position() - block_start - after_text = line[prefix_len:] - - # If there is no real content after the marker, treat Backspace - # as "remove the list marker". - if after_text.strip() == "" and pos_in_block >= prefix_len: - cursor.beginEditBlock() - cursor.setPosition(block_start) - cursor.setPosition( - block_start + prefix_len, QTextCursor.KeepAnchor - ) - cursor.removeSelectedText() - cursor.endEditBlock() - self.setTextCursor(cursor) - return - - # Handle Home and Left arrow keys to keep the caret to the *right* - # of list prefixes (checkboxes / bullets / numbers). - if event.key() in (Qt.Key.Key_Home, Qt.Key.Key_Left): - # Let Ctrl+Home / Ctrl+Left keep their usual meaning (start of - # document / word-left) - we don't interfere with those. - if event.modifiers() & Qt.ControlModifier: - pass - else: - cursor = self.textCursor() - block = cursor.block() - prefix_len = self._list_prefix_length_for_block(block) - - if prefix_len > 0: - block_start = block.position() - pos_in_block = cursor.position() - block_start - target = block_start + prefix_len - - if event.key() == Qt.Key.Key_Home: - # Home should jump to just after the prefix; with Shift - # it should *select* back to that position. - if event.modifiers() & Qt.ShiftModifier: - cursor.setPosition(target, QTextCursor.KeepAnchor) - else: - cursor.setPosition(target) - self.setTextCursor(cursor) - return - - # Left arrow: don't allow the caret to move into the prefix - # region; snap it to just after the marker instead. - if event.key() == Qt.Key.Key_Left and pos_in_block <= prefix_len: - if event.modifiers() & Qt.ShiftModifier: - cursor.setPosition(target, QTextCursor.KeepAnchor) - else: - cursor.setPosition(target) - self.setTextCursor(cursor) - return - - # After moving vertically, make sure we don't land *inside* a list - # prefix. We let QTextEdit perform the move first and then adjust. - if event.key() in (Qt.Key.Key_Up, Qt.Key.Key_Down) and not ( - event.modifiers() & Qt.ControlModifier - ): - super().keyPressEvent(event) - - cursor = self.textCursor() - block = cursor.block() - - # Don't interfere with code blocks (they can contain literal - # markdown-looking text). - if self._is_inside_code_block(block): - return - - prefix_len = self._list_prefix_length_for_block(block) - if prefix_len > 0: - block_start = block.position() - pos_in_block = cursor.position() - block_start - if pos_in_block < prefix_len: - target = block_start + prefix_len - if event.modifiers() & Qt.ShiftModifier: - # Preserve the current anchor while snapping the visual - # caret to just after the marker. - anchor = cursor.anchor() - cursor.setPosition(anchor) - cursor.setPosition(target, QTextCursor.KeepAnchor) - else: - cursor.setPosition(target) - self.setTextCursor(cursor) - - return - # Handle Enter key for smart list continuation AND code blocks if event.key() == Qt.Key.Key_Return or event.key() == Qt.Key.Key_Enter: cursor = self.textCursor() @@ -1154,36 +452,10 @@ class MarkdownEditor(QTextEdit): block_state = current_block.userState() - stripped = current_line.strip() - is_fence_line = stripped.startswith("```") - - if is_fence_line: - # Work out if this fence is closing (inside block before it) - inside_before = self._is_inside_code_block(current_block.previous()) - - # Insert the newline as usual + # If current line is opening code fence, or we're inside a code block + if current_line.strip().startswith("```") or block_state == 1: + # Just insert a regular newline - the highlighter will format it as code super().keyPressEvent(event) - - if inside_before: - # We were on the *closing* fence; the new line is outside the block. - # Give that new block normal 1.25× spacing. - new_block = self.textCursor().block() - fmt = new_block.blockFormat() - fmt.setLineHeight( - 125.0, - QTextBlockFormat.LineHeightTypes.ProportionalHeight.value, - ) - cur2 = self.textCursor() - cur2.setBlockFormat(fmt) - self.setTextCursor(cur2) - - return - - # Inside a code block (but not on a fence): open the popup editor - if block_state == 1: - if not self._edit_code_block(current_block): - # Fallback if something is malformed - super().keyPressEvent(event) return # Check for list continuation @@ -1204,13 +476,11 @@ class MarkdownEditor(QTextEdit): self._last_enter_was_empty = False return elif is_empty: - # First enter on empty list item - just insert newline without prefix - super().keyPressEvent(event) + # First enter on empty list item - remember this self._last_enter_was_empty = True - return else: # Not empty - continue the list - self._last_enter_was_empty = True + self._last_enter_was_empty = False # Insert newline and continue the list super().keyPressEvent(event) @@ -1226,59 +496,9 @@ class MarkdownEditor(QTextEdit): # Default handling super().keyPressEvent(event) - def mouseMoveEvent(self, event): - # If the left button is down while the mouse moves, we consider this - # a drag selection (as opposed to a simple click). - if event.buttons() & Qt.LeftButton: - self._mouse_drag_selecting = True - else: - self._mouse_drag_selecting = False - - # Change cursor when hovering a link - url = self._url_at_pos(event.pos()) - if url: - self.viewport().setCursor(Qt.PointingHandCursor) - else: - self.viewport().setCursor(Qt.IBeamCursor) - - super().mouseMoveEvent(event) - - def mouseReleaseEvent(self, event): - # Let QTextEdit handle caret/selection first - super().mouseReleaseEvent(event) - - if event.button() == Qt.LeftButton: - # At this point the drag (if any) has finished and the final - # selection is already in place (and selectionChanged has fired). - # Clear the drag flag for future interactions. - self._mouse_drag_selecting = False - - if event.button() != Qt.LeftButton: - return - - # If the user dragged to select text, don't treat it as a click - if self.textCursor().hasSelection(): - return - - url_str = self._url_at_pos(event.pos()) - if not url_str: - return - - url = QUrl(url_str) - if not url.scheme(): - url.setScheme("https") - - QDesktopServices.openUrl(url) - def mousePressEvent(self, event): """Toggle a checkbox only when the click lands on its icon.""" - # default: don't suppress any upcoming double-click - self._suppress_next_checkbox_double_click = False - - # Fresh left-button press starts with "no drag" yet. if event.button() == Qt.LeftButton: - self._mouse_drag_selecting = False - pt = event.pos() # Cursor and block under the mouse @@ -1317,45 +537,9 @@ class MarkdownEditor(QTextEdit): if icon: # absolute document position of the icon doc_pos = block.position() + i - r_icon = char_rect_at(doc_pos, icon) + r = char_rect_at(doc_pos, icon) - # --- Find where the first non-space "real text" starts --- - first_idx = i + len(icon) + 1 # skip icon + trailing space - while first_idx < len(text) and text[first_idx].isspace(): - first_idx += 1 - - # Start with some padding around the icon itself - left_pad = r_icon.width() // 2 - right_pad = r_icon.width() // 2 - - hit_left = r_icon.left() - left_pad - - # If there's actual text after the checkbox, clamp the - # clickable area so it stops *before* the first letter. - if first_idx < len(text): - first_doc_pos = block.position() + first_idx - c_first = QTextCursor(self.document()) - c_first.setPosition(first_doc_pos) - first_x = self.cursorRect(c_first).x() - - expanded_right = r_icon.right() + right_pad - hit_right = min(expanded_right, first_x) - else: - # No text after the checkbox on this line - hit_right = r_icon.right() + right_pad - - # Make sure the rect is at least 1px wide - if hit_right <= hit_left: - hit_right = r_icon.right() - - hit_rect = QRect( - hit_left, - r_icon.top(), - max(1, hit_right - hit_left), - r_icon.height(), - ) - - if hit_rect.contains(pt): + if r.contains(pt): # Build the replacement: swap ☐ <-> ☑ (keep trailing space) new_icon = ( self._CHECK_CHECKED_DISPLAY @@ -1367,15 +551,10 @@ class MarkdownEditor(QTextEdit): edit.setPosition(doc_pos) # icon + space edit.movePosition( - QTextCursor.Right, - QTextCursor.KeepAnchor, - len(icon) + 1, + QTextCursor.Right, QTextCursor.KeepAnchor, len(icon) + 1 ) edit.insertText(f"{new_icon} ") edit.endEditBlock() - - # if a double-click comes next, ignore it - self._suppress_next_checkbox_double_click = True return # handled # advance past this token @@ -1386,27 +565,6 @@ class MarkdownEditor(QTextEdit): # Default handling for anything else super().mousePressEvent(event) - def mouseDoubleClickEvent(self, event: QMouseEvent) -> None: - # If the previous press toggled a checkbox, swallow this double-click - # so the base class does NOT turn it into a selection. - if getattr(self, "_suppress_next_checkbox_double_click", False): - self._suppress_next_checkbox_double_click = False - event.accept() - return - - cursor = self.cursorForPosition(event.pos()) - block = cursor.block() - - # If we're on or inside a code block, open the editor instead - if self._is_inside_code_block(block) or block.text().strip().startswith("```"): - # Only swallow the double-click if we actually opened a dialog. - if not self._edit_code_block(block): - super().mouseDoubleClickEvent(event) - return - - # Otherwise, let normal double-click behaviour happen - super().mouseDoubleClickEvent(event) - # ------------------------ Toolbar action handlers ------------------------ def apply_weight(self): @@ -1478,107 +636,80 @@ class MarkdownEditor(QTextEdit): self.setFocus() def apply_code(self): - """ - Toolbar handler for the button. - - - If the caret is on / inside an existing fenced block, open the editor for it. - - Otherwise open the editor prefilled with any selected text, then insert a new - fenced block containing whatever the user typed. - """ - cursor = self.textCursor() + """Insert a fenced code block, or navigate fences without creating inline backticks.""" + c = self.textCursor() doc = self.document() - if doc is None: + + if c.hasSelection(): + # Wrap selection and ensure exactly one newline after the closing fence + selected = c.selectedText().replace("\u2029", "\n") + c.insertText(f"```\n{selected.rstrip()}\n```\n") + if hasattr(self, "_update_code_block_row_backgrounds"): + self._update_code_block_row_backgrounds() + self.setFocus() return - block = cursor.block() + block = c.block() + line = block.text() + pos_in_block = c.position() - block.position() + stripped = line.strip() - # --- Case 1: already in a code block -> just edit that block --- - if self._is_inside_code_block(block) or block.text().strip().startswith("```"): - self._edit_code_block(block) + # If we're on a fence line, be helpful but never insert inline fences + if stripped.startswith("```"): + # Is this fence opening or closing? (look at blocks above) + inside_before = self._is_inside_code_block(block.previous()) + if inside_before: + # This fence closes the block → ensure a line after, then move there + endpos = block.position() + len(line) + edit = QTextCursor(doc) + edit.setPosition(endpos) + if not block.next().isValid(): + edit.insertText("\n") + c.setPosition(endpos + 1) + self.setTextCursor(c) + if hasattr(self, "_update_code_block_row_backgrounds"): + self._update_code_block_row_backgrounds() + self.setFocus() + return + else: + # Opening fence → move caret to the next line (inside the block) + nb = block.next() + if not nb.isValid(): + e = QTextCursor(doc) + e.setPosition(block.position() + len(line)) + e.insertText("\n") + nb = block.next() + c.setPosition(nb.position()) + self.setTextCursor(c) + self.setFocus() + return + + # If we're inside a block (but not on a fence), don't mutate text + if self._is_inside_code_block(block): + self.setFocus() return - # --- Case 2: creating a new block (optional selection) --- - if cursor.hasSelection(): - start_pos = cursor.selectionStart() - end_pos = cursor.selectionEnd() - # QTextEdit joins lines with U+2029 in selectedText() - initial_code = cursor.selectedText().replace("\u2029", "\n") - else: - start_pos = cursor.position() - end_pos = start_pos - initial_code = "" - - # Let the user type/edit the code in the popup first - dlg = CodeBlockEditorDialog(initial_code, language=None, parent=self) - if dlg.exec() != QDialog.DialogCode.Accepted: - return - - code_text = dlg.code() - language = dlg.language() - - # Don't insert an entirely empty block - if not code_text.strip(): - return - - code_text = code_text.rstrip("\n") + # Outside any block → create a clean template on its own lines (never inline) + start_pos = c.position() + before = line[:pos_in_block] edit = QTextCursor(doc) edit.beginEditBlock() - # Remove selection (if any) so we can insert the new fenced block - edit.setPosition(start_pos) - edit.setPosition(end_pos, QTextCursor.MoveMode.KeepAnchor) - edit.removeSelectedText() - - # Work out whether we're mid-line and need to break before the fence - block = doc.findBlock(start_pos) - line = block.text() - pos_in_block = start_pos - block.position() - before = line[:pos_in_block] - - # If there's text before the caret on this line, put the fence on a new line + # If there is text before the caret on the line, start the block on a new line lead_break = "\n" if before else "" - insert_str = f"{lead_break}```\n{code_text}\n```\n" - + # Insert the block; trailing newline guarantees you can Down-arrow out later + insert = f"{lead_break}```\n\n```\n" edit.setPosition(start_pos) - edit.insertText(insert_str) + edit.insertText(insert) edit.endEditBlock() - # Find the opening fence block we just inserted - open_block = doc.findBlock(start_pos + len(lead_break)) - - # Find the closing fence block - close_block = open_block.next() - while close_block.isValid() and not close_block.text().strip().startswith( - "```" - ): - close_block = close_block.next() - - if close_block.isValid(): - # Make sure there's always at least one line *after* the block - self._ensure_escape_line_after_closing_fence(close_block) - - # Store language metadata if the user chose one - if language is not None: - if not hasattr(self, "_code_metadata"): - from .code_highlighter import CodeBlockMetadata - - self._code_metadata = CodeBlockMetadata() - self._code_metadata.set_language(open_block.blockNumber(), language) - - # Refresh visuals - self._apply_code_block_spacing() - self._update_code_block_row_backgrounds() - if hasattr(self, "highlighter"): - self.highlighter.rehighlight() - - # Put caret just after the code block so the user can keep writing normal text - after_block = close_block.next() if close_block.isValid() else None - if after_block and after_block.isValid(): - cursor = self.textCursor() - cursor.setPosition(after_block.position()) - self.setTextCursor(cursor) + # Put caret on the blank line inside the block + c.setPosition(start_pos + len(lead_break) + 4) # after "```\n" + self.setTextCursor(c) + if hasattr(self, "_update_code_block_row_backgrounds"): + self._update_code_block_row_backgrounds() self.setFocus() def apply_heading(self, size: int): @@ -1628,19 +759,14 @@ class MarkdownEditor(QTextEdit): QTextCursor.MoveOperation.EndOfLine, QTextCursor.MoveMode.KeepAnchor ) line = cursor.selectedText() - stripped = line.lstrip() - # Consider existing markdown markers OR our Unicode bullet as "a bullet" - if ( - stripped.startswith(f"{self._BULLET_DISPLAY} ") - or stripped.startswith("- ") - or stripped.startswith("* ") - ): - # Remove any of those bullet markers - pattern = rf"^\s*([{re.escape(self._BULLET_DISPLAY)}\-*])\s+" - new_line = re.sub(pattern, "", line) + # Check if already a bullet + if line.lstrip().startswith("- ") or line.lstrip().startswith("* "): + # Remove bullet + new_line = re.sub(r"^\s*[-*]\s+", "", line) else: - new_line = f"{self._BULLET_DISPLAY} " + stripped + # Add bullet + new_line = "- " + line.lstrip() cursor.insertText(new_line) @@ -1746,100 +872,3 @@ class MarkdownEditor(QTextEdit): cursor = self.textCursor() cursor.insertImage(img_format) cursor.insertText("\n") # Add newline after image - - # ========== Context Menu Support ========== - - def contextMenuEvent(self, event): - """Override context menu to add custom actions.""" - from PySide6.QtGui import QAction - from PySide6.QtWidgets import QMenu - - menu = QMenu(self) - cursor = self.cursorForPosition(event.pos()) - - # Check if we're in a code block - block = cursor.block() - if self._is_inside_code_block(block): - # Add language selection submenu - lang_menu = menu.addMenu(strings._("set_code_language")) - - languages = [ - "bash", - "css", - "html", - "javascript", - "php", - "python", - ] - for lang in languages: - action = QAction(lang.capitalize(), self) - action.triggered.connect( - lambda checked, l=lang: self._set_code_block_language(block, l) - ) - lang_menu.addAction(action) - - menu.addSeparator() - - edit_action = QAction(strings._("edit_code_block"), self) - edit_action.triggered.connect(lambda: self._edit_code_block(block)) - menu.addAction(edit_action) - - delete_action = QAction(strings._("delete_code_block"), self) - delete_action.triggered.connect(lambda: self._delete_code_block(block)) - menu.addAction(delete_action) - - menu.addSeparator() - - # Add standard context menu actions - if self.textCursor().hasSelection(): - menu.addAction(strings._("cut"), self.cut) - menu.addAction(strings._("copy"), self.copy) - - menu.addAction(strings._("paste"), self.paste) - - menu.exec(event.globalPos()) - - def _set_code_block_language(self, block, language: str): - """Set the language for a code block and store metadata.""" - if not hasattr(self, "_code_metadata"): - from .code_highlighter import CodeBlockMetadata - - self._code_metadata = CodeBlockMetadata() - - # Find the opening fence block for this code block - fence_block = block - while fence_block.isValid() and not fence_block.text().strip().startswith( - "```" - ): - fence_block = fence_block.previous() - - if fence_block.isValid(): - self._code_metadata.set_language(fence_block.blockNumber(), language) - # Trigger rehighlight - self.highlighter.rehighlight() - - def get_current_line_text(self) -> str: - """Get the text of the current line.""" - cursor = self.textCursor() - block = cursor.block() - return block.text() - - def get_current_line_task_text(self) -> str: - """ - Like get_current_line_text(), but with list / checkbox / number - prefixes stripped off for use in Pomodoro notes, etc. - """ - line = self.get_current_line_text() - - text = re.sub( - r"^\s*(?:" - r"-\s\[(?: |x|X)\]\s+" # markdown checkbox - r"|[☐☑]\s+" # Unicode checkbox - r"|•\s+" # Unicode bullet - r"|[-*+]\s+" # markdown bullets - r"|\d+\.\s+" # numbered 1. 2. etc - r")", - "", - line, - ) - return text.strip() diff --git a/bouquin/markdown_highlighter.py b/bouquin/markdown_highlighter.py index bb308d5..0c5e7c0 100644 --- a/bouquin/markdown_highlighter.py +++ b/bouquin/markdown_highlighter.py @@ -6,7 +6,6 @@ from PySide6.QtGui import ( QColor, QFont, QFontDatabase, - QFontMetrics, QGuiApplication, QPalette, QSyntaxHighlighter, @@ -14,18 +13,15 @@ from PySide6.QtGui import ( QTextDocument, ) -from .theme import Theme, ThemeManager +from .theme import ThemeManager, Theme class MarkdownHighlighter(QSyntaxHighlighter): """Live syntax highlighter for markdown that applies formatting as you type.""" - def __init__( - self, document: QTextDocument, theme_manager: ThemeManager, editor=None - ): + def __init__(self, document: QTextDocument, theme_manager: ThemeManager): super().__init__(document) self.theme_manager = theme_manager - self._editor = editor # Reference to the MarkdownEditor self._setup_formats() # Recompute formats whenever the app theme changes self.theme_manager.themeChanged.connect(self._on_theme_changed) @@ -34,14 +30,6 @@ class MarkdownHighlighter(QSyntaxHighlighter): self._setup_formats() self.rehighlight() - def refresh_for_font_change(self) -> None: - """ - Called when the editor's base font changes (zoom / settings). - It rebuilds any formats that depend on the editor font metrics. - """ - self._setup_formats() - self.rehighlight() - def _setup_formats(self): """Setup text formats for different markdown elements.""" @@ -53,15 +41,15 @@ class MarkdownHighlighter(QSyntaxHighlighter): self.italic_format = QTextCharFormat() self.italic_format.setFontItalic(True) + # Strikethrough: ~~text~~ + self.strike_format = QTextCharFormat() + self.strike_format.setFontStrikeOut(True) + # Allow combination of bold/italic self.bold_italic_format = QTextCharFormat() self.bold_italic_format.setFontWeight(QFont.Weight.Bold) self.bold_italic_format.setFontItalic(True) - # Strikethrough: ~~text~~ - self.strike_format = QTextCharFormat() - self.strike_format.setFontStrikeOut(True) - # Inline code: `code` mono = QFontDatabase.systemFont(QFontDatabase.FixedFont) self.code_format = QTextCharFormat() @@ -78,18 +66,17 @@ class MarkdownHighlighter(QSyntaxHighlighter): self.theme_manager.current() == Theme.DARK or self.theme_manager._is_system_dark ): - # In dark mode, use a darker panel-like background for codeblocks - code_bg = pal.color(QPalette.AlternateBase) - code_fg = pal.color(QPalette.Text) + # In dark mode, use a darker panel-like background + bg = pal.color(QPalette.AlternateBase) + fg = pal.color(QPalette.Text) else: - # Light mode: keep the existing light gray for code blocks - code_bg = QColor(245, 245, 245) - code_fg = QColor( # pragma: no cover + # Light mode: keep the existing light gray + bg = QColor(245, 245, 245) + fg = QColor( 0, 0, 0 ) # avoiding using QPalette.Text as it can be white on macOS - - self.code_block_format.setBackground(code_bg) - self.code_block_format.setForeground(code_fg) + self.code_block_format.setBackground(bg) + self.code_block_format.setForeground(fg) # Headings self.h1_format = QTextCharFormat() @@ -104,65 +91,12 @@ class MarkdownHighlighter(QSyntaxHighlighter): self.h3_format.setFontPointSize(14.0) self.h3_format.setFontWeight(QFont.Weight.Bold) - # Hyperlinks - self.link_format = QTextCharFormat() - link_color = pal.color(QPalette.Link) - self.link_format.setForeground(link_color) - self.link_format.setFontUnderline(True) - self.link_format.setAnchor(True) - - # ---- Completed-task text (for checked checkboxes) ---- - # Use the app palette so this works in both light and dark themes. - text_fg = pal.color(QPalette.Text) - text_bg = pal.color(QPalette.Base) - - # Blend the text colour towards the background to "fade" it. - # t closer to 1.0 = closer to background / more faded. - t = 0.55 - faded = QColor( - int(text_fg.red() * (1.0 - t) + text_bg.red() * t), - int(text_fg.green() * (1.0 - t) + text_bg.green() * t), - int(text_fg.blue() * (1.0 - t) + text_bg.blue() * t), - ) - - self.completed_task_format = QTextCharFormat() - self.completed_task_format.setForeground(faded) - - # Checkboxes - self.checkbox_format = QTextCharFormat() - self.checkbox_format.setVerticalAlignment(QTextCharFormat.AlignMiddle) - - # Bullets - self.bullet_format = QTextCharFormat() - - # Use Symbols font for checkbox and bullet glyphs if present - if self._editor is not None and hasattr(self._editor, "symbols_font_family"): - base_font = QFont(self._editor.qfont) # copy of editor font - symbols_font = QFont(self._editor.symbols_font_family) - symbols_font.setPointSizeF(base_font.pointSizeF()) - - base_metrics = QFontMetrics(base_font) - sym_metrics = QFontMetrics(symbols_font) - - # If Symbols glyphs are noticeably shorter than the text, - # scale them up so the visual heights roughly match. - if sym_metrics.height() > 0: - ratio = base_metrics.height() / sym_metrics.height() - if ratio > 1.05: # more than ~5% smaller - ratio = min(ratio, 1.4) # Oh, Tod, Tod. Don't overdo it. - symbols_font.setPointSizeF(symbols_font.pointSizeF() * ratio) - - self.checkbox_format.setFont(symbols_font) - self.bullet_format.setFont(symbols_font) - # Markdown syntax (the markers themselves) - make invisible self.syntax_format = QTextCharFormat() - # Use the editor background color so they blend in - hidden = QColor(text_bg) - hidden.setAlpha(0) - self.syntax_format.setForeground(hidden) # Make the markers invisible by setting font size to 0.1 points self.syntax_format.setFontPointSize(0.1) + # Also make them very faint in case they still show + self.syntax_format.setForeground(QColor(250, 250, 250)) def _overlay_range( self, start: int, length: int, overlay_fmt: QTextCharFormat @@ -201,36 +135,6 @@ class MarkdownHighlighter(QSyntaxHighlighter): if in_code_block: # inside code: apply block bg and language rules self.setFormat(0, len(text), self.code_block_format) - - # Try to apply language-specific highlighting - if self._editor and hasattr(self._editor, "_code_metadata"): - from .code_highlighter import CodeHighlighter - - # Find the opening fence block - prev_block = self.currentBlock().previous() - fence_block_num = None - temp_inside = in_code_block - - while prev_block.isValid(): - if prev_block.text().strip().startswith("```"): - temp_inside = not temp_inside - if not temp_inside: - fence_block_num = prev_block.blockNumber() - break - prev_block = prev_block.previous() - - if fence_block_num is not None: - language = self._editor._code_metadata.get_language(fence_block_num) - if language: - patterns = CodeHighlighter.get_language_patterns(language) - for pattern, syntax_type in patterns: - for match in re.finditer(pattern, text): - start, end = match.span() - fmt = CodeHighlighter.get_format_for_type( - syntax_type, self.code_block_format - ) - self.setFormat(start, end - start, fmt) - self.setCurrentBlockState(1) return @@ -259,54 +163,49 @@ class MarkdownHighlighter(QSyntaxHighlighter): self.setFormat(marker_len, len(text) - marker_len, heading_fmt) return - # Bold+Italic (*** or ___): do these first and record occupied spans. - # --- Triple emphasis: detect first, hide markers now, but DEFER applying content style - triple_contents: list[tuple[int, int]] = [] # (start, length) for content only - occupied: list[tuple[int, int]] = ( - [] - ) # full spans including markers, for overlap checks - + # Bold+Italic: ***text*** or ___text___ + # Do these first and remember their spans so later passes don't override them. + occupied = [] for m in re.finditer( r"(? 0 and text[start - 1 : start + 1] in ("**", "__"): - continue # pragma: no cover + continue if end < len(text) and text[end : end + 1] in ("*", "_"): - continue # pragma: no cover + continue content_start, content_end = start + 1, end - 1 self.setFormat(start, 1, self.syntax_format) self.setFormat(end - 1, 1, self.syntax_format) @@ -314,10 +213,6 @@ class MarkdownHighlighter(QSyntaxHighlighter): content_start, content_end - content_start, self.italic_format ) - # --- NOW overlay bold+italic for triple contents LAST (so nothing clobbers it) - for cs, length in triple_contents: - self._overlay_range(cs, length, self.bold_italic_format) - # Strikethrough: ~~text~~ for m in re.finditer(r"~~(.+?)~~", text): start, end = m.span() @@ -339,32 +234,3 @@ class MarkdownHighlighter(QSyntaxHighlighter): self.setFormat(start, 1, self.syntax_format) self.setFormat(end - 1, 1, self.syntax_format) self.setFormat(content_start, content_end - content_start, self.code_format) - - # Hyperlinks - url_pattern = re.compile(r"(https?://[^\s<>()]+)") - for m in url_pattern.finditer(text): - start, end = m.span(1) - url = m.group(1) - - # Clone link format so we can attach a per-link href - fmt = QTextCharFormat(self.link_format) - fmt.setAnchorHref(url) - # Overlay link attributes on top of whatever formatting is already there - self._overlay_range(start, end - start, fmt) - - # Make checkbox glyphs bigger - for m in re.finditer(r"[☐☑]", text): - self._overlay_range(m.start(), 1, self.checkbox_format) - - for m in re.finditer(r"•", text): - self._overlay_range(m.start(), 1, self.bullet_format) - - # Completed checkbox lines: fade the text after the checkbox. - m = re.match(r"^(\s*☑\s+)(.+)$", text) - if m and hasattr(self, "completed_task_format"): - prefix = m.group(1) - content = m.group(2) - start = len(prefix) - length = len(content) - if length > 0: - self._overlay_range(start, length, self.completed_task_format) diff --git a/bouquin/pomodoro_timer.py b/bouquin/pomodoro_timer.py deleted file mode 100644 index e66c1f4..0000000 --- a/bouquin/pomodoro_timer.py +++ /dev/null @@ -1,207 +0,0 @@ -from __future__ import annotations - -import math -from typing import Optional - -from PySide6.QtCore import Qt, QTimer, Signal, Slot -from PySide6.QtWidgets import ( - QFrame, - QHBoxLayout, - QLabel, - QPushButton, - QVBoxLayout, - QWidget, -) - -from . import strings -from .db import DBManager -from .time_log import TimeLogDialog - - -class PomodoroTimer(QFrame): - """A simple timer for tracking work time on a specific task.""" - - timerStopped = Signal(int, str) # Emits (elapsed_seconds, task_text) - - def __init__(self, task_text: str, parent: Optional[QWidget] = None): - super().__init__(parent) - - self._task_text = task_text - self._elapsed_seconds = 0 - self._running = False - - layout = QVBoxLayout(self) - - # Task label - task_label = QLabel(task_text) - task_label.setWordWrap(True) - layout.addWidget(task_label) - - # Timer display - self.time_label = QLabel("00:00:00") - font = self.time_label.font() - font.setPointSize(20) - font.setBold(True) - self.time_label.setFont(font) - self.time_label.setAlignment(Qt.AlignCenter) - layout.addWidget(self.time_label) - - # Control buttons - btn_layout = QHBoxLayout() - - self.start_pause_btn = QPushButton(strings._("start")) - self.start_pause_btn.clicked.connect(self._toggle_timer) - btn_layout.addWidget(self.start_pause_btn) - - self.stop_btn = QPushButton(strings._("stop_and_log")) - self.stop_btn.clicked.connect(self._stop_and_log) - self.stop_btn.setEnabled(False) - btn_layout.addWidget(self.stop_btn) - - layout.addLayout(btn_layout) - - # Internal timer (ticks every second) - self._timer = QTimer(self) - self._timer.timeout.connect(self._tick) - - @Slot() - def _toggle_timer(self): - """Start or pause the timer.""" - if self._running: - # Pause - self._running = False - self._timer.stop() - self.start_pause_btn.setText(strings._("resume")) - else: - # Start/Resume - self._running = True - self._timer.start(1000) # 1 second - self.start_pause_btn.setText(strings._("pause")) - self.stop_btn.setEnabled(True) - - @Slot() - def _tick(self): - """Update the elapsed time display.""" - self._elapsed_seconds += 1 - self._update_display() - - def _update_display(self): - """Update the time display label.""" - hours = self._elapsed_seconds // 3600 - minutes = (self._elapsed_seconds % 3600) // 60 - seconds = self._elapsed_seconds % 60 - self.time_label.setText(f"{hours:02d}:{minutes:02d}:{seconds:02d}") - - @Slot() - def _stop_and_log(self): - """Stop the timer and emit signal to open time log.""" - if self._running: - self._running = False - self._timer.stop() - - self.timerStopped.emit(self._elapsed_seconds, self._task_text) - self.close() - - -class PomodoroManager: - """Manages Pomodoro timers and integrates with time log.""" - - def __init__(self, db: DBManager, parent_window): - self._db = db - self._parent = parent_window - self._active_timer: Optional[PomodoroTimer] = None - - def start_timer_for_line(self, line_text: str, date_iso: str): - """ - Start a new timer for the given line of text and embed it into the - TimeLogWidget in the main window sidebar. - """ - # Cancel any existing timer first - self.cancel_timer() - - # The timer lives inside the TimeLogWidget in the sidebar - time_log_widget = getattr(self._parent, "time_log", None) - if time_log_widget is None: - return - - self._active_timer = PomodoroTimer(line_text, time_log_widget) - self._active_timer.timerStopped.connect( - lambda seconds, text: self._on_timer_stopped(seconds, text, date_iso) - ) - - # Ask the TimeLogWidget to own and display the widget - if hasattr(time_log_widget, "show_pomodoro_widget"): - time_log_widget.show_pomodoro_widget(self._active_timer) - else: - # Fallback - just attach it as a child widget - self._active_timer.setParent(time_log_widget) - self._active_timer.show() - - def cancel_timer(self): - """Cancel any running timer without logging and remove it from the sidebar.""" - if not self._active_timer: - return - - time_log_widget = getattr(self._parent, "time_log", None) - if time_log_widget is not None and hasattr( - time_log_widget, "clear_pomodoro_widget" - ): - time_log_widget.clear_pomodoro_widget() - else: - # Fallback if the widget API doesn't exist - self._active_timer.setParent(None) - - self._active_timer.deleteLater() - self._active_timer = None - - def _on_timer_stopped(self, elapsed_seconds: int, task_text: str, date_iso: str): - """Handle timer stop - open time log dialog with pre-filled data.""" - # Convert seconds to decimal hours, rounding up to the nearest 0.25 hour (15 minutes) - quarter_hours = math.ceil(elapsed_seconds / 900) - hours = quarter_hours * 0.25 - - # Ensure minimum of 0.25 hours - if hours < 0.25: - hours = 0.25 - - # Untoggle the toolbar button without retriggering the slot - tool_bar = getattr(self._parent, "toolBar", None) - if tool_bar is not None and hasattr(tool_bar, "actTimer"): - action = tool_bar.actTimer - was_blocked = action.blockSignals(True) - try: - action.setChecked(False) - finally: - action.blockSignals(was_blocked) - - # Remove the embedded widget - self.cancel_timer() - - # Open time log dialog - dlg = TimeLogDialog( - self._db, - date_iso, - self._parent, - True, - themes=self._parent.themes, - close_after_add=True, - ) - - # Pre-fill the hours - dlg.hours_spin.setValue(hours) - - # Pre-fill the note with task text - dlg.note.setText(task_text) - - # Show the dialog - dlg.exec() - - time_log_widget = getattr(self._parent, "time_log", None) - if time_log_widget is not None: - # Same behaviour as TimeLogWidget._open_dialog/_open_dialog_log_only: - # reload the summary so the TimeLogWidget in sidebar updates its totals - time_log_widget._reload_summary() - if not time_log_widget.toggle_btn.isChecked(): - time_log_widget.summary_label.setText( - strings._("time_log_collapsed_hint") - ) diff --git a/bouquin/reminders.py b/bouquin/reminders.py deleted file mode 100644 index 6d8b0a1..0000000 --- a/bouquin/reminders.py +++ /dev/null @@ -1,917 +0,0 @@ -from __future__ import annotations - -from dataclasses import dataclass -from enum import Enum -from typing import Optional - -from PySide6.QtCore import QDate, QDateTime, Qt, QTime, QTimer, Signal, Slot -from PySide6.QtWidgets import ( - QAbstractItemView, - QComboBox, - QDateEdit, - QDialog, - QFormLayout, - QFrame, - QHBoxLayout, - QHeaderView, - QLineEdit, - QListWidget, - QListWidgetItem, - QMessageBox, - QPushButton, - QSizePolicy, - QSpinBox, - QStyle, - QTableWidget, - QTableWidgetItem, - QTimeEdit, - QToolButton, - QVBoxLayout, - QWidget, -) - -from . import strings -from .db import DBManager -from .settings import load_db_config - -import requests - - -class ReminderType(Enum): - ONCE = strings._("once") - DAILY = strings._("daily") - WEEKDAYS = strings._("weekdays") # Mon-Fri - WEEKLY = strings._("weekly") # specific day of week - FORTNIGHTLY = strings._("fortnightly") # every 2 weeks - MONTHLY_DATE = strings._("monthly_same_date") # same calendar date - MONTHLY_NTH_WEEKDAY = strings._("monthly_nth_weekday") # e.g. 3rd Monday - - -@dataclass -class Reminder: - id: Optional[int] - text: str - time_str: str # HH:MM - reminder_type: ReminderType - weekday: Optional[int] = None # 0=Mon, 6=Sun (for weekly type) - active: bool = True - date_iso: Optional[str] = None # For ONCE type - - -class ReminderDialog(QDialog): - """Dialog for creating/editing reminders with recurrence support.""" - - def __init__(self, db: DBManager, parent=None, reminder: Optional[Reminder] = None): - super().__init__(parent) - self._db = db - self._reminder = reminder - - self.setWindowTitle( - strings._("set_reminder") if not reminder else strings._("edit_reminder") - ) - self.setMinimumWidth(400) - - layout = QVBoxLayout(self) - self.form = QFormLayout() - - # Reminder text - self.text_edit = QLineEdit() - if reminder: - self.text_edit.setText(reminder.text) - self.form.addRow("&" + strings._("reminder") + ":", self.text_edit) - - # Date - self.date_edit = QDateEdit() - self.date_edit.setCalendarPopup(True) - self.date_edit.setDisplayFormat("yyyy-MM-dd") - - if reminder and reminder.date_iso: - d = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if d.isValid(): - self.date_edit.setDate(d) - else: - self.date_edit.setDate(QDate.currentDate()) - else: - self.date_edit.setDate(QDate.currentDate()) - - self.form.addRow("&" + strings._("date") + ":", self.date_edit) - - # Time - self.time_edit = QTimeEdit() - self.time_edit.setDisplayFormat("HH:mm") - if reminder: - parts = reminder.time_str.split(":") - self.time_edit.setTime(QTime(int(parts[0]), int(parts[1]))) - else: - # Default to 5 minutes in the future - future = QTime.currentTime().addSecs(5 * 60) - self.time_edit.setTime(future) - self.form.addRow("&" + strings._("time") + ":", self.time_edit) - - # Recurrence type - self.type_combo = QComboBox() - self.type_combo.addItem(strings._("once"), ReminderType.ONCE) - self.type_combo.addItem(strings._("every_day"), ReminderType.DAILY) - self.type_combo.addItem(strings._("every_weekday"), ReminderType.WEEKDAYS) - self.type_combo.addItem(strings._("every_week"), ReminderType.WEEKLY) - self.type_combo.addItem(strings._("every_fortnight"), ReminderType.FORTNIGHTLY) - self.type_combo.addItem(strings._("every_month"), ReminderType.MONTHLY_DATE) - self.type_combo.addItem( - strings._("every_month_nth_weekday"), ReminderType.MONTHLY_NTH_WEEKDAY - ) - - if reminder: - for i in range(self.type_combo.count()): - if self.type_combo.itemData(i) == reminder.reminder_type: - self.type_combo.setCurrentIndex(i) - break - - self.type_combo.currentIndexChanged.connect(self._on_type_changed) - self.form.addRow("&" + strings._("repeat") + ":", self.type_combo) - - # Weekday selector (for weekly reminders) - self.weekday_combo = QComboBox() - days = [ - strings._("monday"), - strings._("tuesday"), - strings._("wednesday"), - strings._("thursday"), - strings._("friday"), - strings._("saturday"), - strings._("sunday"), - ] - for i, day in enumerate(days): - self.weekday_combo.addItem(day, i) - - if reminder and reminder.weekday is not None: - self.weekday_combo.setCurrentIndex(reminder.weekday) - else: - self.weekday_combo.setCurrentIndex(self.date_edit.date().dayOfWeek() - 1) - - self.form.addRow("&" + strings._("day") + ":", self.weekday_combo) - day_label = self.form.labelForField(self.weekday_combo) - day_label.setVisible(False) - - self.nth_spin = QSpinBox() - self.nth_spin.setRange(1, 5) # up to 5th Monday, etc. - self.nth_spin.setValue(1) - # If editing an existing MONTHLY_NTH_WEEKDAY reminder, derive the nth from date_iso - if ( - reminder - and reminder.reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY - and reminder.date_iso - ): - anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if anchor.isValid(): - nth_index = (anchor.day() - 1) // 7 # 0-based - self.nth_spin.setValue(nth_index + 1) - - self.form.addRow("&" + strings._("week_in_month") + ":", self.nth_spin) - nth_label = self.form.labelForField(self.nth_spin) - nth_label.setVisible(False) - self.nth_spin.setVisible(False) - - layout.addLayout(self.form) - - # Buttons - btn_layout = QHBoxLayout() - btn_layout.addStretch() - - save_btn = QPushButton("&" + strings._("save")) - save_btn.clicked.connect(self.accept) - save_btn.setDefault(True) - btn_layout.addWidget(save_btn) - - cancel_btn = QPushButton("&" + strings._("cancel")) - cancel_btn.clicked.connect(self.reject) - btn_layout.addWidget(cancel_btn) - - layout.addLayout(btn_layout) - - self._on_type_changed() - - def _on_type_changed(self): - """Show/hide weekday / nth selectors based on reminder type.""" - reminder_type = self.type_combo.currentData() - - show_weekday = reminder_type in ( - ReminderType.WEEKLY, - ReminderType.MONTHLY_NTH_WEEKDAY, - ) - self.weekday_combo.setVisible(show_weekday) - day_label = self.form.labelForField(self.weekday_combo) - day_label.setVisible(show_weekday) - - show_nth = reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY - nth_label = self.form.labelForField(self.nth_spin) - self.nth_spin.setVisible(show_nth) - nth_label.setVisible(show_nth) - - # For new reminders, when switching to a type that uses a weekday, - # snap the weekday to match the currently selected date. - if reminder_type in ( - ReminderType.WEEKLY, - ReminderType.MONTHLY_NTH_WEEKDAY, - ) and (self._reminder is None or self._reminder.reminder_type != reminder_type): - dow = self.date_edit.date().dayOfWeek() - 1 # 0..6 (Mon..Sun) - if 0 <= dow < self.weekday_combo.count(): - self.weekday_combo.setCurrentIndex(dow) - - def get_reminder(self) -> Reminder: - """Get the configured reminder.""" - reminder_type = self.type_combo.currentData() - time_obj = self.time_edit.time() - time_str = f"{time_obj.hour():02d}:{time_obj.minute():02d}" - - weekday = None - if reminder_type in (ReminderType.WEEKLY, ReminderType.MONTHLY_NTH_WEEKDAY): - weekday = self.weekday_combo.currentData() - - date_iso = None - anchor_date = self.date_edit.date() - - if reminder_type == ReminderType.ONCE: - # Fire once, on the chosen calendar date at the chosen time - date_iso = anchor_date.toString("yyyy-MM-dd") - - elif reminder_type == ReminderType.FORTNIGHTLY: - # Anchor: the chosen calendar date. Every 14 days from this date. - date_iso = anchor_date.toString("yyyy-MM-dd") - - elif reminder_type == ReminderType.MONTHLY_DATE: - # Anchor: the chosen calendar date. "Same date each month" - date_iso = anchor_date.toString("yyyy-MM-dd") - - elif reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY: - # Anchor: the nth weekday for the chosen month (gives us “3rd Monday” etc.) - weekday = self.weekday_combo.currentData() - nth_index = self.nth_spin.value() - 1 # 0-based - - first = QDate(anchor_date.year(), anchor_date.month(), 1) - target_dow = weekday + 1 # Qt: Monday=1 - offset = (target_dow - first.dayOfWeek() + 7) % 7 - anchor = first.addDays(offset + nth_index * 7) - - # If nth weekday doesn't exist in this month, fall back to the last such weekday - if anchor.month() != anchor_date.month(): - anchor = anchor.addDays(-7) - - date_iso = anchor.toString("yyyy-MM-dd") - - return Reminder( - id=self._reminder.id if self._reminder else None, - text=self.text_edit.text(), - time_str=time_str, - reminder_type=reminder_type, - weekday=weekday, - active=self._reminder.active if self._reminder else True, - date_iso=date_iso, - ) - - -class UpcomingRemindersWidget(QFrame): - """Collapsible widget showing upcoming reminders for today and next 7 days.""" - - reminderTriggered = Signal(str) # Emits reminder text - - def __init__(self, db: DBManager, parent: Optional[QWidget] = None): - super().__init__(parent) - self._db = db - - self.setFrameShape(QFrame.StyledPanel) - self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) - - # Header with toggle button - self.toggle_btn = QToolButton() - self.toggle_btn.setText(strings._("upcoming_reminders")) - self.toggle_btn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - self.toggle_btn.setCheckable(True) - self.toggle_btn.setChecked(False) - self.toggle_btn.setArrowType(Qt.RightArrow) - self.toggle_btn.clicked.connect(self._on_toggle) - - self.add_btn = QToolButton() - self.add_btn.setText("⏰") - self.add_btn.setToolTip(strings._("add_reminder")) - self.add_btn.setAutoRaise(True) - self.add_btn.clicked.connect(self._add_reminder) - - self.manage_btn = QToolButton() - self.manage_btn.setIcon( - self.style().standardIcon(QStyle.SP_FileDialogDetailedView) - ) - self.manage_btn.setToolTip(strings._("manage_reminders")) - self.manage_btn.setAutoRaise(True) - self.manage_btn.clicked.connect(self._manage_reminders) - - header = QHBoxLayout() - header.setContentsMargins(0, 0, 0, 0) - header.addWidget(self.toggle_btn) - header.addStretch() - header.addWidget(self.add_btn) - header.addWidget(self.manage_btn) - - # Body with reminder list - self.body = QWidget() - body_layout = QVBoxLayout(self.body) - body_layout.setContentsMargins(0, 4, 0, 0) - body_layout.setSpacing(2) - - self.reminder_list = QListWidget() - self.reminder_list.setMaximumHeight(200) - self.reminder_list.setSelectionMode(QAbstractItemView.ExtendedSelection) - self.reminder_list.itemDoubleClicked.connect(self._edit_reminder) - self.reminder_list.setContextMenuPolicy(Qt.CustomContextMenu) - self.reminder_list.customContextMenuRequested.connect( - self._show_reminder_context_menu - ) - body_layout.addWidget(self.reminder_list) - - self.body.setVisible(False) - - main = QVBoxLayout(self) - main.setContentsMargins(0, 0, 0, 0) - main.addLayout(header) - main.addWidget(self.body) - - # Timer to check and fire reminders - # - # We tick once per second, but only hit the DB when the clock is - # exactly on a :00 second. That way a reminder for HH:MM fires at - # HH:MM:00, independent of when it was created. - self._tick_timer = QTimer(self) - self._tick_timer.setInterval(1000) # 1 second - self._tick_timer.timeout.connect(self._on_tick) - self._tick_timer.start() - - # Also check once on startup so we don't miss reminders that - # should have fired a moment ago when the app wasn't running. - QTimer.singleShot(0, self._check_reminders) - - def _on_tick(self) -> None: - """Called every second; run reminder check only on exact minute boundaries.""" - now = QDateTime.currentDateTime() - if now.time().second() == 0: - # Only do the heavier DB work once per minute, at HH:MM:00, - # so reminders are aligned to the clock and not to when they - # were created. - self._check_reminders(now) - - def __del__(self): - """Cleanup timers when widget is destroyed.""" - try: - if hasattr(self, "_tick_timer") and self._tick_timer: - self._tick_timer.stop() - except Exception: - pass # Ignore any cleanup errors - - def _on_toggle(self, checked: bool): - """Toggle visibility of reminder list.""" - self.body.setVisible(checked) - self.toggle_btn.setArrowType(Qt.DownArrow if checked else Qt.RightArrow) - if checked: - self.refresh() - - def refresh(self): - """Reload and display upcoming reminders.""" - # Guard: Check if database connection is valid - if not self._db or not hasattr(self._db, "conn") or self._db.conn is None: - return - - self.reminder_list.clear() - - reminders = self._db.get_all_reminders() - now = QDateTime.currentDateTime() - today = QDate.currentDate() - - # Get reminders for the next 7 days - upcoming = [] - for i in range(8): # Today + 7 days - check_date = today.addDays(i) - - for reminder in reminders: - if not reminder.active: - continue - - if self._should_fire_on_date(reminder, check_date): - # Parse time - hour, minute = map(int, reminder.time_str.split(":")) - dt = QDateTime(check_date, QTime(hour, minute)) - - # Skip past reminders - if dt < now: - continue - - upcoming.append((dt, reminder)) - - # Sort by datetime - upcoming.sort(key=lambda x: x[0]) - - # Display - for dt, reminder in upcoming[:20]: # Show max 20 - date_str = dt.date().toString("ddd MMM d") - time_str = dt.time().toString("HH:mm") - - item = QListWidgetItem(f"{date_str} {time_str} - {reminder.text}") - item.setData(Qt.UserRole, reminder) - self.reminder_list.addItem(item) - - if not upcoming: - item = QListWidgetItem(strings._("no_upcoming_reminders")) - item.setFlags(Qt.NoItemFlags) - self.reminder_list.addItem(item) - - def _should_fire_on_date(self, reminder: Reminder, date: QDate) -> bool: - """Check if a reminder should fire on a given date.""" - rtype = reminder.reminder_type - - if rtype == ReminderType.ONCE: - if reminder.date_iso: - return date.toString("yyyy-MM-dd") == reminder.date_iso - return False - - if rtype == ReminderType.DAILY: - return True - - if rtype == ReminderType.WEEKDAYS: - # Monday=1, Sunday=7 - return 1 <= date.dayOfWeek() <= 5 - - if rtype == ReminderType.WEEKLY: - # Qt: Monday=1, reminder: Monday=0 - return date.dayOfWeek() - 1 == reminder.weekday - - if rtype == ReminderType.FORTNIGHTLY: - if not reminder.date_iso: - return False - anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if not anchor.isValid() or date < anchor: - return False - days = anchor.daysTo(date) - return days % 14 == 0 - - if rtype == ReminderType.MONTHLY_DATE: - if not reminder.date_iso: - return False - anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if not anchor.isValid(): - return False - anchor_day = anchor.day() - # Clamp to the last day of this month (for 29/30/31) - first_of_month = QDate(date.year(), date.month(), 1) - last_of_month = first_of_month.addMonths(1).addDays(-1) - target_day = min(anchor_day, last_of_month.day()) - return date.day() == target_day - - if rtype == ReminderType.MONTHLY_NTH_WEEKDAY: - if not reminder.date_iso or reminder.weekday is None: - return False - - anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if not anchor.isValid(): - return False - - # Which "nth" weekday is the anchor? (0=1st, 1=2nd, etc.) - anchor_n = (anchor.day() - 1) // 7 - target_dow = reminder.weekday + 1 # Qt dayOfWeek (1..7) - - # Compute the anchor_n-th target weekday in this month - first = QDate(date.year(), date.month(), 1) - offset = (target_dow - first.dayOfWeek() + 7) % 7 - candidate = first.addDays(offset + anchor_n * 7) - - # If that nth weekday doesn't exist this month (e.g. 5th Monday), skip - if candidate.month() != date.month(): - return False - - return date == candidate - - return False - - def _check_reminders(self, now: QDateTime | None = None): - """ - Check and trigger due reminders. - - This uses absolute clock time, so a reminder for HH:MM will fire - when the system clock reaches HH:MM:00, independent of when the - reminder was created. - """ - # Guard: Check if database connection is valid - if not self._db or not hasattr(self._db, "conn") or self._db.conn is None: - return - - if now is None: - now = QDateTime.currentDateTime() - - today = now.date() - reminders = self._db.get_all_reminders() - - # Small grace window (in seconds) so we still fire reminders if - # the app was just opened or the event loop was briefly busy. - GRACE_WINDOW_SECS = 120 # 2 minutes - - for reminder in reminders: - if not reminder.active: - continue - - if not self._should_fire_on_date(reminder, today): - continue - - # Parse time: stored as "HH:MM", we treat that as HH:MM:00 - hour, minute = map(int, reminder.time_str.split(":")) - target = QDateTime(today, QTime(hour, minute, 0)) - - # Skip if this reminder is still in the future - if now < target: - continue - - # How long ago should this reminder have fired? - seconds_late = target.secsTo(now) # target -> now - - if 0 <= seconds_late <= GRACE_WINDOW_SECS: - # Check if we haven't already fired this occurrence - if not hasattr(self, "_fired_reminders"): - self._fired_reminders = {} - - reminder_key = (reminder.id, target.toString()) - - if reminder_key in self._fired_reminders: - continue - - # Mark as fired and emit - self._fired_reminders[reminder_key] = now - self.reminderTriggered.emit(reminder.text) - - # For ONCE reminders, deactivate after firing - if reminder.reminder_type == ReminderType.ONCE: - self._db.update_reminder_active(reminder.id, False) - self.refresh() # Refresh the list to show deactivated reminder - - @Slot() - def _add_reminder(self): - """Open dialog to add a new reminder.""" - dlg = ReminderDialog(self._db, self) - if dlg.exec() == QDialog.Accepted: - reminder = dlg.get_reminder() - self._db.save_reminder(reminder) - self.refresh() - - @Slot(QListWidgetItem) - def _edit_reminder(self, item: QListWidgetItem): - """Edit an existing reminder.""" - reminder = item.data(Qt.UserRole) - if not reminder: - return - - dlg = ReminderDialog(self._db, self, reminder) - if dlg.exec() == QDialog.Accepted: - updated = dlg.get_reminder() - self._db.save_reminder(updated) - self.refresh() - - @Slot() - def _show_reminder_context_menu(self, pos): - """Show context menu for reminder list item(s).""" - selected_items = self.reminder_list.selectedItems() - if not selected_items: - return - - from PySide6.QtGui import QAction - from PySide6.QtWidgets import QMenu - - menu = QMenu(self) - - # Only show Edit if single item selected - if len(selected_items) == 1: - reminder = selected_items[0].data(Qt.UserRole) - if reminder: - edit_action = QAction(strings._("edit"), self) - edit_action.triggered.connect( - lambda: self._edit_reminder(selected_items[0]) - ) - menu.addAction(edit_action) - - # Delete option for any selection - if len(selected_items) == 1: - delete_text = strings._("delete") - else: - delete_text = ( - strings._("delete") - + f" {len(selected_items)} " - + strings._("reminders") - ) - - delete_action = QAction(delete_text, self) - delete_action.triggered.connect(lambda: self._delete_selected_reminders()) - menu.addAction(delete_action) - - menu.exec(self.reminder_list.mapToGlobal(pos)) - - def _delete_selected_reminders(self): - """Delete all selected reminders (handling duplicates).""" - selected_items = self.reminder_list.selectedItems() - if not selected_items: - return - - # Collect unique reminder IDs - unique_reminders = {} - for item in selected_items: - reminder = item.data(Qt.UserRole) - if reminder and reminder.id not in unique_reminders: - unique_reminders[reminder.id] = reminder - - if not unique_reminders: - return - - # Confirmation message - if len(unique_reminders) == 1: - reminder = list(unique_reminders.values())[0] - msg = ( - strings._("delete") - + " " - + strings._("reminder") - + f" '{reminder.text}'?" - ) - if reminder.reminder_type != ReminderType.ONCE: - msg += ( - "\n\n" - + strings._("this_is_a_reminder_of_type") - + f" '{reminder.reminder_type.value}'. " - + strings._("deleting_it_will_remove_all_future_occurrences") - ) - else: - msg = ( - strings._("delete") - + f"{len(unique_reminders)} " - + strings._("reminders") - + " ?\n\n" - + strings._("this_will_delete_the_actual_reminders") - ) - - reply = QMessageBox.question( - self, - strings._("delete_reminders"), - msg, - QMessageBox.Yes | QMessageBox.No, - QMessageBox.No, - ) - - if reply == QMessageBox.Yes: - for reminder_id in unique_reminders: - self._db.delete_reminder(reminder_id) - self.refresh() - - def _delete_reminder(self, reminder): - """Delete a single reminder after confirmation.""" - msg = strings._("delete") + " " + strings._("reminder") + f" '{reminder.text}'?" - if reminder.reminder_type != ReminderType.ONCE: - msg += ( - "\n\n" - + strings._("this_is_a_reminder_of_type") - + f" '{reminder.reminder_type.value}'. " - + strings._("deleting_it_will_remove_all_future_occurrences") - ) - - reply = QMessageBox.question( - self, - strings._("delete_reminder"), - msg, - QMessageBox.Yes | QMessageBox.No, - QMessageBox.No, - ) - - if reply == QMessageBox.Yes: - self._db.delete_reminder(reminder.id) - self.refresh() - - @Slot() - def _manage_reminders(self): - """Open dialog to manage all reminders.""" - dlg = ManageRemindersDialog(self._db, self) - dlg.exec() - self.refresh() - - -class ManageRemindersDialog(QDialog): - """Dialog for managing all reminders.""" - - def __init__(self, db: DBManager, parent: Optional[QWidget] = None): - super().__init__(parent) - self._db = db - - self.setWindowTitle(strings._("manage_reminders")) - self.setMinimumSize(700, 500) - - layout = QVBoxLayout(self) - - # Reminder list table - self.table = QTableWidget() - self.table.setColumnCount(6) - self.table.setHorizontalHeaderLabels( - [ - strings._("text"), - strings._("date"), - strings._("time"), - strings._("type"), - strings._("active"), - strings._("actions"), - ] - ) - self.table.horizontalHeader().setStretchLastSection(False) - self.table.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch) - self.table.setSelectionBehavior(QAbstractItemView.SelectRows) - self.table.setEditTriggers(QAbstractItemView.NoEditTriggers) - layout.addWidget(self.table) - - # Buttons - btn_layout = QHBoxLayout() - - add_btn = QPushButton(strings._("add_reminder")) - add_btn.clicked.connect(self._add_reminder) - btn_layout.addWidget(add_btn) - - btn_layout.addStretch() - - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - btn_layout.addWidget(close_btn) - - layout.addLayout(btn_layout) - - self._load_reminders() - - def _load_reminders(self): - """Load all reminders into the table.""" - - # Guard: Check if database connection is valid - if not self._db or not hasattr(self._db, "conn") or self._db.conn is None: - return - - reminders = self._db.get_all_reminders() - self.table.setRowCount(len(reminders)) - - for row, reminder in enumerate(reminders): - # Text - text_item = QTableWidgetItem(reminder.text) - text_item.setData(Qt.UserRole, reminder) - self.table.setItem(row, 0, text_item) - - # Date - date_display = "" - if reminder.reminder_type == ReminderType.ONCE and reminder.date_iso: - d = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if d.isValid(): - date_display = d.toString("yyyy-MM-dd") - else: - date_display = reminder.date_iso - - date_item = QTableWidgetItem(date_display) - self.table.setItem(row, 1, date_item) - - # Time - time_item = QTableWidgetItem(reminder.time_str) - self.table.setItem(row, 2, time_item) - - # Type - base_type_strs = { - ReminderType.ONCE: "Once", - ReminderType.DAILY: "Daily", - ReminderType.WEEKDAYS: "Weekdays", - ReminderType.WEEKLY: "Weekly", - ReminderType.FORTNIGHTLY: "Fortnightly", - ReminderType.MONTHLY_DATE: "Monthly (date)", - ReminderType.MONTHLY_NTH_WEEKDAY: "Monthly (nth weekday)", - } - type_str = base_type_strs.get(reminder.reminder_type, "Unknown") - - # Short day names we can reuse - days_short = [ - strings._("monday_short"), - strings._("tuesday_short"), - strings._("wednesday_short"), - strings._("thursday_short"), - strings._("friday_short"), - strings._("saturday_short"), - strings._("sunday_short"), - ] - - if reminder.reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY: - # Show something like: Monthly (3rd Mon) - day_name = "" - if reminder.weekday is not None and 0 <= reminder.weekday < len( - days_short - ): - day_name = days_short[reminder.weekday] - - nth_label = "" - if reminder.date_iso: - anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd") - if anchor.isValid(): - nth_index = (anchor.day() - 1) // 7 # 0-based (0..4) - ordinals = ["1st", "2nd", "3rd", "4th", "5th"] - if 0 <= nth_index < len(ordinals): - nth_label = ordinals[nth_index] - - parts = [] - if nth_label: - parts.append(nth_label) - if day_name: - parts.append(day_name) - - if parts: - type_str = f"Monthly ({' '.join(parts)})" - # else: fall back to the generic "Monthly (nth weekday)" - - else: - # For weekly / fortnightly types, still append the day name - if ( - reminder.reminder_type - in (ReminderType.WEEKLY, ReminderType.FORTNIGHTLY) - and reminder.weekday is not None - and 0 <= reminder.weekday < len(days_short) - ): - type_str += f" ({days_short[reminder.weekday]})" - - type_item = QTableWidgetItem(type_str) - self.table.setItem(row, 3, type_item) - - # Active - active_item = QTableWidgetItem("✓" if reminder.active else "✗") - self.table.setItem(row, 4, active_item) - - # Actions - actions_widget = QWidget() - actions_layout = QHBoxLayout(actions_widget) - actions_layout.setContentsMargins(2, 2, 2, 2) - - edit_btn = QPushButton(strings._("edit")) - edit_btn.clicked.connect(lambda checked, r=reminder: self._edit_reminder(r)) - actions_layout.addWidget(edit_btn) - - delete_btn = QPushButton(strings._("delete")) - delete_btn.clicked.connect( - lambda checked, r=reminder: self._delete_reminder(r) - ) - actions_layout.addWidget(delete_btn) - - self.table.setCellWidget(row, 5, actions_widget) - - def _add_reminder(self): - """Add a new reminder.""" - dlg = ReminderDialog(self._db, self) - if dlg.exec() == QDialog.Accepted: - reminder = dlg.get_reminder() - self._db.save_reminder(reminder) - self._load_reminders() - - def _edit_reminder(self, reminder): - """Edit an existing reminder.""" - dlg = ReminderDialog(self._db, self, reminder) - if dlg.exec() == QDialog.Accepted: - updated = dlg.get_reminder() - self._db.save_reminder(updated) - self._load_reminders() - - def _delete_reminder(self, reminder): - """Delete a reminder.""" - reply = QMessageBox.question( - self, - strings._("delete_reminder"), - strings._("delete") + " " + strings._("reminder") + f" '{reminder.text}'?", - QMessageBox.Yes | QMessageBox.No, - QMessageBox.No, - ) - - if reply == QMessageBox.Yes: - self._db.delete_reminder(reminder.id) - self._load_reminders() - - -class ReminderWebHook: - def __init__(self, text): - self.text = text - self.cfg = load_db_config() - - def _send(self): - payload: dict[str, str] = { - "reminder": self.text, - } - - url = self.cfg.reminders_webhook_url - secret = self.cfg.reminders_webhook_secret - - _headers = {} - if secret: - _headers["X-Bouquin-Secret"] = secret - - if url: - try: - requests.post( - url, - json=payload, - timeout=10, - headers=_headers, - ) - except Exception: - # We did our best - pass diff --git a/bouquin/save_dialog.py b/bouquin/save_dialog.py index 528896b..27feeaf 100644 --- a/bouquin/save_dialog.py +++ b/bouquin/save_dialog.py @@ -2,39 +2,33 @@ from __future__ import annotations import datetime -from PySide6.QtGui import QFontMetrics -from PySide6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QLineEdit, QVBoxLayout - -from . import strings +from PySide6.QtWidgets import ( + QDialog, + QVBoxLayout, + QLabel, + QLineEdit, + QDialogButtonBox, +) class SaveDialog(QDialog): def __init__( self, parent=None, + title: str = "Enter a name for this version", + message: str = "Enter a name for this version?", ): """ Used for explicitly saving a new version of a page. """ super().__init__(parent) - - self.setWindowTitle(strings._("enter_a_name_for_this_version")) - + self.setWindowTitle(title) v = QVBoxLayout(self) - v.addWidget(QLabel(strings._("enter_a_name_for_this_version"))) - + v.addWidget(QLabel(message)) self.note = QLineEdit() now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") - text = strings._("new_version_i_saved_at") + f" {now}" - self.note.setText(text) + self.note.setText(f"New version I saved at {now}") v.addWidget(self.note) - - # make dialog wide enough for the line edit text - fm = QFontMetrics(self.note.font()) - text_width = fm.horizontalAdvance(text) + 20 - self.note.setMinimumWidth(text_width) - self.adjustSize() - bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) bb.accepted.connect(self.accept) bb.rejected.connect(self.reject) diff --git a/bouquin/search.py b/bouquin/search.py index 7dd7f7f..71329c0 100644 --- a/bouquin/search.py +++ b/bouquin/search.py @@ -6,19 +6,17 @@ from typing import Iterable, Tuple from PySide6.QtCore import Qt, Signal from PySide6.QtWidgets import ( QFrame, - QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem, QSizePolicy, + QHBoxLayout, QVBoxLayout, QWidget, ) -from . import strings - -Row = Tuple[str, str, str, str, str | None] +Row = Tuple[str, str] class Search(QWidget): @@ -32,7 +30,7 @@ class Search(QWidget): self._db = db self.search = QLineEdit() - self.search.setPlaceholderText(strings._("search_for_notes_here")) + self.search.setPlaceholderText("Search for notes here") self.search.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) self.search.textChanged.connect(self._search) @@ -52,27 +50,9 @@ class Search(QWidget): lay.addWidget(self.results) def _open_selected(self, item: QListWidgetItem): - data = item.data(Qt.ItemDataRole.UserRole) - if not isinstance(data, dict): - return - - kind = data.get("kind") - if kind == "page": - date_iso = data.get("date") - if date_iso: - self.openDateRequested.emit(date_iso) - elif kind == "document": - doc_id = data.get("doc_id") - file_name = data.get("file_name") or "document" - if doc_id is None: - return - self._open_document(int(doc_id), file_name) - - def _open_document(self, doc_id: int, file_name: str) -> None: - """Open the selected document in the user's default app.""" - from bouquin.document_utils import open_document_from_db - - open_document_from_db(self._db, doc_id, file_name, parent_widget=self) + date_str = item.data(Qt.ItemDataRole.UserRole) + if date_str: + self.openDateRequested.emit(date_str) def _search(self, text: str): """ @@ -98,28 +78,28 @@ class Search(QWidget): self.resultDatesChanged.emit([]) # clear highlights return - # Only highlight calendar dates for page results - page_dates = sorted( - {key for (kind, key, _title, _text, _aux) in rows if kind == "page"} - ) - self.resultDatesChanged.emit(page_dates) + self.resultDatesChanged.emit(sorted({d for d, _ in rows})) self.results.show() - for kind, key, title, text, aux in rows: - # Build an HTML fragment around the match - frag_html = self._make_html_snippet(text, query, radius=30, maxlen=90) - + for date_str, content in rows: + # Build an HTML fragment around the match and whether to show ellipses + frag_html = self._make_html_snippet(content, query, radius=30, maxlen=90) + # ---- Per-item widget: date on top, preview row below (with ellipses) ---- container = QWidget() outer = QVBoxLayout(container) - outer.setContentsMargins(0, 0, 0, 0) + outer.setContentsMargins(8, 6, 8, 6) outer.setSpacing(2) - # ---- Heading (date for pages, "Document" for docs) ---- - heading = QLabel(title) - heading.setStyleSheet("font-weight:bold;") - outer.addWidget(heading) + # Date label (plain text) + date_lbl = QLabel() + date_lbl.setTextFormat(Qt.TextFormat.RichText) + date_lbl.setText(f"

{date_str}

") + date_f = date_lbl.font() + date_f.setPointSizeF(date_f.pointSizeF() + 1) + date_lbl.setFont(date_f) + outer.addWidget(date_lbl) - # ---- Preview row ---- + # Preview row with optional ellipses row = QWidget() h = QHBoxLayout(row) h.setContentsMargins(0, 0, 0, 0) @@ -135,9 +115,9 @@ class Search(QWidget): else "(no preview)" ) h.addWidget(preview, 1) + outer.addWidget(row) - # Separator line line = QFrame() line.setFrameShape(QFrame.HLine) line.setFrameShadow(QFrame.Sunken) @@ -145,22 +125,9 @@ class Search(QWidget): # ---- Add to list ---- item = QListWidgetItem() - if kind == "page": - item.setData( - Qt.ItemDataRole.UserRole, - {"kind": "page", "date": key}, - ) - else: # document - item.setData( - Qt.ItemDataRole.UserRole, - { - "kind": "document", - "doc_id": int(key), - "file_name": aux or "", - }, - ) - + item.setData(Qt.ItemDataRole.UserRole, date_str) item.setSizeHint(container.sizeHint()) + self.results.addItem(item) self.results.setItemWidget(item, container) diff --git a/bouquin/settings.py b/bouquin/settings.py index fde863d..b21835c 100644 --- a/bouquin/settings.py +++ b/bouquin/settings.py @@ -1,7 +1,6 @@ from __future__ import annotations from pathlib import Path - from PySide6.QtCore import QSettings, QStandardPaths from .db import DBConfig @@ -14,79 +13,27 @@ def get_settings() -> QSettings: return QSettings(APP_ORG, APP_NAME) -def _default_db_location() -> Path: - """Where we put the notebook if nothing has been configured yet.""" - base = Path(QStandardPaths.writableLocation(QStandardPaths.AppDataLocation)) - base.mkdir(parents=True, exist_ok=True) - return base / "notebook.db" - - def load_db_config() -> DBConfig: s = get_settings() + default_db_path = str( + Path(QStandardPaths.writableLocation(QStandardPaths.AppDataLocation)) + / "notebook.db" + ) - # --- DB Path ------------------------------------------------------- - # Prefer the new key; fall back to the legacy one. - path_str = s.value("db/default_db", "", type=str) - if not path_str: - legacy = s.value("db/path", "", type=str) - if legacy: - path_str = legacy - # migrate and clean up the old key - s.setValue("db/default_db", legacy) - s.remove("db/path") - path = Path(path_str) if path_str else _default_db_location() - - # --- Other settings ------------------------------------------------ + path = Path(s.value("db/path", default_db_path)) key = s.value("db/key", "") - idle = s.value("ui/idle_minutes", 15, type=int) theme = s.value("ui/theme", "system", type=str) move_todos = s.value("ui/move_todos", False, type=bool) - move_todos_include_weekends = s.value( - "ui/move_todos_include_weekends", False, type=bool - ) - tags = s.value("ui/tags", True, type=bool) - time_log = s.value("ui/time_log", True, type=bool) - reminders = s.value("ui/reminders", True, type=bool) - reminders_webhook_url = s.value("ui/reminders_webhook_url", None, type=str) - reminders_webhook_secret = s.value("ui/reminders_webhook_secret", None, type=str) - documents = s.value("ui/documents", True, type=bool) - invoicing = s.value("ui/invoicing", False, type=bool) - locale = s.value("ui/locale", "en", type=str) - font_size = s.value("ui/font_size", 11, type=int) return DBConfig( - path=path, - key=key, - idle_minutes=idle, - theme=theme, - move_todos=move_todos, - move_todos_include_weekends=move_todos_include_weekends, - tags=tags, - time_log=time_log, - reminders=reminders, - reminders_webhook_url=reminders_webhook_url, - reminders_webhook_secret=reminders_webhook_secret, - documents=documents, - invoicing=invoicing, - locale=locale, - font_size=font_size, + path=path, key=key, idle_minutes=idle, theme=theme, move_todos=move_todos ) def save_db_config(cfg: DBConfig) -> None: s = get_settings() - s.setValue("db/default_db", str(cfg.path)) + s.setValue("db/path", str(cfg.path)) s.setValue("db/key", str(cfg.key)) s.setValue("ui/idle_minutes", str(cfg.idle_minutes)) s.setValue("ui/theme", str(cfg.theme)) s.setValue("ui/move_todos", str(cfg.move_todos)) - s.setValue("ui/move_todos_include_weekends", str(cfg.move_todos_include_weekends)) - s.setValue("ui/tags", str(cfg.tags)) - s.setValue("ui/time_log", str(cfg.time_log)) - s.setValue("ui/reminders", str(cfg.reminders)) - s.setValue("ui/reminders_webhook_url", str(cfg.reminders_webhook_url)) - s.setValue("ui/reminders_webhook_secret", str(cfg.reminders_webhook_secret)) - s.setValue("ui/documents", str(cfg.documents)) - s.setValue("ui/invoicing", str(cfg.invoicing)) - s.setValue("ui/locale", str(cfg.locale)) - s.setValue("ui/font_size", str(cfg.font_size)) diff --git a/bouquin/settings_dialog.py b/bouquin/settings_dialog.py index bec0627..3091e14 100644 --- a/bouquin/settings_dialog.py +++ b/bouquin/settings_dialog.py @@ -2,94 +2,60 @@ from __future__ import annotations from pathlib import Path -from PySide6.QtCore import Qt, Slot -from PySide6.QtGui import QPalette from PySide6.QtWidgets import ( QCheckBox, - QComboBox, QDialog, - QDialogButtonBox, - QFileDialog, QFormLayout, QFrame, QGroupBox, - QHBoxLayout, QLabel, + QHBoxLayout, + QVBoxLayout, + QWidget, QLineEdit, - QMessageBox, QPushButton, + QFileDialog, + QDialogButtonBox, QRadioButton, QSizePolicy, QSpinBox, - QTabWidget, - QTextEdit, - QToolButton, - QVBoxLayout, - QWidget, + QMessageBox, ) +from PySide6.QtCore import Qt, Slot +from PySide6.QtGui import QPalette + -from . import strings from .db import DBConfig, DBManager -from .key_prompt import KeyPrompt from .settings import load_db_config, save_db_config from .theme import Theme +from .key_prompt import KeyPrompt class SettingsDialog(QDialog): def __init__(self, cfg: DBConfig, db: DBManager, parent=None): super().__init__(parent) - self.setWindowTitle(strings._("settings")) + self.setWindowTitle("Settings") self._cfg = DBConfig(path=cfg.path, key="") self._db = db self.key = "" - self.current_settings = load_db_config() - - self.setMinimumWidth(600) + form = QFormLayout() + form.setFieldGrowthPolicy(QFormLayout.ExpandingFieldsGrow) + self.setMinimumWidth(560) self.setSizeGripEnabled(True) - # --- Tabs ---------------------------------------------------------- - tabs = QTabWidget() - tabs.setTabPosition(QTabWidget.North) - tabs.setDocumentMode(True) - tabs.setMovable(False) + current_settings = load_db_config() - tabs.addTab(self._create_appearance_page(cfg), strings._("appearance")) - tabs.addTab(self._create_features_page(), strings._("features")) - tabs.addTab(self._create_security_page(cfg), strings._("security")) - tabs.addTab(self._create_database_page(), strings._("database")) - - # --- Buttons ------------------------------------------------------- - bb = QDialogButtonBox(QDialogButtonBox.Save | QDialogButtonBox.Cancel) - bb.accepted.connect(self._save) - bb.rejected.connect(self.reject) - - # Root layout - root = QVBoxLayout(self) - root.setContentsMargins(12, 12, 12, 12) - root.setSpacing(8) - root.addWidget(tabs) - root.addWidget(bb, 0, Qt.AlignRight) - - # ------------------------------------------------------------------ # - # Pages - # ------------------------------------------------------------------ # - - def _create_appearance_page(self, cfg: DBConfig) -> QWidget: - page = QWidget() - layout = QVBoxLayout(page) - layout.setContentsMargins(12, 12, 12, 12) - layout.setSpacing(12) - - # --- Theme group -------------------------------------------------- - theme_group = QGroupBox(strings._("theme")) + # Add theme selection + theme_group = QGroupBox("Theme") theme_layout = QVBoxLayout(theme_group) - self.theme_system = QRadioButton(strings._("system")) - self.theme_light = QRadioButton(strings._("light")) - self.theme_dark = QRadioButton(strings._("dark")) + self.theme_system = QRadioButton("System") + self.theme_light = QRadioButton("Light") + self.theme_dark = QRadioButton("Dark") - current_theme = self.current_settings.theme + # Load current theme from settings + current_theme = current_settings.theme if current_theme == Theme.DARK.value: self.theme_dark.setChecked(True) elif current_theme == Theme.LIGHT.value: @@ -101,271 +67,63 @@ class SettingsDialog(QDialog): theme_layout.addWidget(self.theme_light) theme_layout.addWidget(self.theme_dark) - # font size row - font_row = QHBoxLayout() - self.font_heading = QLabel(strings._("font_size")) - self.font_size = QSpinBox() - self.font_size.setRange(1, 24) - self.font_size.setSingleStep(1) - self.font_size.setAccelerated(True) - self.font_size.setValue(getattr(cfg, "font_size", 11)) - font_row.addWidget(self.font_heading) - font_row.addWidget(self.font_size) - font_row.addStretch() - theme_layout.addLayout(font_row) + form.addRow(theme_group) - # explanation - self.font_size_label = QLabel(strings._("font_size_explanation")) - self.font_size_label.setWordWrap(True) - self.font_size_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) - pal = self.font_size_label.palette() - self.font_size_label.setForegroundRole(QPalette.PlaceholderText) - self.font_size_label.setPalette(pal) - - font_exp_row = QHBoxLayout() - font_exp_row.setContentsMargins(24, 0, 0, 0) - font_exp_row.addWidget(self.font_size_label) - theme_layout.addLayout(font_exp_row) - - layout.addWidget(theme_group) - - # --- Locale group ------------------------------------------------- - locale_group = QGroupBox(strings._("locale")) - locale_layout = QVBoxLayout(locale_group) - - self.locale_combobox = QComboBox() - self.locale_combobox.addItems(strings._AVAILABLE) - self.locale_combobox.setCurrentText(self.current_settings.locale) - locale_layout.addWidget(self.locale_combobox, 0, Qt.AlignLeft) - - self.locale_label = QLabel(strings._("locale_restart")) - self.locale_label.setWordWrap(True) - self.locale_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) - lpal = self.locale_label.palette() - self.locale_label.setForegroundRole(QPalette.PlaceholderText) - self.locale_label.setPalette(lpal) - loc_row = QHBoxLayout() - loc_row.setContentsMargins(24, 0, 0, 0) - loc_row.addWidget(self.locale_label) - locale_layout.addLayout(loc_row) - - layout.addWidget(locale_group) - layout.addStretch() - return page - - def _create_features_page(self) -> QWidget: - page = QWidget() - layout = QVBoxLayout(page) - layout.setContentsMargins(12, 12, 12, 12) - layout.setSpacing(12) - - features_group = QGroupBox(strings._("features")) - features_layout = QVBoxLayout(features_group) + # Add Behaviour + behaviour_group = QGroupBox("Behaviour") + behaviour_layout = QVBoxLayout(behaviour_group) self.move_todos = QCheckBox( - strings._("move_unchecked_todos_to_today_on_startup") + "Move yesterday's unchecked TODOs to today on startup" ) - self.move_todos.setChecked(self.current_settings.move_todos) + self.move_todos.setChecked(current_settings.move_todos) self.move_todos.setCursor(Qt.PointingHandCursor) - features_layout.addWidget(self.move_todos) - # Optional: allow moving to the very next day even if it is a weekend. - self.move_todos_include_weekends = QCheckBox( - strings._("move_todos_include_weekends") - ) - self.move_todos_include_weekends.setChecked( - getattr(self.current_settings, "move_todos_include_weekends", False) - ) - self.move_todos_include_weekends.setCursor(Qt.PointingHandCursor) - self.move_todos_include_weekends.setEnabled(self.move_todos.isChecked()) + behaviour_layout.addWidget(self.move_todos) + form.addRow(behaviour_group) - move_todos_opts = QWidget() - move_todos_opts_layout = QVBoxLayout(move_todos_opts) - move_todos_opts_layout.setContentsMargins(24, 0, 0, 0) - move_todos_opts_layout.setSpacing(4) - move_todos_opts_layout.addWidget(self.move_todos_include_weekends) - features_layout.addWidget(move_todos_opts) + self.path_edit = QLineEdit(str(self._cfg.path)) + self.path_edit.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + browse_btn = QPushButton("Browse…") + browse_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) + browse_btn.clicked.connect(self._browse) + path_row = QWidget() + h = QHBoxLayout(path_row) + h.setContentsMargins(0, 0, 0, 0) + h.addWidget(self.path_edit, 1) + h.addWidget(browse_btn, 0) + h.setStretch(0, 1) + h.setStretch(1, 0) + form.addRow("Database path", path_row) - self.move_todos.toggled.connect(self.move_todos_include_weekends.setEnabled) - - self.tags = QCheckBox(strings._("enable_tags_feature")) - self.tags.setChecked(self.current_settings.tags) - self.tags.setCursor(Qt.PointingHandCursor) - features_layout.addWidget(self.tags) - - self.time_log = QCheckBox(strings._("enable_time_log_feature")) - self.time_log.setChecked(self.current_settings.time_log) - self.time_log.setCursor(Qt.PointingHandCursor) - features_layout.addWidget(self.time_log) - - self.invoicing = QCheckBox(strings._("enable_invoicing_feature")) - invoicing_enabled = getattr(self.current_settings, "invoicing", False) - self.invoicing.setChecked(invoicing_enabled and self.current_settings.time_log) - self.invoicing.setCursor(Qt.PointingHandCursor) - features_layout.addWidget(self.invoicing) - # Invoicing only if time_log is enabled - if not self.current_settings.time_log: - self.invoicing.setChecked(False) - self.invoicing.setEnabled(False) - self.time_log.toggled.connect(self._on_time_log_toggled) - - # --- Reminders feature + webhook options ------------------------- - self.reminders = QCheckBox(strings._("enable_reminders_feature")) - self.reminders.setChecked(self.current_settings.reminders) - self.reminders.toggled.connect(self._on_reminders_toggled) - self.reminders.setCursor(Qt.PointingHandCursor) - features_layout.addWidget(self.reminders) - - # Container for reminder-specific options, indented under the checkbox - self.reminders_options_container = QWidget() - reminders_options_layout = QVBoxLayout(self.reminders_options_container) - reminders_options_layout.setContentsMargins(24, 0, 0, 0) - reminders_options_layout.setSpacing(4) - - self.reminders_options_toggle = QToolButton() - self.reminders_options_toggle.setText( - strings._("reminders_webhook_section_title") - ) - self.reminders_options_toggle.setCheckable(True) - self.reminders_options_toggle.setChecked(False) - self.reminders_options_toggle.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - self.reminders_options_toggle.setArrowType(Qt.RightArrow) - self.reminders_options_toggle.clicked.connect( - self._on_reminders_options_toggled - ) - - toggle_row = QHBoxLayout() - toggle_row.addWidget(self.reminders_options_toggle) - toggle_row.addStretch() - reminders_options_layout.addLayout(toggle_row) - - # Actual options (labels + QLineEdits) - self.reminders_options_widget = QWidget() - options_form = QFormLayout(self.reminders_options_widget) - options_form.setContentsMargins(0, 0, 0, 0) - options_form.setSpacing(4) - - self.reminders_webhook_url = QLineEdit( - self.current_settings.reminders_webhook_url or "" - ) - self.reminders_webhook_secret = QLineEdit( - self.current_settings.reminders_webhook_secret or "" - ) - self.reminders_webhook_secret.setEchoMode(QLineEdit.Password) - - options_form.addRow( - strings._("reminders_webhook_url_label") + ":", - self.reminders_webhook_url, - ) - options_form.addRow( - strings._("reminders_webhook_secret_label") + ":", - self.reminders_webhook_secret, - ) - - reminders_options_layout.addWidget(self.reminders_options_widget) - - features_layout.addWidget(self.reminders_options_container) - - self.reminders_options_container.setVisible(self.reminders.isChecked()) - self.reminders_options_widget.setVisible(False) - - self.documents = QCheckBox(strings._("enable_documents_feature")) - self.documents.setChecked(self.current_settings.documents) - self.documents.setCursor(Qt.PointingHandCursor) - features_layout.addWidget(self.documents) - - layout.addWidget(features_group) - - # --- Invoicing / company profile section ------------------------- - self.invoicing_group = QGroupBox(strings._("invoice_company_profile")) - invoicing_layout = QFormLayout(self.invoicing_group) - - profile = self._db.get_company_profile() or ( - None, - None, - None, - None, - None, - None, - None, - ) - name, address, phone, email, tax_id, payment_details, logo_bytes = profile - - self.company_name_edit = QLineEdit(name or "") - self.company_address_edit = QTextEdit(address or "") - self.company_phone_edit = QLineEdit(phone or "") - self.company_email_edit = QLineEdit(email or "") - self.company_tax_id_edit = QLineEdit(tax_id or "") - self.company_payment_details_edit = QTextEdit() - self.company_payment_details_edit.setPlainText(payment_details or "") - - invoicing_layout.addRow( - strings._("invoice_company_name") + ":", self.company_name_edit - ) - invoicing_layout.addRow( - strings._("invoice_company_address") + ":", self.company_address_edit - ) - invoicing_layout.addRow( - strings._("invoice_company_phone") + ":", self.company_phone_edit - ) - invoicing_layout.addRow( - strings._("invoice_company_email") + ":", self.company_email_edit - ) - invoicing_layout.addRow( - strings._("invoice_company_tax_id") + ":", self.company_tax_id_edit - ) - invoicing_layout.addRow( - strings._("invoice_company_payment_details") + ":", - self.company_payment_details_edit, - ) - - # Logo picker - store bytes on self._logo_bytes - self._logo_bytes = logo_bytes - logo_row = QHBoxLayout() - self.logo_label = QLabel(strings._("invoice_company_logo_not_set")) - if logo_bytes: - self.logo_label.setText(strings._("invoice_company_logo_set")) - logo_btn = QPushButton(strings._("invoice_company_logo_choose")) - logo_btn.clicked.connect(self._on_choose_logo) - logo_row.addWidget(self.logo_label) - logo_row.addWidget(logo_btn) - invoicing_layout.addRow(strings._("invoice_company_logo") + ":", logo_row) - - # Show/hide this whole block based on invoicing checkbox - self.invoicing_group.setVisible(self.invoicing.isChecked()) - self.invoicing.toggled.connect(self.invoicing_group.setVisible) - - layout.addWidget(self.invoicing_group) - - layout.addStretch() - return page - - def _create_security_page(self, cfg: DBConfig) -> QWidget: - page = QWidget() - layout = QVBoxLayout(page) - layout.setContentsMargins(12, 12, 12, 12) - layout.setSpacing(12) - - # --- Encryption group --------------------------------------------- - enc_group = QGroupBox(strings._("encryption")) + # Encryption settings + enc_group = QGroupBox("Encryption") enc = QVBoxLayout(enc_group) + enc.setContentsMargins(12, 8, 12, 12) + enc.setSpacing(6) - self.save_key_btn = QCheckBox(strings._("remember_key")) - self.key = self.current_settings.key or "" + # Checkbox to remember key + self.save_key_btn = QCheckBox("Remember key") + self.key = current_settings.key or "" self.save_key_btn.setChecked(bool(self.key)) self.save_key_btn.setCursor(Qt.PointingHandCursor) self.save_key_btn.toggled.connect(self._save_key_btn_clicked) enc.addWidget(self.save_key_btn, 0, Qt.AlignLeft) - self.save_key_label = QLabel(strings._("save_key_warning")) + # Explanation for remembering key + self.save_key_label = QLabel( + "If you don't want to be prompted for your encryption key, check this to remember it. " + "WARNING: the key is saved to disk and could be recoverable if your disk is compromised." + ) self.save_key_label.setWordWrap(True) self.save_key_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) + # make it look secondary pal = self.save_key_label.palette() self.save_key_label.setForegroundRole(QPalette.PlaceholderText) self.save_key_label.setPalette(pal) exp_row = QHBoxLayout() - exp_row.setContentsMargins(24, 0, 0, 0) + exp_row.setContentsMargins(24, 0, 0, 0) # indent to line up under the checkbox exp_row.addWidget(self.save_key_label) enc.addLayout(exp_row) @@ -374,59 +132,68 @@ class SettingsDialog(QDialog): line.setFrameShadow(QFrame.Sunken) enc.addWidget(line) - self.rekey_btn = QPushButton(strings._("change_encryption_key")) + # Change key button + self.rekey_btn = QPushButton("Change encryption key") self.rekey_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) self.rekey_btn.clicked.connect(self._change_key) + enc.addWidget(self.rekey_btn, 0, Qt.AlignLeft) - layout.addWidget(enc_group) + form.addRow(enc_group) - # --- Idle lock group ---------------------------------------------- - priv_group = QGroupBox(strings._("lock_screen_when_idle")) + # Privacy settings + priv_group = QGroupBox("Lock screen when idle") priv = QVBoxLayout(priv_group) + priv.setContentsMargins(12, 8, 12, 12) + priv.setSpacing(6) self.idle_spin = QSpinBox() self.idle_spin.setRange(0, 240) self.idle_spin.setSingleStep(1) self.idle_spin.setAccelerated(True) self.idle_spin.setSuffix(" min") - self.idle_spin.setSpecialValueText(strings._("never")) + self.idle_spin.setSpecialValueText("Never") self.idle_spin.setValue(getattr(cfg, "idle_minutes", 15)) priv.addWidget(self.idle_spin, 0, Qt.AlignLeft) - - self.idle_spin_label = QLabel(strings._("autolock_explanation")) + # Explanation for idle option (autolock) + self.idle_spin_label = QLabel( + "Bouquin will automatically lock the notepad after this length of time, " + "after which you'll need to re-enter the key to unlock it. " + "Set to 0 (never) to never lock." + ) self.idle_spin_label.setWordWrap(True) self.idle_spin_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) + # make it look secondary spal = self.idle_spin_label.palette() self.idle_spin_label.setForegroundRole(QPalette.PlaceholderText) self.idle_spin_label.setPalette(spal) spin_row = QHBoxLayout() - spin_row.setContentsMargins(24, 0, 0, 0) + spin_row.setContentsMargins(24, 0, 0, 0) # indent to line up under the spinbox spin_row.addWidget(self.idle_spin_label) priv.addLayout(spin_row) - layout.addWidget(priv_group) - layout.addStretch() - return page + form.addRow(priv_group) - def _create_database_page(self) -> QWidget: - page = QWidget() - layout = QVBoxLayout(page) - layout.setContentsMargins(12, 12, 12, 12) - layout.setSpacing(12) - - maint_group = QGroupBox(strings._("database_maintenance")) + # Maintenance settings + maint_group = QGroupBox("Database maintenance") maint = QVBoxLayout(maint_group) + maint.setContentsMargins(12, 8, 12, 12) + maint.setSpacing(6) - self.compact_btn = QPushButton(strings._("database_compact")) + self.compact_btn = QPushButton("Compact database") self.compact_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) self.compact_btn.clicked.connect(self._compact_btn_clicked) + maint.addWidget(self.compact_btn, 0, Qt.AlignLeft) - self.compact_label = QLabel(strings._("database_compact_explanation")) + # Explanation for compating button + self.compact_label = QLabel( + "Compacting runs VACUUM on the database. This can help reduce its size." + ) self.compact_label.setWordWrap(True) self.compact_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) + # make it look secondary cpal = self.compact_label.palette() self.compact_label.setForegroundRole(QPalette.PlaceholderText) self.compact_label.setPalette(cpal) @@ -436,15 +203,32 @@ class SettingsDialog(QDialog): maint_row.addWidget(self.compact_label) maint.addLayout(maint_row) - layout.addWidget(maint_group) - layout.addStretch() - return page + form.addRow(maint_group) - # ------------------------------------------------------------------ # - # Save settings - # ------------------------------------------------------------------ # + # Buttons + bb = QDialogButtonBox(QDialogButtonBox.Save | QDialogButtonBox.Cancel) + bb.accepted.connect(self._save) + bb.rejected.connect(self.reject) + + # Root layout (adjust margins/spacing a bit) + v = QVBoxLayout(self) + v.setContentsMargins(12, 12, 12, 12) + v.setSpacing(10) + v.addLayout(form) + v.addWidget(bb, 0, Qt.AlignRight) + + def _browse(self): + p, _ = QFileDialog.getSaveFileName( + self, + "Choose database file", + self.path_edit.text(), + "DB Files (*.db);;All Files (*)", + ) + if p: + self.path_edit.setText(p) def _save(self): + # Save the selected theme into QSettings if self.theme_dark.isChecked(): selected_theme = Theme.DARK elif self.theme_light.isChecked(): @@ -455,131 +239,39 @@ class SettingsDialog(QDialog): key_to_save = self.key if self.save_key_btn.isChecked() else "" self._cfg = DBConfig( - path=Path(self.current_settings.path), + path=Path(self.path_edit.text()), key=key_to_save, idle_minutes=self.idle_spin.value(), theme=selected_theme.value, move_todos=self.move_todos.isChecked(), - move_todos_include_weekends=self.move_todos_include_weekends.isChecked(), - tags=self.tags.isChecked(), - time_log=self.time_log.isChecked(), - reminders=self.reminders.isChecked(), - reminders_webhook_url=self.reminders_webhook_url.text().strip() or None, - reminders_webhook_secret=self.reminders_webhook_secret.text().strip() - or None, - documents=self.documents.isChecked(), - invoicing=( - self.invoicing.isChecked() if self.time_log.isChecked() else False - ), - locale=self.locale_combobox.currentText(), - font_size=self.font_size.value(), ) save_db_config(self._cfg) - - # Save company profile only if invoicing is enabled - if self.invoicing.isChecked() and self.time_log.isChecked(): - self._db.save_company_profile( - name=self.company_name_edit.text().strip() or None, - address=self.company_address_edit.toPlainText().strip() or None, - phone=self.company_phone_edit.text().strip() or None, - email=self.company_email_edit.text().strip() or None, - tax_id=self.company_tax_id_edit.text().strip() or None, - payment_details=self.company_payment_details_edit.toPlainText().strip() - or None, - logo=getattr(self, "_logo_bytes", None), - ) - self.parent().themes.set(selected_theme) self.accept() - def _on_reminders_options_toggled(self, checked: bool) -> None: - """ - Expand/collapse the advanced reminders options (webhook URL/secret). - """ - if checked: - self.reminders_options_toggle.setArrowType(Qt.DownArrow) - self.reminders_options_widget.show() - else: - self.reminders_options_toggle.setArrowType(Qt.RightArrow) - self.reminders_options_widget.hide() - - def _on_reminders_toggled(self, checked: bool) -> None: - """ - Conditionally show reminder webhook options depending - on if the reminders feature is toggled on or off. - """ - if hasattr(self, "reminders_options_container"): - self.reminders_options_container.setVisible(checked) - - # When turning reminders off, also collapse the section - if not checked and hasattr(self, "reminders_options_toggle"): - self.reminders_options_toggle.setChecked(False) - self._on_reminders_options_toggled(False) - - def _on_time_log_toggled(self, checked: bool) -> None: - """ - Enforce 'invoicing depends on time logging'. - """ - if not checked: - # Turn off + disable invoicing if time logging is disabled - self.invoicing.setChecked(False) - self.invoicing.setEnabled(False) - else: - # Let the user enable invoicing when time logging is enabled - self.invoicing.setEnabled(True) - - def _on_choose_logo(self) -> None: - path, _ = QFileDialog.getOpenFileName( - self, - strings._("company_logo_choose"), - "", - "Images (*.png *.jpg *.jpeg *.bmp)", - ) - if not path: - return - - try: - with open(path, "rb") as f: - self._logo_bytes = f.read() - self.logo_label.setText(Path(path).name) - except OSError as exc: - QMessageBox.warning(self, strings._("error"), str(exc)) - def _change_key(self): - p1 = KeyPrompt( - self, - title=strings._("change_encryption_key"), - message=strings._("enter_a_new_encryption_key"), - ) + p1 = KeyPrompt(self, title="Change key", message="Enter a new encryption key") if p1.exec() != QDialog.Accepted: return new_key = p1.key() - p2 = KeyPrompt( - self, - title=strings._("change_encryption_key"), - message=strings._("reenter_the_new_key"), - ) + p2 = KeyPrompt(self, title="Change key", message="Re-enter the new key") if p2.exec() != QDialog.Accepted: return if new_key != p2.key(): - QMessageBox.warning( - self, strings._("key_mismatch"), strings._("key_mismatch_explanation") - ) + QMessageBox.warning(self, "Key mismatch", "The two entries did not match.") return if not new_key: - QMessageBox.warning( - self, strings._("empty_key"), strings._("empty_key_explanation") - ) + QMessageBox.warning(self, "Empty key", "Key cannot be empty.") return try: self.key = new_key self._db.rekey(new_key) QMessageBox.information( - self, strings._("key_changed"), strings._("key_changed_explanation") + self, "Key changed", "The notebook was re-encrypted with the new key!" ) except Exception as e: - QMessageBox.critical(self, strings._("error"), str(e)) + QMessageBox.critical(self, "Error", e) @Slot(bool) def _save_key_btn_clicked(self, checked: bool): @@ -587,9 +279,7 @@ class SettingsDialog(QDialog): if checked: if not self.key: p1 = KeyPrompt( - self, - title=strings._("unlock_encrypted_notebook_explanation"), - message=strings._("unlock_encrypted_notebook_explanation"), + self, title="Enter your key", message="Enter the encryption key" ) if p1.exec() != QDialog.Accepted: self.save_key_btn.blockSignals(True) @@ -602,11 +292,9 @@ class SettingsDialog(QDialog): def _compact_btn_clicked(self): try: self._db.compact() - QMessageBox.information( - self, strings._("success"), strings._("database_compacted_successfully") - ) + QMessageBox.information(self, "Success", "Database compacted successfully!") except Exception as e: - QMessageBox.critical(self, strings._("error"), str(e)) + QMessageBox.critical(self, "Error", e) @property def config(self) -> DBConfig: diff --git a/bouquin/statistics_dialog.py b/bouquin/statistics_dialog.py deleted file mode 100644 index 5f58767..0000000 --- a/bouquin/statistics_dialog.py +++ /dev/null @@ -1,543 +0,0 @@ -from __future__ import annotations - -import datetime as _dt -from typing import Dict - -from PySide6.QtCore import QSize, Qt, Signal -from PySide6.QtGui import QBrush, QColor, QPainter, QPen -from PySide6.QtWidgets import ( - QComboBox, - QDialog, - QFormLayout, - QGroupBox, - QHBoxLayout, - QLabel, - QScrollArea, - QSizePolicy, - QVBoxLayout, - QWidget, -) - -from . import strings -from .db import DBManager -from .settings import load_db_config - -# ---------- Activity heatmap ---------- - - -class DateHeatmap(QWidget): - """ - Small calendar heatmap for activity by date. - - Data is a mapping: datetime.date -> integer value. - """ - - date_clicked = Signal(_dt.date) - - def __init__(self, parent=None): - super().__init__(parent) - self._data: Dict[_dt.date, int] = {} - self._start: _dt.date | None = None - self._end: _dt.date | None = None - self._max_value: int = 0 - - self._cell = 12 - self._gap = 3 - self._margin_left = 30 - self._margin_top = 10 - self._margin_bottom = 24 - self._margin_right = 10 - - self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) - - def set_data(self, data: Dict[_dt.date, int]) -> None: - """Replace dataset and recompute layout.""" - self._data = {k: int(v) for k, v in (data or {}).items() if v is not None} - if not self._data: - self._start = self._end = None - self._max_value = 0 - else: - earliest = min(self._data.keys()) - latest = max(self._data.keys()) - self._start = earliest - _dt.timedelta(days=earliest.weekday()) - self._end = latest - self._max_value = max(self._data.values()) if self._data else 0 - - self.updateGeometry() - self.update() - - # QWidget overrides --------------------------------------------------- - - def sizeHint(self) -> QSize: - if not self._start or not self._end: - height = ( - self._margin_top + self._margin_bottom + 7 * (self._cell + self._gap) - ) - # some default width - width = ( - self._margin_left + self._margin_right + 20 * (self._cell + self._gap) - ) - return QSize(width, height) - - day_count = (self._end - self._start).days + 1 - weeks = (day_count + 6) // 7 # ceil - - width = ( - self._margin_left - + self._margin_right - + weeks * (self._cell + self._gap) - + self._gap - ) - height = ( - self._margin_top - + self._margin_bottom - + 7 * (self._cell + self._gap) - + self._gap - ) - return QSize(width, height) - - def minimumSizeHint(self) -> QSize: - sz = self.sizeHint() - return QSize(min(380, sz.width()), sz.height()) - - def paintEvent(self, event): - super().paintEvent(event) - painter = QPainter(self) - painter.setRenderHint(QPainter.Antialiasing, True) - - if not self._start or not self._end: - return - - palette = self.palette() - bg_no_data = palette.base().color() - active = palette.highlight().color() - - painter.setPen(QPen(Qt.NoPen)) - - day_count = (self._end - self._start).days + 1 - weeks = (day_count + 6) // 7 - - for week in range(weeks): - for dow in range(7): - idx = week * 7 + dow - date = self._start + _dt.timedelta(days=idx) - if date > self._end: - value = 0 - else: - value = self._data.get(date, 0) - - x = self._margin_left + week * (self._cell + self._gap) - y = self._margin_top + dow * (self._cell + self._gap) - - if value <= 0 or self._max_value <= 0: - color = bg_no_data - else: - ratio = max(0.1, min(1.0, value / float(self._max_value))) - color = QColor(active) - # Lighter for low values, darker for high values - lighten = 150 - int(50 * ratio) # 150 ≈ light, 100 ≈ original - color = color.lighter(lighten) - - painter.fillRect( - x, - y, - self._cell, - self._cell, - QBrush(color), - ) - - painter.setPen(palette.text().color()) - fm = painter.fontMetrics() - - # --- weekday labels on left ------------------------------------- - # Python's weekday(): Monday=0 ... Sunday=6 - weekday_labels = ["M", "T", "W", "T", "F", "S", "S"] - - for dow in range(7): - label = weekday_labels[dow] - text_width = fm.horizontalAdvance(label) - - # Center text vertically in the cell - y_center = ( - self._margin_top + dow * (self._cell + self._gap) + self._cell / 2 - ) - baseline_y = int(y_center + fm.ascent() / 2 - fm.descent() / 2) - - # Right-align text just to the left of the first column - x = self._margin_left - self._gap - 2 - text_width - - painter.drawText(x, baseline_y, label) - - prev_month = None - for week in range(weeks): - date = self._start + _dt.timedelta(days=week * 7) - if date > self._end: # pragma: no cover - break - - if prev_month == date.month: - continue - prev_month = date.month - - label = date.strftime("%b") - - x_center = ( - self._margin_left + week * (self._cell + self._gap) + self._cell / 2 - ) - y = self._margin_top + 7 * (self._cell + self._gap) + fm.ascent() - - text_width = fm.horizontalAdvance(label) - painter.drawText( - int(x_center - text_width / 2), - int(y), - label, - ) - - painter.end() - - def mousePressEvent(self, event): - if event.button() != Qt.LeftButton: - return super().mousePressEvent(event) - - # No data = nothing to click - if not self._start or not self._end: - return - - # Qt6: position(), older: pos() - pos = event.position() if hasattr(event, "position") else event.pos() - x = pos.x() - y = pos.y() - - # Outside grid area (left of weekday labels or above rows) - if x < self._margin_left or y < self._margin_top: - return - - cell_span = self._cell + self._gap - col = int((x - self._margin_left) // cell_span) # week index - row = int((y - self._margin_top) // cell_span) # dow (0..6) - - # Only 7 rows (Mon-Sun) - if not (0 <= row < 7): - return - - # Only as many weeks as we actually have - day_count = (self._end - self._start).days + 1 - weeks = (day_count + 6) // 7 - if col < 0 or col >= weeks: - return - - idx = col * 7 + row - date = self._start + _dt.timedelta(days=idx) - - # Skip trailing empty cells beyond the last date - if date > self._end: - return - - self.date_clicked.emit(date) - - -# ---------- Statistics dialog itself ---------- - - -class StatisticsDialog(QDialog): - """ - Shows aggregate statistics and the date heatmap with a metric switcher. - """ - - def __init__(self, db: DBManager, parent=None): - super().__init__(parent) - self._db = db - - self.setWindowTitle(strings._("statistics")) - self.setMinimumWidth(650) - self.setMinimumHeight(650) - - root = QVBoxLayout(self) - - ( - pages_with_content, - total_revisions, - page_most_revisions, - page_most_revisions_count, - words_by_date, - total_words, - unique_tags, - page_most_tags, - page_most_tags_count, - revisions_by_date, - time_minutes_by_date, - total_time_minutes, - day_most_time, - day_most_time_minutes, - project_most_minutes_name, - project_most_minutes, - activity_most_minutes_name, - activity_most_minutes, - reminders_by_date, - total_reminders, - day_most_reminders, - day_most_reminders_count, - ) = self._gather_stats() - - self.cfg = load_db_config() - - # Optional: per-date document counts for the heatmap. - documents_by_date: Dict[_dt.date, int] = {} - total_documents = 0 - date_most_documents: _dt.date | None = None - date_most_documents_count = 0 - - if self.cfg.documents: - try: - documents_by_date = self._db.documents_by_date() or {} - except Exception: - documents_by_date = {} - - if documents_by_date: - total_documents = sum(documents_by_date.values()) - # Choose the date with the highest count, tie-breaking by earliest date. - date_most_documents, date_most_documents_count = sorted( - documents_by_date.items(), - key=lambda item: (-item[1], item[0]), - )[0] - - # For the heatmap - self._documents_by_date = documents_by_date - self._time_by_date = time_minutes_by_date - self._reminders_by_date = reminders_by_date - self._words_by_date = words_by_date - self._revisions_by_date = revisions_by_date - - # ------------------------------------------------------------------ - # Feature groups - # ------------------------------------------------------------------ - - # --- Pages / words / revisions ----------------------------------- - pages_group = QGroupBox(strings._("stats_group_pages")) - pages_form = QFormLayout(pages_group) - - pages_form.addRow( - strings._("stats_pages_with_content"), - QLabel(str(pages_with_content)), - ) - pages_form.addRow( - strings._("stats_total_revisions"), - QLabel(str(total_revisions)), - ) - - if page_most_revisions: - pages_form.addRow( - strings._("stats_page_most_revisions"), - QLabel(f"{page_most_revisions} ({page_most_revisions_count})"), - ) - else: - pages_form.addRow( - strings._("stats_page_most_revisions"), - QLabel("—"), - ) - - pages_form.addRow( - strings._("stats_total_words"), - QLabel(str(total_words)), - ) - - root.addWidget(pages_group) - - # --- Tags --------------------------------------------------------- - if self.cfg.tags: - tags_group = QGroupBox(strings._("stats_group_tags")) - tags_form = QFormLayout(tags_group) - - tags_form.addRow( - strings._("stats_unique_tags"), - QLabel(str(unique_tags)), - ) - - if page_most_tags: - tags_form.addRow( - strings._("stats_page_most_tags"), - QLabel(f"{page_most_tags} ({page_most_tags_count})"), - ) - else: - tags_form.addRow( - strings._("stats_page_most_tags"), - QLabel("—"), - ) - - root.addWidget(tags_group) - - # --- Documents ---------------------------------------------------- - if self.cfg.documents: - docs_group = QGroupBox(strings._("stats_group_documents")) - docs_form = QFormLayout(docs_group) - - docs_form.addRow( - strings._("stats_total_documents"), - QLabel(str(total_documents)), - ) - - if date_most_documents: - doc_most_label = ( - f"{date_most_documents.isoformat()} ({date_most_documents_count})" - ) - else: - doc_most_label = "—" - - docs_form.addRow( - strings._("stats_date_most_documents"), - QLabel(doc_most_label), - ) - - root.addWidget(docs_group) - - # --- Time logging ------------------------------------------------- - if self.cfg.time_log: - time_group = QGroupBox(strings._("stats_group_time_logging")) - time_form = QFormLayout(time_group) - - total_hours = total_time_minutes / 60.0 if total_time_minutes else 0.0 - time_form.addRow( - strings._("stats_time_total_hours"), - QLabel(f"{total_hours:.2f}h"), - ) - - if day_most_time: - day_hours = ( - day_most_time_minutes / 60.0 if day_most_time_minutes else 0.0 - ) - day_label = f"{day_most_time} ({day_hours:.2f}h)" - else: - day_label = "—" - time_form.addRow( - strings._("stats_time_day_most_hours"), - QLabel(day_label), - ) - - if project_most_minutes_name: - proj_hours = ( - project_most_minutes / 60.0 if project_most_minutes else 0.0 - ) - proj_label = f"{project_most_minutes_name} ({proj_hours:.2f}h)" - else: - proj_label = "—" - time_form.addRow( - strings._("stats_time_project_most_hours"), - QLabel(proj_label), - ) - - if activity_most_minutes_name: - act_hours = ( - activity_most_minutes / 60.0 if activity_most_minutes else 0.0 - ) - act_label = f"{activity_most_minutes_name} ({act_hours:.2f}h)" - else: - act_label = "—" - time_form.addRow( - strings._("stats_time_activity_most_hours"), - QLabel(act_label), - ) - - root.addWidget(time_group) - - # --- Reminders ---------------------------------------------------- - if self.cfg.reminders: - rem_group = QGroupBox(strings._("stats_group_reminders")) - rem_form = QFormLayout(rem_group) - - rem_form.addRow( - strings._("stats_total_reminders"), - QLabel(str(total_reminders)), - ) - - if day_most_reminders: - rem_label = f"{day_most_reminders} ({day_most_reminders_count})" - else: - rem_label = "—" - - rem_form.addRow( - strings._("stats_date_most_reminders"), - QLabel(rem_label), - ) - - root.addWidget(rem_group) - - # ------------------------------------------------------------------ - # Heatmap with metric switcher - # ------------------------------------------------------------------ - if ( - words_by_date - or revisions_by_date - or documents_by_date - or time_minutes_by_date - or reminders_by_date - ): - group = QGroupBox(strings._("stats_activity_heatmap")) - group_layout = QVBoxLayout(group) - - # Metric selector - combo_row = QHBoxLayout() - combo_row.addWidget(QLabel(strings._("stats_heatmap_metric"))) - self.metric_combo = QComboBox() - self.metric_combo.addItem(strings._("stats_metric_words"), "words") - self.metric_combo.addItem( - strings._("stats_metric_revisions"), - "revisions", - ) - if documents_by_date: - self.metric_combo.addItem( - strings._("stats_metric_documents"), - "documents", - ) - if self.cfg.time_log and time_minutes_by_date: - self.metric_combo.addItem( - strings._("stats_metric_hours"), - "hours", - ) - if self.cfg.reminders and reminders_by_date: - self.metric_combo.addItem( - strings._("stats_metric_reminders"), - "reminders", - ) - combo_row.addWidget(self.metric_combo) - combo_row.addStretch(1) - group_layout.addLayout(combo_row) - - self._heatmap = DateHeatmap() - - scroll = QScrollArea() - scroll.setWidgetResizable(True) - scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) - scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - scroll.setWidget(self._heatmap) - group_layout.addWidget(scroll) - - root.addWidget(group) - - # Default to "words" - self._apply_metric("words") - self.metric_combo.currentIndexChanged.connect(self._on_metric_changed) - else: - root.addWidget(QLabel(strings._("stats_no_data"))) - - self.resize(self.sizeHint().width(), self.sizeHint().height()) - - # ---------- internal helpers ---------- - - def _apply_metric(self, metric: str) -> None: - if metric == "revisions": - self._heatmap.set_data(self._revisions_by_date) - elif metric == "documents": - self._heatmap.set_data(self._documents_by_date) - elif metric == "hours": - self._heatmap.set_data(self._time_by_date) - elif metric == "reminders": - self._heatmap.set_data(self._reminders_by_date) - else: - self._heatmap.set_data(self._words_by_date) - - def _on_metric_changed(self, index: int) -> None: - metric = self.metric_combo.currentData() - if metric: - self._apply_metric(metric) - - def _gather_stats(self): - return self._db.gather_stats() diff --git a/bouquin/strings.py b/bouquin/strings.py deleted file mode 100644 index 71e838b..0000000 --- a/bouquin/strings.py +++ /dev/null @@ -1,39 +0,0 @@ -import json -from importlib.resources import files - -# Get list of locales -root = files("bouquin") / "locales" -_AVAILABLE = tuple( - entry.stem - for entry in root.iterdir() - if entry.is_file() and entry.suffix == ".json" -) - -_DEFAULT = "en" - -strings = {} -translations = {} - - -def load_strings(current_locale: str) -> None: - global strings, translations - translations = {} - - # read in the locales json - for loc in _AVAILABLE: - data = (root / f"{loc}.json").read_text(encoding="utf-8") - translations[loc] = json.loads(data) - - if current_locale not in translations: - current_locale = _DEFAULT - - base = translations[_DEFAULT] - cur = translations.get(current_locale, {}) - strings = {k: (cur.get(k) or base[k]) for k in base} - - -def translated(k: str) -> str: - return strings.get(k, k) - - -_ = translated diff --git a/bouquin/tag_browser.py b/bouquin/tag_browser.py deleted file mode 100644 index 210f7d3..0000000 --- a/bouquin/tag_browser.py +++ /dev/null @@ -1,293 +0,0 @@ -from PySide6.QtCore import Qt, Signal -from PySide6.QtGui import QColor -from PySide6.QtWidgets import ( - QColorDialog, - QDialog, - QHBoxLayout, - QInputDialog, - QLabel, - QMessageBox, - QPushButton, - QTreeWidget, - QTreeWidgetItem, - QVBoxLayout, -) -from sqlcipher3.dbapi2 import IntegrityError - -from . import strings -from .db import DBManager -from .settings import load_db_config - - -class TagBrowserDialog(QDialog): - openDateRequested = Signal(str) - tagsModified = Signal() - - def __init__(self, db: DBManager, parent=None, focus_tag: str | None = None): - super().__init__(parent) - self._db = db - self.cfg = load_db_config() - self.setWindowTitle( - strings._("tag_browser_title") + " / " + strings._("manage_tags") - ) - self.resize(600, 500) - - layout = QVBoxLayout(self) - - # Instructions - instructions = QLabel(strings._("tag_browser_instructions")) - instructions.setWordWrap(True) - layout.addWidget(instructions) - - self.tree = QTreeWidget() - if not self.cfg.documents: - self.tree.setHeaderLabels( - [strings._("tag"), strings._("color_hex"), strings._("date")] - ) - else: - self.tree.setHeaderLabels( - [ - strings._("tag"), - strings._("color_hex"), - strings._("page_or_document"), - ] - ) - self.tree.setColumnWidth(0, 200) - self.tree.setColumnWidth(1, 100) - self.tree.itemActivated.connect(self._on_item_activated) - self.tree.itemClicked.connect(self._on_item_clicked) - self.tree.setSortingEnabled(True) - self.tree.sortByColumn(0, Qt.AscendingOrder) - layout.addWidget(self.tree) - - # Tag management buttons - btn_row = QHBoxLayout() - - self.add_tag_btn = QPushButton("&" + strings._("add_a_tag")) - self.add_tag_btn.clicked.connect(self._add_a_tag) - btn_row.addWidget(self.add_tag_btn) - - self.edit_name_btn = QPushButton("&" + strings._("edit_tag_name")) - self.edit_name_btn.clicked.connect(self._edit_tag_name) - self.edit_name_btn.setEnabled(False) - btn_row.addWidget(self.edit_name_btn) - - self.change_color_btn = QPushButton("&" + strings._("change_color")) - self.change_color_btn.clicked.connect(self._change_tag_color) - self.change_color_btn.setEnabled(False) - btn_row.addWidget(self.change_color_btn) - - self.delete_btn = QPushButton("&" + strings._("delete_tag")) - self.delete_btn.clicked.connect(self._delete_tag) - self.delete_btn.setEnabled(False) - btn_row.addWidget(self.delete_btn) - - btn_row.addStretch(1) - layout.addLayout(btn_row) - - # Close button - close_row = QHBoxLayout() - close_row.addStretch(1) - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - close_row.addWidget(close_btn) - layout.addLayout(close_row) - - self._populate(focus_tag) - - def _populate(self, focus_tag: str | None): - # Disable sorting during population for better performance - was_sorting = self.tree.isSortingEnabled() - self.tree.setSortingEnabled(False) - self.tree.clear() - tags = self._db.list_tags() - focus_item = None - - for tag_id, name, color in tags: - # Create the tree item - root = QTreeWidgetItem([name, "", ""]) - root.setData( - 0, - Qt.ItemDataRole.UserRole, - {"type": "tag", "id": tag_id, "name": name, "color": color}, - ) - - # Set background color for the second column to show the tag color - bg_color = QColor(color) - root.setBackground(1, bg_color) - - # Calculate luminance and set contrasting text color - # Using relative luminance formula (ITU-R BT.709) - luminance = ( - 0.2126 * bg_color.red() - + 0.7152 * bg_color.green() - + 0.0722 * bg_color.blue() - ) / 255.0 - text_color = QColor(0, 0, 0) if luminance > 0.5 else QColor(255, 255, 255) - root.setForeground(1, text_color) - root.setText(1, color) # Also show the hex code - root.setTextAlignment(1, Qt.AlignCenter) - - self.tree.addTopLevelItem(root) - - # Pages with this tag - pages = self._db.get_pages_for_tag(name) - for date_iso, _content in pages: - child = QTreeWidgetItem(["", "", date_iso]) - child.setData( - 0, Qt.ItemDataRole.UserRole, {"type": "page", "date": date_iso} - ) - root.addChild(child) - - # Documents with this tag - if self.cfg.documents: - docs = self._db.get_documents_for_tag(name) - for doc_id, project_name, file_name in docs: - label = file_name - if project_name: - label = f"{file_name} ({project_name})" - child = QTreeWidgetItem(["", "", label]) - child.setData( - 0, - Qt.ItemDataRole.UserRole, - {"type": "document", "id": doc_id}, - ) - root.addChild(child) - - if focus_tag and name.lower() == focus_tag.lower(): - focus_item = root - - if focus_item: - self.tree.expandItem(focus_item) - self.tree.setCurrentItem(focus_item) - - # Re-enable sorting after population - self.tree.setSortingEnabled(was_sorting) - - def _on_item_clicked(self, item: QTreeWidgetItem, column: int): - """Enable/disable buttons based on selection""" - data = item.data(0, Qt.ItemDataRole.UserRole) - if isinstance(data, dict): - if data.get("type") == "tag": - self.edit_name_btn.setEnabled(True) - self.change_color_btn.setEnabled(True) - self.delete_btn.setEnabled(True) - else: - self.edit_name_btn.setEnabled(False) - self.change_color_btn.setEnabled(False) - self.delete_btn.setEnabled(False) - - def _on_item_activated(self, item: QTreeWidgetItem, column: int): - data = item.data(0, Qt.ItemDataRole.UserRole) - if isinstance(data, dict): - item_type = data.get("type") - - if item_type == "page": - date_iso = data.get("date") - if date_iso: - self.openDateRequested.emit(date_iso) - self.accept() - - elif item_type == "document": - doc_id = data.get("id") - if doc_id is not None: - self._open_document(int(doc_id), str(data.get("file_name"))) - - def _open_document(self, doc_id: int, file_name: str) -> None: - """Open a tagged document from the list.""" - from bouquin.document_utils import open_document_from_db - - open_document_from_db(self._db, doc_id, file_name, parent_widget=self) - - def _add_a_tag(self): - """Add a new tag""" - - new_name, ok = QInputDialog.getText( - self, strings._("add_a_tag"), strings._("new_tag_name"), text="" - ) - - if ok and new_name: - color = QColorDialog.getColor(QColor(), self) - if color.isValid(): - try: - self._db.add_tag(new_name, color.name()) - self._populate(None) - self.tagsModified.emit() - except IntegrityError as e: - QMessageBox.critical(self, strings._("db_database_error"), str(e)) - - def _edit_tag_name(self): - """Edit the name of the selected tag""" - item = self.tree.currentItem() - if not item: - return - - data = item.data(0, Qt.ItemDataRole.UserRole) - if not isinstance(data, dict) or data.get("type") != "tag": - return - - tag_id = data["id"] - old_name = data["name"] - color = data["color"] - - new_name, ok = QInputDialog.getText( - self, strings._("edit_tag_name"), strings._("new_tag_name"), text=old_name - ) - - if ok and new_name and new_name != old_name: - try: - self._db.update_tag(tag_id, new_name, color) - self._populate(None) - self.tagsModified.emit() - except IntegrityError as e: - QMessageBox.critical(self, strings._("db_database_error"), str(e)) - - def _change_tag_color(self): - """Change the color of the selected tag""" - item = self.tree.currentItem() - if not item: - return - - data = item.data(0, Qt.ItemDataRole.UserRole) - if not isinstance(data, dict) or data.get("type") != "tag": - return - - tag_id = data["id"] - name = data["name"] - current_color = data["color"] - - color = QColorDialog.getColor(QColor(current_color), self) - if color.isValid(): - try: - self._db.update_tag(tag_id, name, color.name()) - self._populate(None) - self.tagsModified.emit() - except IntegrityError as e: - QMessageBox.critical(self, strings._("db_database_error"), str(e)) - - def _delete_tag(self): - """Delete the selected tag""" - item = self.tree.currentItem() - if not item: - return - - data = item.data(0, Qt.ItemDataRole.UserRole) - if not isinstance(data, dict) or data.get("type") != "tag": - return - - tag_id = data["id"] - name = data["name"] - - # Confirm deletion - reply = QMessageBox.question( - self, - strings._("delete_tag"), - strings._("delete_tag_confirm").format(name=name), - QMessageBox.Yes | QMessageBox.No, - QMessageBox.No, - ) - - if reply == QMessageBox.Yes: - self._db.delete_tag(tag_id) - self._populate(None) - self.tagsModified.emit() diff --git a/bouquin/tags_widget.py b/bouquin/tags_widget.py deleted file mode 100644 index 7ac4ad4..0000000 --- a/bouquin/tags_widget.py +++ /dev/null @@ -1,259 +0,0 @@ -from __future__ import annotations - -from typing import Optional - -from PySide6.QtCore import Qt, Signal -from PySide6.QtWidgets import ( - QCompleter, - QFrame, - QHBoxLayout, - QLabel, - QLineEdit, - QSizePolicy, - QStyle, - QToolButton, - QVBoxLayout, - QWidget, -) - -from . import strings -from .db import DBManager -from .flow_layout import FlowLayout - - -class TagChip(QFrame): - removeRequested = Signal(int) # tag_id - clicked = Signal(str) # tag name - - def __init__( - self, - tag_id: int, - name: str, - color: str, - parent: QWidget | None = None, - show_remove: bool = True, - ): - super().__init__(parent) - self._id = tag_id - self._name = name - - self.setObjectName("TagChip") - - self.setFrameShape(QFrame.StyledPanel) - self.setFrameShadow(QFrame.Raised) - - layout = QHBoxLayout(self) - layout.setContentsMargins(4, 2, 4, 2) - layout.setSpacing(4) - - color_lbl = QLabel() - color_lbl.setFixedSize(10, 10) - color_lbl.setStyleSheet(f"background-color: {color}; border-radius: 5px;") - layout.addWidget(color_lbl) - - name_lbl = QLabel(name) - layout.addWidget(name_lbl) - - if show_remove: - btn = QToolButton() - btn.setText("×") - btn.setAutoRaise(True) - btn.clicked.connect(lambda: self.removeRequested.emit(self._id)) - layout.addWidget(btn) - - self.setCursor(Qt.PointingHandCursor) - - @property - def tag_id(self) -> int: - return self._id - - def mouseReleaseEvent(self, ev): - if ev.button() == Qt.LeftButton: - self.clicked.emit(self._name) - try: - super().mouseReleaseEvent(ev) - except RuntimeError: - pass - - -class PageTagsWidget(QFrame): - """ - Collapsible per-page tag editor shown in the left sidebar. - Now displays tag chips even when collapsed. - """ - - tagActivated = Signal(str) # tag name - tagAdded = Signal() # emitted when a tag is added to trigger autosave - - def __init__(self, db: DBManager, parent: QWidget | None = None): - super().__init__(parent) - self._db = db - self._current_date: Optional[str] = None - - self.setFrameShape(QFrame.StyledPanel) - self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) - - # Header (toggle + manage button) - self.toggle_btn = QToolButton() - self.toggle_btn.setText(strings._("tags")) - self.toggle_btn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - self.toggle_btn.setCheckable(True) - self.toggle_btn.setChecked(False) - self.toggle_btn.setArrowType(Qt.RightArrow) - self.toggle_btn.clicked.connect(self._on_toggle) - - self.manage_btn = QToolButton() - self.manage_btn.setIcon( - self.style().standardIcon(QStyle.SP_FileDialogDetailedView) - ) - self.manage_btn.setToolTip(strings._("manage_tags")) - self.manage_btn.setAutoRaise(True) - self.manage_btn.clicked.connect(self._open_manager) - - header = QHBoxLayout() - header.setContentsMargins(0, 0, 0, 0) - header.addWidget(self.toggle_btn) - header.addStretch(1) - header.addWidget(self.manage_btn) - - # Body (chips + add line - only visible when expanded) - self.body = QWidget() - self.body_layout = QVBoxLayout(self.body) - self.body_layout.setContentsMargins(0, 4, 0, 0) - self.body_layout.setSpacing(4) - - # Chips container - self.chip_container = QWidget() - self.chip_layout = FlowLayout(self.chip_container, hspacing=4, vspacing=4) - self.body_layout.addWidget(self.chip_container) - - self.add_edit = QLineEdit() - self.add_edit.setPlaceholderText(strings._("add_tag_placeholder")) - self.add_edit.returnPressed.connect(self._on_add_tag) - - # Setup autocomplete - self._setup_autocomplete() - - self.body_layout.addWidget(self.add_edit) - self.body.setVisible(False) - - main = QVBoxLayout(self) - main.setContentsMargins(0, 0, 0, 0) - main.addLayout(header) - main.addWidget(self.body) - - # ----- external API ------------------------------------------------ - - def set_current_date(self, date_iso: str) -> None: - self._current_date = date_iso - # Only reload tags if expanded - if self.toggle_btn.isChecked(): - self._reload_tags() - else: - self._clear_chips() # Clear chips when collapsed - self._setup_autocomplete() # Update autocomplete with all available tags - - # ----- internals --------------------------------------------------- - - def _setup_autocomplete(self) -> None: - """Setup autocomplete for the tag input with all existing tags""" - all_tags = [name for _, name, _ in self._db.list_tags()] - completer = QCompleter(all_tags, self.add_edit) - completer.setCaseSensitivity(Qt.CaseInsensitive) - self.add_edit.setCompleter(completer) - - def _on_toggle(self, checked: bool) -> None: - self.body.setVisible(checked) - self.toggle_btn.setArrowType(Qt.DownArrow if checked else Qt.RightArrow) - if checked: - if self._current_date: - self._reload_tags() - self.add_edit.setFocus() - - def _clear_chips(self) -> None: - while self.chip_layout.count(): - item = self.chip_layout.takeAt(0) - w = item.widget() - if w is not None: - w.deleteLater() - - def _reload_tags(self) -> None: - if not self._current_date: - self._clear_chips() - return - - self._clear_chips() - tags = self._db.get_tags_for_page(self._current_date) - for tag_id, name, color in tags: - # Always show remove button since chips only visible when expanded - chip = TagChip(tag_id, name, color, self, show_remove=True) - chip.removeRequested.connect(self._remove_tag) - chip.clicked.connect(self._on_chip_clicked) - self.chip_layout.addWidget(chip) - chip.show() - chip.adjustSize() - - # Force complete layout recalculation - self.chip_layout.invalidate() - self.chip_layout.activate() - self.chip_container.updateGeometry() - self.updateGeometry() - # Process pending events to ensure layout is applied - from PySide6.QtCore import QCoreApplication - - QCoreApplication.processEvents() - - def _on_add_tag(self) -> None: - if not self._current_date: - return - - # If the completer popup is visible and user pressed Enter, - # the completer will handle it - don't process it again - if self.add_edit.completer() and self.add_edit.completer().popup().isVisible(): - return - - new_tag = self.add_edit.text().strip() - if not new_tag: - return - - # Get existing tags for current page - existing = [ - name for _, name, _ in self._db.get_tags_for_page(self._current_date) - ] - - # Check for duplicates (case-insensitive) - if any(tag.lower() == new_tag.lower() for tag in existing): - self.add_edit.clear() - return - - existing.append(new_tag) - self._db.set_tags_for_page(self._current_date, existing) - - self.add_edit.clear() - self._reload_tags() - self._setup_autocomplete() # Update autocomplete list - - # Signal that a tag was added so main window can trigger autosave - self.tagAdded.emit() - - def _remove_tag(self, tag_id: int) -> None: - if not self._current_date: - return - tags = self._db.get_tags_for_page(self._current_date) - remaining = [name for (tid, name, _color) in tags if tid != tag_id] - self._db.set_tags_for_page(self._current_date, remaining) - self._reload_tags() - - def _open_manager(self) -> None: - from .tag_browser import TagBrowserDialog - - dlg = TagBrowserDialog(self._db, self) - dlg.openDateRequested.connect(lambda date_iso: self.tagActivated.emit(date_iso)) - if dlg.exec(): - # Reload tags after manager closes to pick up any changes - if self._current_date: - self._reload_tags() - self._setup_autocomplete() - - def _on_chip_clicked(self, name: str) -> None: - self.tagActivated.emit(name) diff --git a/bouquin/theme.py b/bouquin/theme.py index 87b77f9..3846398 100644 --- a/bouquin/theme.py +++ b/bouquin/theme.py @@ -1,12 +1,10 @@ from __future__ import annotations - from dataclasses import dataclass from enum import Enum -from weakref import WeakSet - -from PySide6.QtCore import QObject, Qt, Signal -from PySide6.QtGui import QColor, QGuiApplication, QPalette, QTextCharFormat +from PySide6.QtGui import QPalette, QColor, QGuiApplication from PySide6.QtWidgets import QApplication, QCalendarWidget, QWidget +from PySide6.QtCore import QObject, Signal +from weakref import WeakSet class Theme(Enum): @@ -176,14 +174,6 @@ class ThemeManager(QObject): cal.setPalette(app_pal) cal.setStyleSheet("") - # --- Normalise weekend colours on *all* themed calendars ------------- - # Qt's default is red for weekends; we want them to match normal text. - weekday_color = app_pal.windowText().color() - weekend_fmt = QTextCharFormat() - weekend_fmt.setForeground(weekday_color) - cal.setWeekdayTextFormat(Qt.Saturday, weekend_fmt) - cal.setWeekdayTextFormat(Qt.Sunday, weekend_fmt) - cal.update() def _calendar_qss(self, highlight_css: str) -> str: @@ -214,7 +204,7 @@ class ThemeManager(QObject): ) if is_dark: - # Use the link color as the accent + # Use the link color as the accent (you set this to ORANGE in dark palette) accent = pal.color(QPalette.Link) r, g, b = accent.red(), accent.green(), accent.blue() accent_hex = accent.name() diff --git a/bouquin/time_log.py b/bouquin/time_log.py deleted file mode 100644 index 05d7e98..0000000 --- a/bouquin/time_log.py +++ /dev/null @@ -1,1689 +0,0 @@ -from __future__ import annotations - -import csv -import html -from collections import defaultdict -from datetime import datetime -from typing import Optional - -from PySide6.QtCore import QDate, Qt, QUrl, Signal -from PySide6.QtGui import QColor, QImage, QPageLayout, QPainter, QTextDocument -from PySide6.QtPrintSupport import QPrinter -from PySide6.QtWidgets import ( - QAbstractItemView, - QCalendarWidget, - QComboBox, - QCompleter, - QDateEdit, - QDialog, - QDialogButtonBox, - QDoubleSpinBox, - QFileDialog, - QFormLayout, - QFrame, - QHBoxLayout, - QHeaderView, - QInputDialog, - QLabel, - QLineEdit, - QListWidget, - QListWidgetItem, - QMessageBox, - QPushButton, - QSizePolicy, - QStyle, - QTableWidget, - QTableWidgetItem, - QTabWidget, - QToolButton, - QVBoxLayout, - QWidget, -) -from sqlcipher3.dbapi2 import IntegrityError - -from . import strings -from .db import DBManager -from .settings import load_db_config -from .theme import ThemeManager - - -class TimeLogWidget(QFrame): - """ - Collapsible per-page time log summary + button to open the full dialog. - Shown in the left sidebar above the Tags widget. - """ - - remindersChanged = Signal() - - def __init__( - self, - db: DBManager, - themes: ThemeManager | None = None, - parent: QWidget | None = None, - ): - super().__init__(parent) - self._db = db - self.cfg = load_db_config() - self._themes = themes - self._current_date: Optional[str] = None - - self.setFrameShape(QFrame.StyledPanel) - self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) - - # Header (toggle + open dialog button) - self.toggle_btn = QToolButton() - self.toggle_btn.setText(strings._("time_log")) - self.toggle_btn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) - self.toggle_btn.setCheckable(True) - self.toggle_btn.setChecked(False) - self.toggle_btn.setArrowType(Qt.RightArrow) - self.toggle_btn.clicked.connect(self._on_toggle) - - self.log_btn = QToolButton() - self.log_btn.setText("➕") - self.log_btn.setToolTip(strings._("add_time_entry")) - self.log_btn.setAutoRaise(True) - self.log_btn.clicked.connect(self._open_dialog_log_only) - - self.report_btn = QToolButton() - self.report_btn.setText("📈") - self.report_btn.setAutoRaise(True) - self.report_btn.clicked.connect(self._on_run_report) - if self.cfg.invoicing: - self.report_btn.setToolTip(strings._("reporting_and_invoicing")) - else: - self.report_btn.setToolTip(strings._("reporting")) - - self.open_btn = QToolButton() - self.open_btn.setIcon( - self.style().standardIcon(QStyle.SP_FileDialogDetailedView) - ) - self.open_btn.setToolTip(strings._("open_time_log")) - self.open_btn.setAutoRaise(True) - self.open_btn.clicked.connect(self._open_dialog) - - header = QHBoxLayout() - header.setContentsMargins(0, 0, 0, 0) - header.addWidget(self.toggle_btn) - header.addStretch(1) - header.addWidget(self.log_btn) - header.addWidget(self.report_btn) - header.addWidget(self.open_btn) - - # Body: simple summary label for the day - self.body = QWidget() - self.body_layout = QVBoxLayout(self.body) - self.body_layout.setContentsMargins(0, 4, 0, 0) - self.body_layout.setSpacing(4) - - self.summary_label = QLabel(strings._("time_log_no_entries")) - self.summary_label.setWordWrap(True) - self.body_layout.addWidget(self.summary_label) - # Optional embedded Pomodoro timer widget lives underneath the summary. - self._pomodoro_widget: Optional[QWidget] = None - self.body.setVisible(False) - - main = QVBoxLayout(self) - main.setContentsMargins(0, 0, 0, 0) - main.addLayout(header) - main.addWidget(self.body) - - # ----- external API ------------------------------------------------ - - def set_current_date(self, date_iso: str) -> None: - self._current_date = date_iso - self._reload_summary() - if not self.toggle_btn.isChecked(): - self.summary_label.setText(strings._("time_log_collapsed_hint")) - - def show_pomodoro_widget(self, widget: QWidget) -> None: - """Embed Pomodoro timer widget in the body area.""" - if self._pomodoro_widget is not None: - self.body_layout.removeWidget(self._pomodoro_widget) - self._pomodoro_widget.deleteLater() - - self._pomodoro_widget = widget - self.body_layout.addWidget(widget) - widget.show() - - # Ensure the body is visible so the timer is obvious - self.body.setVisible(True) - self.toggle_btn.setChecked(True) - self.toggle_btn.setArrowType(Qt.DownArrow) - - def clear_pomodoro_widget(self) -> None: - """Remove any embedded Pomodoro timer widget.""" - if self._pomodoro_widget is None: - return - - self.body_layout.removeWidget(self._pomodoro_widget) - self._pomodoro_widget.deleteLater() - self._pomodoro_widget = None - - # ----- internals --------------------------------------------------- - - def _on_run_report(self) -> None: - dlg = TimeReportDialog(self._db, self) - - # Bubble the remindersChanged signal further up - dlg.remindersChanged.connect(self.remindersChanged.emit) - - dlg.exec() - - def _on_toggle(self, checked: bool) -> None: - self.body.setVisible(checked) - self.toggle_btn.setArrowType(Qt.DownArrow if checked else Qt.RightArrow) - if checked and self._current_date: - self._reload_summary() - - def _update_title(self, total_hours: Optional[float]) -> None: - """Update the header text, optionally including total hours.""" - if total_hours is None: - self.toggle_btn.setText(strings._("time_log")) - else: - self.toggle_btn.setText( - strings._("time_log_with_total").format(hours=total_hours) - ) - - def _reload_summary(self) -> None: - if not self._current_date: - self._update_title(None) - self.summary_label.setText(strings._("time_log_no_date")) - return - - rows = self._db.time_log_for_date(self._current_date) - if not rows: - self._update_title(None) - self.summary_label.setText(strings._("time_log_no_entries")) - return - - total_minutes = sum(r[6] for r in rows) # index 6 = minutes - total_hours = total_minutes / 60.0 - - # Update header with running total (visible even when collapsed) - self._update_title(total_hours) - - # Per-project totals - per_project: dict[str, int] = {} - for _, _, _, project_name, *_rest in rows: - minutes = _rest[2] # activity_id, activity_name, minutes, note - per_project[project_name] = per_project.get(project_name, 0) + minutes - - lines = [strings._("time_log_total_hours").format(hours=total_hours)] - for pname, mins in sorted(per_project.items()): - lines.append(f"- {pname}: {mins/60:.2f}h") - - self.summary_label.setText("\n".join(lines)) - - def _open_dialog(self) -> None: - if not self._current_date: - return - - dlg = TimeLogDialog(self._db, self._current_date, self, themes=self._themes) - dlg.exec() - - # Always refresh summary + header totals - self._reload_summary() - - if not self.toggle_btn.isChecked(): - self.summary_label.setText(strings._("time_log_collapsed_hint")) - - def _open_dialog_log_only(self) -> None: - if not self._current_date: - return - - dlg = TimeLogDialog( - self._db, - self._current_date, - self, - True, - themes=self._themes, - close_after_add=True, - ) - dlg.exec() - - # Always refresh summary + header totals - self._reload_summary() - - if not self.toggle_btn.isChecked(): - self.summary_label.setText(strings._("time_log_collapsed_hint")) - - -class TimeLogDialog(QDialog): - """ - Per-day time log dialog. - """ - - def __init__( - self, - db: DBManager, - date_iso: str, - parent=None, - log_entry_only: bool | None = False, - themes: ThemeManager | None = None, - close_after_add: bool | None = False, - ): - super().__init__(parent) - self._db = db - self._themes = themes - self._date_iso = date_iso - self._current_entry_id: Optional[int] = None - self.cfg = load_db_config() - # Guard flag used when repopulating the table so we don't treat - # programmatic item changes as user edits. - self._reloading_entries: bool = False - - self.total_hours = 0 - - self.close_after_add = close_after_add - - self.setWindowTitle(strings._("for").format(date=date_iso)) - self.resize(900, 600) - - root = QVBoxLayout(self) - - # --- Top: date label + change-date button - date_row = QHBoxLayout() - - self.date_label = QLabel(strings._("date_label").format(date=date_iso)) - date_row.addWidget(self.date_label) - - date_row.addStretch(1) - - self.change_date_btn = QPushButton(strings._("change_date")) - self.change_date_btn.clicked.connect(self._on_change_date_clicked) - date_row.addWidget(self.change_date_btn) - - root.addLayout(date_row) - - # --- Project / activity / hours row - form = QFormLayout() - - # Project - proj_row = QHBoxLayout() - self.project_combo = QComboBox() - self.manage_projects_btn = QPushButton(strings._("manage_projects")) - self.manage_projects_btn.clicked.connect(self._manage_projects) - proj_row.addWidget(self.project_combo, 1) - proj_row.addWidget(self.manage_projects_btn) - form.addRow(strings._("project"), proj_row) - - # Activity (free text with autocomplete) - act_row = QHBoxLayout() - self.activity_edit = QLineEdit() - self.manage_activities_btn = QPushButton(strings._("manage_activities")) - self.manage_activities_btn.clicked.connect(self._manage_activities) - act_row.addWidget(self.activity_edit, 1) - act_row.addWidget(self.manage_activities_btn) - form.addRow(strings._("activity"), act_row) - - # Optional Note - note_row = QHBoxLayout() - self.note = QLineEdit() - note_row.addWidget(self.note, 1) - form.addRow(strings._("note"), note_row) - - # Hours (decimal) - self.hours_spin = QDoubleSpinBox() - self.hours_spin.setRange(0.0, 24.0) - self.hours_spin.setDecimals(2) - self.hours_spin.setSingleStep(0.25) - self.hours_spin.setValue(0.25) - form.addRow(strings._("hours"), self.hours_spin) - - root.addLayout(form) - - # --- Buttons for entry - btn_row = QHBoxLayout() - self.add_update_btn = QPushButton("&" + strings._("add_time_entry")) - self.add_update_btn.clicked.connect(self._on_add_or_update) - - self.delete_btn = QPushButton("&" + strings._("delete_time_entry")) - self.delete_btn.clicked.connect(self._on_delete_entry) - self.delete_btn.setEnabled(False) - - btn_row.addStretch(1) - btn_row.addWidget(self.add_update_btn) - btn_row.addWidget(self.delete_btn) - root.addLayout(btn_row) - - # --- Table of entries for this date - self.table = QTableWidget() - self.table.setColumnCount(5) - self.table.setHorizontalHeaderLabels( - [ - strings._("project"), - strings._("activity"), - strings._("note"), - strings._("hours"), - strings._("created_at"), - ] - ) - self.table.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode(2, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode( - 3, QHeaderView.ResizeToContents - ) - self.table.horizontalHeader().setSectionResizeMode(4, QHeaderView.Stretch) - self.table.setSelectionBehavior(QAbstractItemView.SelectRows) - self.table.setSelectionMode(QAbstractItemView.SingleSelection) - self.table.itemSelectionChanged.connect(self._on_row_selected) - # When a cell is edited inline, commit the change back to the DB. - self.table.itemChanged.connect(self._on_table_item_changed) - root.addWidget(self.table, 1) - - # --- Total time, Reporting and Close button - close_row = QHBoxLayout() - self.total_label = QLabel( - strings._("time_log_total_hours").format(hours=self.total_hours) - ) - if self.cfg.invoicing: - self.report_btn = QPushButton("&" + strings._("reporting_and_invoicing")) - else: - self.report_btn = QPushButton("&" + strings._("reporting")) - self.report_btn.clicked.connect(self._on_run_report) - - close_row.addWidget(self.total_label) - close_row.addWidget(self.report_btn) - close_row.addStretch(1) - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - close_row.addWidget(close_btn) - root.addLayout(close_row) - - # Init data - self._reload_projects() - self._reload_activities() - self._reload_entries() - - if log_entry_only: - self.delete_btn.hide() - self.report_btn.hide() - self.table.hide() - self.resize(self.sizeHint().width(), self.sizeHint().height()) - - # ----- Data loading ------------------------------------------------ - - def _reload_projects(self) -> None: - self.project_combo.clear() - for proj_id, name in self._db.list_projects(): - self.project_combo.addItem(name, proj_id) - - def _reload_activities(self) -> None: - activities = [name for _, name in self._db.list_activities()] - completer = QCompleter(activities, self.activity_edit) - completer.setCaseSensitivity(Qt.CaseInsensitive) - self.activity_edit.setCompleter(completer) - - def _reload_entries(self) -> None: - """Reload the table from the database. - - While we are repopulating the QTableWidget we temporarily disable the - itemChanged handler so that programmatic changes do not get written - back to the database. - """ - self._reloading_entries = True - try: - rows = self._db.time_log_for_date(self._date_iso) - self.table.setRowCount(len(rows)) - for row_idx, r in enumerate(rows): - entry_id = r[0] - project_name = r[3] - activity_name = r[5] - note = r[7] or "" - minutes = r[6] - hours = minutes / 60.0 - created_at = r[8] - ca_utc = datetime.fromisoformat(created_at.replace("Z", "+00:00")) - ca_local = ca_utc.astimezone() - created = f"{ca_local.day} {ca_local.strftime('%b %Y, %H:%M%p')}" - - item_proj = QTableWidgetItem(project_name) - item_act = QTableWidgetItem(activity_name) - item_note = QTableWidgetItem(note) - item_hours = QTableWidgetItem(f"{hours:.2f}") - item_created_at = QTableWidgetItem(created) - - # store the entry id on the first column - item_proj.setData(Qt.ItemDataRole.UserRole, entry_id) - - self.table.setItem(row_idx, 0, item_proj) - self.table.setItem(row_idx, 1, item_act) - self.table.setItem(row_idx, 2, item_note) - self.table.setItem(row_idx, 3, item_hours) - self.table.setItem(row_idx, 4, item_created_at) - finally: - self._reloading_entries = False - - total_minutes = sum(r[6] for r in rows) - self.total_hours = total_minutes / 60.0 - self.total_label.setText( - strings._("time_log_total_hours").format(hours=self.total_hours) - ) - - self._current_entry_id = None - self.delete_btn.setEnabled(False) - self.add_update_btn.setText("&" + strings._("add_time_entry")) - - # ----- Actions ----------------------------------------------------- - - def _on_change_date_clicked(self) -> None: - """Let the user choose a different date and reload entries.""" - - # Start from current dialog date; fall back to today if invalid - current_qdate = QDate.fromString(self._date_iso, Qt.ISODate) - if not current_qdate.isValid(): - current_qdate = QDate.currentDate() - - dlg = QDialog(self) - dlg.setWindowTitle(strings._("select_date_title")) - - layout = QVBoxLayout(dlg) - - calendar = QCalendarWidget(dlg) - calendar.setSelectedDate(current_qdate) - layout.addWidget(calendar) - # Apply the same theming as the main sidebar calendar - if self._themes is not None: - self._themes.register_calendar(calendar) - - buttons = QDialogButtonBox( - QDialogButtonBox.Ok | QDialogButtonBox.Cancel, parent=dlg - ) - buttons.accepted.connect(dlg.accept) - buttons.rejected.connect(dlg.reject) - layout.addWidget(buttons) - - if dlg.exec() != QDialog.Accepted: - return - - new_qdate = calendar.selectedDate() - new_iso = new_qdate.toString(Qt.ISODate) - if new_iso == self._date_iso: - # No change - return - - # Update state - self._date_iso = new_iso - - # Update window title and header label - self.setWindowTitle(strings._("for").format(date=new_iso)) - self.date_label.setText(strings._("date_label").format(date=new_iso)) - - # Reload entries for the newly selected date - self._reload_entries() - - def _ensure_project_id(self) -> Optional[int]: - """Get selected project_id from combo.""" - idx = self.project_combo.currentIndex() - if idx < 0: - return None - proj_id = self.project_combo.itemData(idx) - return int(proj_id) if proj_id is not None else None - - def _on_add_or_update(self) -> None: - proj_id = self._ensure_project_id() - if proj_id is None: - QMessageBox.warning( - self, - strings._("project_required_title"), - strings._("project_required_message"), - ) - return - - activity_name = self.activity_edit.text().strip() - if not activity_name: - QMessageBox.warning( - self, - strings._("activity_required_title"), - strings._("activity_required_message"), - ) - return - - note = self.note.text().strip() - if not note: - note = None - - hours = float(self.hours_spin.value()) - minutes = int(round(hours * 60)) - - # Create activity if needed - activity_id = self._db.add_activity(activity_name) - - if self._current_entry_id is None: - # New entry - self._db.add_time_log(self._date_iso, proj_id, activity_id, minutes, note) - else: - # Update existing - self._db.update_time_log( - self._current_entry_id, proj_id, activity_id, minutes, note - ) - - self._reload_entries() - if self.close_after_add: - self.close() - - def _on_row_selected(self) -> None: - items = self.table.selectedItems() - if not items: - self._current_entry_id = None - self.delete_btn.setEnabled(False) - self.add_update_btn.setText("&" + strings._("add_time_entry")) - return - - row = items[0].row() - proj_item = self.table.item(row, 0) - act_item = self.table.item(row, 1) - note_item = self.table.item(row, 2) - hours_item = self.table.item(row, 3) - entry_id = proj_item.data(Qt.ItemDataRole.UserRole) - - self._current_entry_id = int(entry_id) - self.delete_btn.setEnabled(True) - self.add_update_btn.setText("&" + strings._("update_time_entry")) - - # push values into the editors - proj_name = proj_item.text() - act_name = act_item.text() - note = note_item.text() - hours = float(hours_item.text()) - - # Set project combo by name - idx = self.project_combo.findText(proj_name, Qt.MatchFixedString) - if idx >= 0: - self.project_combo.setCurrentIndex(idx) - - self.activity_edit.setText(act_name) - self.note.setText(note) - self.hours_spin.setValue(hours) - - def _on_table_item_changed(self, item: QTableWidgetItem) -> None: - """Commit inline edits in the table back to the database. - - Editing a cell should behave like selecting that row and pressing - the Add/Update button, so we reuse the same validation and DB logic. - """ - if self._reloading_entries: - # Ignore changes that come from _reload_entries(). - return - - if item is None: # pragma: no cover - return - - row = item.row() - - proj_item = self.table.item(row, 0) - act_item = self.table.item(row, 1) - note_item = self.table.item(row, 2) - hours_item = self.table.item(row, 3) - - if proj_item is None or act_item is None or hours_item is None: - # Incomplete row - nothing to do. - return - - # Recover the entry id from the hidden UserRole on the project cell - entry_id = proj_item.data(Qt.ItemDataRole.UserRole) - self._current_entry_id = int(entry_id) if entry_id is not None else None - - # Push values into the editors (similar to _on_row_selected). - proj_name = proj_item.text() - act_name = act_item.text() - note_text = note_item.text() if note_item is not None else "" - hours_text = hours_item.text() - - # Set project combo by name, creating a project on the fly if needed. - idx = self.project_combo.findText(proj_name, Qt.MatchFixedString) - if idx < 0 and proj_name: - # Allow creating a new project directly from the table. - proj_id = self._db.add_project(proj_name) - self._reload_projects() - idx = self.project_combo.findData(proj_id) - if idx >= 0: - self.project_combo.setCurrentIndex(idx) - else: - self.project_combo.setCurrentIndex(-1) - - self.activity_edit.setText(act_name) - self.note.setText(note_text) - - # Parse hours; if invalid, show the same style of warning as elsewhere. - try: - hours = float(hours_text) - except ValueError: - QMessageBox.warning( - self, - strings._("invalid_time_title"), - strings._("invalid_time_message"), - ) - # Reset table back to the last known-good state. - self._reload_entries() - return - - self.hours_spin.setValue(hours) - - # Mirror button state to reflect whether we're updating or adding. - if self._current_entry_id is None: - self.delete_btn.setEnabled(False) - self.add_update_btn.setText(strings._("add_time_entry")) - else: - self.delete_btn.setEnabled(True) - self.add_update_btn.setText(strings._("update_time_entry")) - - # Finally, reuse the existing validation + DB logic. - self._on_add_or_update() - - def _on_delete_entry(self) -> None: - if self._current_entry_id is None: - return - self._db.delete_time_log(self._current_entry_id) - self._reload_entries() - - def _on_run_report(self) -> None: - dlg = TimeReportDialog(self._db, self) - dlg.exec() - - # ----- Project / activity management ------------------------------- - - def _manage_projects(self) -> None: - dlg = TimeCodeManagerDialog(self._db, focus_tab="projects", parent=self) - dlg.exec() - self._reload_projects() - - def _manage_activities(self) -> None: - dlg = TimeCodeManagerDialog(self._db, focus_tab="activities", parent=self) - dlg.exec() - self._reload_activities() - - -class TimeCodeManagerDialog(QDialog): - """ - Dialog to manage projects and activities, similar spirit to Tag Browser: - Add / rename / delete without having to log time. - """ - - def __init__(self, db: DBManager, focus_tab: str = "projects", parent=None): - super().__init__(parent) - self._db = db - - self.setWindowTitle(strings._("manage_projects_activities")) - self.resize(500, 400) - - root = QVBoxLayout(self) - - self.tabs = QTabWidget() - root.addWidget(self.tabs, 1) - - # Projects tab - proj_tab = QWidget() - proj_layout = QVBoxLayout(proj_tab) - self.project_list = QListWidget() - proj_layout.addWidget(self.project_list, 1) - - proj_btn_row = QHBoxLayout() - self.proj_add_btn = QPushButton("&" + strings._("add_project")) - self.proj_rename_btn = QPushButton("&" + strings._("rename_project")) - self.proj_delete_btn = QPushButton("&" + strings._("delete_project")) - proj_btn_row.addWidget(self.proj_add_btn) - proj_btn_row.addWidget(self.proj_rename_btn) - proj_btn_row.addWidget(self.proj_delete_btn) - proj_layout.addLayout(proj_btn_row) - - self.tabs.addTab(proj_tab, "&" + strings._("projects")) - - # Activities tab - act_tab = QWidget() - act_layout = QVBoxLayout(act_tab) - self.activity_list = QListWidget() - act_layout.addWidget(self.activity_list, 1) - - act_btn_row = QHBoxLayout() - self.act_add_btn = QPushButton("&" + strings._("add_activity")) - self.act_rename_btn = QPushButton("&" + strings._("rename_activity")) - self.act_delete_btn = QPushButton("&" + strings._("delete_activity")) - act_btn_row.addWidget(self.act_add_btn) - act_btn_row.addWidget(self.act_rename_btn) - act_btn_row.addWidget(self.act_delete_btn) - act_layout.addLayout(act_btn_row) - - self.tabs.addTab(act_tab, strings._("activities")) - - # Close - close_row = QHBoxLayout() - close_row.addStretch(1) - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - close_row.addWidget(close_btn) - root.addLayout(close_row) - - # Wire - self.proj_add_btn.clicked.connect(self._add_project) - self.proj_rename_btn.clicked.connect(self._rename_project) - self.proj_delete_btn.clicked.connect(self._delete_project) - - self.act_add_btn.clicked.connect(self._add_activity) - self.act_rename_btn.clicked.connect(self._rename_activity) - self.act_delete_btn.clicked.connect(self._delete_activity) - - # Initial data - self._reload_projects() - self._reload_activities() - - if focus_tab == "activities": - self.tabs.setCurrentIndex(1) - - def _reload_projects(self): - self.project_list.clear() - for proj_id, name in self._db.list_projects(): - item = QListWidgetItem(name) - item.setData(Qt.ItemDataRole.UserRole, proj_id) - self.project_list.addItem(item) - - def _reload_activities(self): - self.activity_list.clear() - for act_id, name in self._db.list_activities(): - item = QListWidgetItem(name) - item.setData(Qt.ItemDataRole.UserRole, act_id) - self.activity_list.addItem(item) - - # ---------- helpers ------------------------------------------------ - - def _prompt_name( - self, - title_key: str, - label_key: str, - default: str = "", - ) -> tuple[str, bool]: - """Wrapper around QInputDialog.getText with i18n keys.""" - title = strings._(title_key) - label = strings._(label_key) - text, ok = QInputDialog.getText( - self, - title, - label, - QLineEdit.EchoMode.Normal, - default, - ) - return text.strip(), ok - - def _selected_project_item(self) -> QListWidgetItem | None: - items = self.project_list.selectedItems() - return items[0] if items else None - - def _selected_activity_item(self) -> QListWidgetItem | None: - items = self.activity_list.selectedItems() - return items[0] if items else None - - # ---------- projects ----------------------------------------------- - - def _add_project(self) -> None: - name, ok = self._prompt_name( - "add_project_title", - "add_project_label", - "", - ) - if not ok or not name: - return - - try: - self._db.add_project(name) - except ValueError: - # Empty / invalid name - nothing to do, but be defensive - QMessageBox.warning( - self, - strings._("invalid_project_title"), - strings._("invalid_project_message"), - ) - return - - self._reload_projects() - - def _rename_project(self) -> None: - item = self._selected_project_item() - if item is None: - QMessageBox.information( - self, - strings._("select_project_title"), - strings._("select_project_message"), - ) - return - - old_name = item.text() - proj_id = int(item.data(Qt.ItemDataRole.UserRole)) - - new_name, ok = self._prompt_name( - "rename_project_title", - "rename_project_label", - old_name, - ) - if not ok or not new_name or new_name == old_name: - return - - try: - self._db.rename_project(proj_id, new_name) - except IntegrityError as exc: - QMessageBox.warning( - self, - strings._("project_rename_error_title"), - strings._("project_rename_error_message").format(error=str(exc)), - ) - return - - self._reload_projects() - - def _delete_project(self) -> None: - item = self._selected_project_item() - if item is None: - QMessageBox.information( - self, - strings._("select_project_title"), - strings._("select_project_message"), - ) - return - - proj_id = int(item.data(Qt.ItemDataRole.UserRole)) - name = item.text() - - resp = QMessageBox.question( - self, - strings._("delete_project_title"), - strings._("delete_project_confirm").format(name=name), - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - QMessageBox.StandardButton.No, - ) - if resp != QMessageBox.StandardButton.Yes: - return - - try: - self._db.delete_project(proj_id) - except IntegrityError: - # Likely FK constraint: project has time entries - QMessageBox.warning( - self, - strings._("project_delete_error_title"), - strings._("project_delete_error_message"), - ) - return - - self._reload_projects() - - # ---------- activities --------------------------------------------- - - def _add_activity(self) -> None: - name, ok = self._prompt_name( - "add_activity_title", - "add_activity_label", - "", - ) - if not ok or not name: - return - - try: - self._db.add_activity(name) - except ValueError: - QMessageBox.warning( - self, - strings._("invalid_activity_title"), - strings._("invalid_activity_message"), - ) - return - - self._reload_activities() - - def _rename_activity(self) -> None: - item = self._selected_activity_item() - if item is None: - QMessageBox.information( - self, - strings._("select_activity_title"), - strings._("select_activity_message"), - ) - return - - old_name = item.text() - act_id = int(item.data(Qt.ItemDataRole.UserRole)) - - new_name, ok = self._prompt_name( - "rename_activity_title", - "rename_activity_label", - old_name, - ) - if not ok or not new_name or new_name == old_name: - return - - try: - self._db.rename_activity(act_id, new_name) - except IntegrityError as exc: - QMessageBox.warning( - self, - strings._("activity_rename_error_title"), - strings._("activity_rename_error_message").format(error=str(exc)), - ) - return - - self._reload_activities() - - def _delete_activity(self) -> None: - item = self._selected_activity_item() - if item is None: - QMessageBox.information( - self, - strings._("select_activity_title"), - strings._("select_activity_message"), - ) - return - - act_id = int(item.data(Qt.ItemDataRole.UserRole)) - name = item.text() - - resp = QMessageBox.question( - self, - strings._("delete_activity_title"), - strings._("delete_activity_confirm").format(name=name), - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - QMessageBox.StandardButton.No, - ) - if resp != QMessageBox.StandardButton.Yes: - return - - try: - self._db.delete_activity(act_id) - except IntegrityError: - # Activity is referenced by time_log - QMessageBox.warning( - self, - strings._("activity_delete_error_title"), - strings._("activity_delete_error_message"), - ) - return - - self._reload_activities() - - -class TimeReportDialog(QDialog): - """ - Simple report: choose project + date range + granularity (day/week/month). - Shows decimal hours per time period. - """ - - remindersChanged = Signal() - - def __init__(self, db: DBManager, parent=None): - super().__init__(parent) - self._db = db - self.cfg = load_db_config() - - # state for last run - self._last_rows: list[tuple[str, str, str, str, int]] = [] - self._last_total_minutes: int = 0 - self._last_project_name: str = "" - self._last_start: str = "" - self._last_end: str = "" - self._last_gran_label: str = "" - self._last_time_logs: list = [] - - self.setWindowTitle(strings._("time_log_report")) - self.resize(600, 400) - - root = QVBoxLayout(self) - - form = QFormLayout() - - self.invoice_btn = QPushButton(strings._("create_invoice")) - self.invoice_btn.clicked.connect(self._on_create_invoice) - - self.manage_invoices_btn = QPushButton(strings._("manage_invoices")) - self.manage_invoices_btn.clicked.connect(self._on_manage_invoices) - - # Project - self.project_combo = QComboBox() - self.project_combo.addItem(strings._("all_projects"), None) - self.project_combo.currentIndexChanged.connect( - self._update_invoice_button_state - ) - self._update_invoice_button_state() - for proj_id, name in self._db.list_projects(): - self.project_combo.addItem(name, proj_id) - form.addRow(strings._("project"), self.project_combo) - - # Date range - today = QDate.currentDate() - start_of_month = QDate(today.year(), today.month(), 1) - - self.range_preset = QComboBox() - self.range_preset.addItem(strings._("custom_range"), "custom") - self.range_preset.addItem(strings._("today"), "today") - self.range_preset.addItem(strings._("last_week"), "last_week") - self.range_preset.addItem(strings._("this_week"), "this_week") - self.range_preset.addItem(strings._("this_month"), "this_month") - self.range_preset.addItem(strings._("this_year"), "this_year") - self.range_preset.currentIndexChanged.connect(self._on_range_preset_changed) - - self.from_date = QDateEdit(start_of_month) - self.from_date.setCalendarPopup(True) - self.to_date = QDateEdit(today) - self.to_date.setCalendarPopup(True) - - range_row = QHBoxLayout() - range_row.addWidget(self.range_preset) - range_row.addWidget(self.from_date) - range_row.addWidget(QLabel("—")) - range_row.addWidget(self.to_date) - - form.addRow(strings._("date_range"), range_row) - - # After widgets are created, choose default preset - idx = self.range_preset.findData("this_month") - if idx != -1: - self.range_preset.setCurrentIndex(idx) - - # Granularity - self.granularity = QComboBox() - self.granularity.addItem(strings._("dont_group"), "none") - self.granularity.addItem(strings._("by_day"), "day") - self.granularity.addItem(strings._("by_week"), "week") - self.granularity.addItem(strings._("by_month"), "month") - self.granularity.addItem(strings._("by_activity"), "activity") - form.addRow(strings._("group_by"), self.granularity) - - root.addLayout(form) - - # Run and + export buttons - run_row = QHBoxLayout() - run_btn = QPushButton(strings._("run_report")) - run_btn.clicked.connect(self._run_report) - - export_btn = QPushButton(strings._("export_csv")) - export_btn.clicked.connect(self._export_csv) - - pdf_btn = QPushButton(strings._("export_pdf")) - pdf_btn.clicked.connect(self._export_pdf) - - run_row.addStretch(1) - run_row.addWidget(run_btn) - run_row.addWidget(export_btn) - run_row.addWidget(pdf_btn) - # Only show invoicing if the feature is enabled - if getattr(self._db.cfg, "invoicing", False): - run_row.addWidget(self.invoice_btn) - run_row.addWidget(self.manage_invoices_btn) - root.addLayout(run_row) - - # Table - self.table = QTableWidget() - self.table.setColumnCount(5) - self.table.setHorizontalHeaderLabels( - [ - strings._("project"), - strings._("time_period"), - strings._("activity"), - strings._("note"), - strings._("hours"), - ] - ) - self.table.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode(2, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode(3, QHeaderView.Stretch) - self.table.horizontalHeader().setSectionResizeMode( - 4, QHeaderView.ResizeToContents - ) - root.addWidget(self.table, 1) - - # Total label - self.total_label = QLabel("") - root.addWidget(self.total_label) - - # Close - close_row = QHBoxLayout() - close_row.addStretch(1) - close_btn = QPushButton(strings._("close")) - close_btn.clicked.connect(self.accept) - close_row.addWidget(close_btn) - root.addLayout(close_row) - - def _configure_table_columns(self, granularity: str) -> None: - if granularity == "none": - # Show notes - self.table.setColumnCount(5) - self.table.setHorizontalHeaderLabels( - [ - strings._("project"), - strings._("time_period"), - strings._("activity"), - strings._("note"), - strings._("hours"), - ] - ) - # project, period, activity, note stretch; hours shrink - header = self.table.horizontalHeader() - header.setSectionResizeMode(0, QHeaderView.Stretch) - header.setSectionResizeMode(1, QHeaderView.Stretch) - header.setSectionResizeMode(2, QHeaderView.Stretch) - header.setSectionResizeMode(3, QHeaderView.Stretch) - header.setSectionResizeMode(4, QHeaderView.ResizeToContents) - elif granularity == "activity": - # Grouped by activity only: no time period, no note column - self.table.setColumnCount(3) - self.table.setHorizontalHeaderLabels( - [ - strings._("project"), - strings._("activity"), - strings._("hours"), - ] - ) - header = self.table.horizontalHeader() - header.setSectionResizeMode(0, QHeaderView.Stretch) - header.setSectionResizeMode(1, QHeaderView.Stretch) - header.setSectionResizeMode(2, QHeaderView.ResizeToContents) - else: - # Grouped: no note column - self.table.setColumnCount(4) - self.table.setHorizontalHeaderLabels( - [ - strings._("project"), - strings._("time_period"), - strings._("activity"), - strings._("hours"), - ] - ) - header = self.table.horizontalHeader() - header.setSectionResizeMode(0, QHeaderView.Stretch) - header.setSectionResizeMode(1, QHeaderView.Stretch) - header.setSectionResizeMode(2, QHeaderView.Stretch) - header.setSectionResizeMode(3, QHeaderView.ResizeToContents) - - def _on_range_preset_changed(self, index: int) -> None: - preset = self.range_preset.currentData() - today = QDate.currentDate() - - if preset == "today": - start = end = today - - elif preset == "this_week": - # Monday-based week, clamp end to today - # dayOfWeek(): Monday=1, Sunday=7 - start = today.addDays(1 - today.dayOfWeek()) - end = today - - elif preset == "last_week": - # Compute Monday-Sunday of the previous week (Monday-based weeks) - # 1. Monday of this week: - start_of_this_week = today.addDays(1 - today.dayOfWeek()) - # 2. Last week is 7 days before that: - start = start_of_this_week.addDays(-7) # last week's Monday - end = start_of_this_week.addDays(-1) # last week's Sunday - - elif preset == "this_month": - start = QDate(today.year(), today.month(), 1) - end = today - - elif preset == "this_year": - start = QDate(today.year(), 1, 1) - end = today - - else: # "custom" - leave fields as user-set - return - - # Update date edits without triggering anything else - self.from_date.blockSignals(True) - self.to_date.blockSignals(True) - self.from_date.setDate(start) - self.to_date.setDate(end) - self.from_date.blockSignals(False) - self.to_date.blockSignals(False) - - def _run_report(self): - idx = self.project_combo.currentIndex() - if idx < 0: - return - - proj_data = self.project_combo.itemData(idx) - start = self.from_date.date().toString("yyyy-MM-dd") - end = self.to_date.date().toString("yyyy-MM-dd") - gran = self.granularity.currentData() - - self._last_start = start - self._last_end = end - self._last_gran_label = self.granularity.currentText() - self._last_gran = gran # remember which grouping was used - - self._configure_table_columns(gran) - - rows_for_table: list[tuple[str, str, str, str, int]] = [] - - if proj_data is None: - # All projects - self._last_all_projects = True - self._last_time_logs = [] - self._last_project_name = strings._("all_projects") - rows_for_table = self._db.time_report_all(start, end, gran) - else: - self._last_all_projects = False - proj_id = int(proj_data) - self._last_time_logs = self._db.time_logs_for_range(proj_id, start, end) - project_name = self.project_combo.currentText() - self._last_project_name = project_name - - per_project_rows = self._db.time_report(proj_id, start, end, gran) - # Adapt DB rows (period, activity, note, minutes) → include project - rows_for_table = [ - (project_name, period, activity, note, minutes) - for (period, activity, note, minutes) in per_project_rows - ] - - # Store for export - self._last_rows = rows_for_table - self._last_total_minutes = sum(r[4] for r in rows_for_table) - - # Per-project totals - self._last_project_totals = defaultdict(int) - for project, _period, _activity, _note, minutes in rows_for_table: - self._last_project_totals[project] += minutes - - # Populate table - self.table.setRowCount(len(rows_for_table)) - for i, (project, time_period, activity_name, note, minutes) in enumerate( - rows_for_table - ): - hrs = minutes / 60.0 - if self._last_gran == "activity": - self.table.setItem(i, 0, QTableWidgetItem(project)) - self.table.setItem(i, 1, QTableWidgetItem(activity_name)) - self.table.setItem(i, 2, QTableWidgetItem(f"{hrs:.2f}")) - else: - self.table.setItem(i, 0, QTableWidgetItem(project)) - self.table.setItem(i, 1, QTableWidgetItem(time_period)) - self.table.setItem(i, 2, QTableWidgetItem(activity_name)) - - if self._last_gran == "none": - self.table.setItem(i, 3, QTableWidgetItem(note or "")) - self.table.setItem(i, 4, QTableWidgetItem(f"{hrs:.2f}")) - else: - # no note column - self.table.setItem(i, 3, QTableWidgetItem(f"{hrs:.2f}")) - - # Summary label - include per-project totals when in "all projects" mode - total_hours = self._last_total_minutes / 60.0 - if self._last_all_projects: - per_project_bits = [ - f"{proj}: {mins/60.0:.2f}h" - for proj, mins in sorted(self._last_project_totals.items()) - ] - self.total_label.setText( - strings._("time_report_total").format(hours=total_hours) - + " (" - + ", ".join(per_project_bits) - + ")" - ) - else: - self.total_label.setText( - strings._("time_report_total").format(hours=total_hours) - ) - - def _export_csv(self): - if not self._last_rows: - QMessageBox.information( - self, - strings._("no_report_title"), - strings._("no_report_message"), - ) - return - - filename, _ = QFileDialog.getSaveFileName( - self, - strings._("export_csv"), - "", - "CSV Files (*.csv);;All Files (*)", - ) - if not filename: - return - if not filename.endswith(".csv"): - filename = f"{filename}.csv" - - try: - with open(filename, "w", newline="", encoding="utf-8") as f: - writer = csv.writer(f) - - gran = getattr(self, "_last_gran", "day") - show_note = gran == "none" - show_period = gran != "activity" - - # Header - header: list[str] = [strings._("project")] - if show_period: - header.append(strings._("time_period")) - header.append(strings._("activity")) - if show_note: - header.append(strings._("note")) - header.append(strings._("hours")) - writer.writerow(header) - - # Data rows - for ( - project, - time_period, - activity_name, - note, - minutes, - ) in self._last_rows: - hours = minutes / 60.0 - row: list[str] = [project] - if show_period: - row.append(time_period) - row.append(activity_name) - if show_note: - row.append(note or "") - row.append(f"{hours:.2f}") - writer.writerow(row) - - # Blank line + total - total_hours = self._last_total_minutes / 60.0 - writer.writerow([]) - total_row = [""] * len(header) - total_row[0] = strings._("total") - total_row[-1] = f"{total_hours:.2f}" - writer.writerow(total_row) - except OSError as exc: - QMessageBox.warning( - self, - strings._("export_csv_error_title"), - strings._("export_csv_error_message").format(error=str(exc)), - ) - - def _export_pdf(self): - if not self._last_rows: - QMessageBox.information( - self, - strings._("no_report_title"), - strings._("no_report_message"), - ) - return - - filename, _ = QFileDialog.getSaveFileName( - self, - strings._("export_pdf"), - "", - "PDF Files (*.pdf);;All Files (*)", - ) - if not filename: - return - if not filename.endswith(".pdf"): - filename = f"{filename}.pdf" - - # ---------- Build chart image ---------- - # Default: hours per time period. If grouped by activity: hours per activity. - gran = getattr(self, "_last_gran", "day") - per_bucket_minutes: dict[str, int] = defaultdict(int) - for _project, period, activity, _note, minutes in self._last_rows: - bucket = activity if gran == "activity" else period - per_bucket_minutes[bucket] += minutes - - buckets = sorted(per_bucket_minutes.keys()) - chart_w, chart_h = 800, 220 - chart = QImage(chart_w, chart_h, QImage.Format_ARGB32) - chart.fill(Qt.white) - - if buckets: - painter = QPainter(chart) - try: - painter.setRenderHint(QPainter.Antialiasing, True) - - margin = 50 - left = margin + 30 # extra space for Y labels - top = margin - right = chart_w - margin - bottom = chart_h - margin - 20 # room for X labels - width = right - left - height = bottom - top - - painter.setPen(Qt.black) - - # Y-axis label "Hours" above the axis - painter.drawText( - left - 50, # left of the axis - top - 30, # higher up so it doesn't touch the axis line - 50, - 20, - Qt.AlignRight | Qt.AlignVCenter, - strings._("hours"), - ) - - # Border - painter.drawRect(left, top, width, height) - - max_hours = max(per_bucket_minutes[p] for p in buckets) / 60.0 - if max_hours > 0: - n = len(buckets) - bar_spacing = width / max(1, n) - bar_width = bar_spacing * 0.6 - - # Y-axis ticks (0, 1/3, 2/3, max) - num_ticks = 3 - for i in range(num_ticks + 1): - val = max_hours * i / num_ticks - y_tick = bottom - int((val / max_hours) * height) - # small tick mark - painter.drawLine(left - 5, y_tick, left, y_tick) - # label to the left - painter.drawText( - left - 40, - y_tick - 7, - 35, - 14, - Qt.AlignRight | Qt.AlignVCenter, - f"{val:.1f}", - ) - - # Bars - painter.setBrush(QColor(80, 140, 200)) - painter.setPen(Qt.NoPen) - - for i, label in enumerate(buckets): - hours = per_bucket_minutes[label] / 60.0 - bar_h = int((hours / max_hours) * (height - 10)) - if bar_h <= 0: - continue # pragma: no cover - - x_center = left + bar_spacing * (i + 0.5) - x = int(x_center - bar_width / 2) - y_top_bar = bottom - bar_h - - painter.drawRect(x, y_top_bar, int(bar_width), bar_h) - - # X labels after bars, in black - painter.setPen(Qt.black) - for i, label in enumerate(buckets): - x_center = left + bar_spacing * (i + 0.5) - x = int(x_center - bar_width / 2) - painter.drawText( - x, - bottom + 5, - int(bar_width), - 20, - Qt.AlignHCenter | Qt.AlignTop, - label, - ) - finally: - painter.end() - - # ---------- Build HTML report ---------- - project = html.escape(self._last_project_name or "") - start = html.escape(self._last_start or "") - end = html.escape(self._last_end or "") - gran_key = getattr(self, "_last_gran", "day") - gran_label = html.escape(self._last_gran_label or "") - - total_hours = self._last_total_minutes / 60.0 - - # Table rows - row_html_parts: list[str] = [] - if gran_key == "activity": - for project, _period, activity, _note, minutes in self._last_rows: - hours = minutes / 60.0 - row_html_parts.append( - "" - f"{html.escape(project)}" - f"{html.escape(activity)}" - f"{hours:.2f}" - "" - ) - else: - for project, period, activity, _note, minutes in self._last_rows: - hours = minutes / 60.0 - row_html_parts.append( - "" - f"{html.escape(project)}" - f"{html.escape(period)}" - f"{html.escape(activity)}" - f"{hours:.2f}" - "" - ) - rows_html = "\n".join(row_html_parts) - - if gran_key == "activity": - table_header_html = ( - "" - f"{html.escape(strings._('project'))}" - f"{html.escape(strings._('activity'))}" - f"{html.escape(strings._('hours'))}" - "" - ) - else: - table_header_html = ( - "" - f"{html.escape(strings._('project'))}" - f"{html.escape(strings._('time_period'))}" - f"{html.escape(strings._('activity'))}" - f"{html.escape(strings._('hours'))}" - "" - ) - - html_doc = f""" - - - - - - - -

{html.escape(strings._("time_log_report_title").format(project=project))}

-

- {html.escape(strings._("time_log_report_meta").format( - start=start, end=end, granularity=gran_label))} -

-

- - {table_header_html} - {rows_html} -
-

{html.escape(strings._("time_report_total").format(hours=total_hours))}

- - -""" - - # ---------- Render HTML to PDF ---------- - printer = QPrinter(QPrinter.HighResolution) - printer.setOutputFormat(QPrinter.PdfFormat) - printer.setOutputFileName(filename) - printer.setPageOrientation(QPageLayout.Orientation.Landscape) - - doc = QTextDocument() - # attach the chart image as a resource - doc.addResource(QTextDocument.ImageResource, QUrl("chart"), chart) - doc.setHtml(html_doc) - - try: - doc.print_(printer) - except Exception as exc: # very defensive - QMessageBox.warning( - self, - strings._("export_pdf_error_title"), - strings._("export_pdf_error_message").format(error=str(exc)), - ) - - def _update_invoice_button_state(self) -> None: - data = self.project_combo.currentData() - if data is not None: - self.invoice_btn.show() - else: - self.invoice_btn.hide() - - def _on_manage_invoices(self) -> None: - from .invoices import InvoicesDialog - - dlg = InvoicesDialog(self._db, parent=self) - - # When the dialog says "reminders changed", forward that outward - dlg.remindersChanged.connect(self.remindersChanged.emit) - - dlg.exec() - - def _on_create_invoice(self) -> None: - idx = self.project_combo.currentIndex() - if idx < 0: - return - - project_id_data = self.project_combo.itemData(idx) - if project_id_data is None: - # Currently invoices are per-project, not cross-project - QMessageBox.information( - self, - strings._("invoice_project_required_title"), - strings._("invoice_project_required_message"), - ) - return - - proj_id = int(project_id_data) - - # Ensure we have a recent run to base this on - if not self._last_time_logs: - QMessageBox.information( - self, - strings._("invoice_need_report_title"), - strings._("invoice_need_report_message"), - ) - return - - start = self.from_date.date().toString("yyyy-MM-dd") - end = self.to_date.date().toString("yyyy-MM-dd") - - from .invoices import InvoiceDialog - - dlg = InvoiceDialog(self._db, proj_id, start, end, self._last_time_logs, self) - dlg.remindersChanged.connect(self.remindersChanged.emit) - dlg.exec() diff --git a/bouquin/toolbar.py b/bouquin/toolbar.py index 92383e6..acf0413 100644 --- a/bouquin/toolbar.py +++ b/bouquin/toolbar.py @@ -1,11 +1,9 @@ from __future__ import annotations -from PySide6.QtCore import Qt, Signal -from PySide6.QtGui import QAction, QActionGroup, QFont, QFontDatabase, QKeySequence +from PySide6.QtCore import Signal, Qt +from PySide6.QtGui import QAction, QKeySequence, QFont, QFontDatabase, QActionGroup from PySide6.QtWidgets import QToolBar -from . import strings - class ToolBar(QToolBar): boldRequested = Signal() @@ -18,115 +16,83 @@ class ToolBar(QToolBar): checkboxesRequested = Signal() historyRequested = Signal() insertImageRequested = Signal() - alarmRequested = Signal() - timerRequested = Signal() - documentsRequested = Signal() - fontSizeLargerRequested = Signal() - fontSizeSmallerRequested = Signal() def __init__(self, parent=None): - super().__init__(strings._("toolbar_format"), parent) - self.setObjectName(strings._("toolbar_format")) + super().__init__("Format", parent) + self.setObjectName("Format") self.setToolButtonStyle(Qt.ToolButtonTextOnly) self._build_actions() self._apply_toolbar_styles() def _build_actions(self): self.actBold = QAction("B", self) - self.actBold.setToolTip(strings._("toolbar_bold")) + self.actBold.setToolTip("Bold") self.actBold.setCheckable(True) self.actBold.setShortcut(QKeySequence.Bold) self.actBold.triggered.connect(self.boldRequested) self.actItalic = QAction("I", self) - self.actItalic.setToolTip(strings._("toolbar_italic")) + self.actItalic.setToolTip("Italic") self.actItalic.setCheckable(True) self.actItalic.setShortcut(QKeySequence.Italic) self.actItalic.triggered.connect(self.italicRequested) self.actStrike = QAction("S", self) - self.actStrike.setToolTip(strings._("toolbar_strikethrough")) + self.actStrike.setToolTip("Strikethrough") self.actStrike.setCheckable(True) self.actStrike.setShortcut("Ctrl+-") self.actStrike.triggered.connect(self.strikeRequested) self.actCode = QAction("", self) - self.actCode.setToolTip(strings._("toolbar_code_block")) + self.actCode.setToolTip("Code block") self.actCode.setShortcut("Ctrl+`") self.actCode.triggered.connect(self.codeRequested) # Headings self.actH1 = QAction("H1", self) - self.actH1.setToolTip(strings._("toolbar_heading") + " 1") + self.actH1.setToolTip("Heading 1") self.actH1.setCheckable(True) self.actH1.setShortcut("Ctrl+1") self.actH1.triggered.connect(lambda: self.headingRequested.emit(24)) self.actH2 = QAction("H2", self) - self.actH2.setToolTip(strings._("toolbar_heading") + " 2") + self.actH2.setToolTip("Heading 2") self.actH2.setCheckable(True) self.actH2.setShortcut("Ctrl+2") self.actH2.triggered.connect(lambda: self.headingRequested.emit(18)) self.actH3 = QAction("H3", self) - self.actH3.setToolTip(strings._("toolbar_heading") + " 3") + self.actH3.setToolTip("Heading 3") self.actH3.setCheckable(True) self.actH3.setShortcut("Ctrl+3") self.actH3.triggered.connect(lambda: self.headingRequested.emit(14)) - self.actNormal = QAction("P", self) - self.actNormal.setToolTip(strings._("toolbar_normal_paragraph_text")) + self.actNormal = QAction("N", self) + self.actNormal.setToolTip("Normal paragraph text") self.actNormal.setCheckable(True) - self.actNormal.setShortcut("Ctrl+.") + self.actNormal.setShortcut("Ctrl+N") self.actNormal.triggered.connect(lambda: self.headingRequested.emit(0)) - self.actFontSmaller = QAction("P-", self) - self.actFontSmaller.setToolTip(strings._("toolbar_font_smaller")) - self.actFontSmaller.setShortcut("Ctrl+Shift+-") - self.actFontSmaller.triggered.connect(self.fontSizeSmallerRequested) - - self.actFontLarger = QAction("P+", self) - self.actFontLarger.setToolTip(strings._("toolbar_font_larger")) - self.actFontLarger.setShortcut("Ctrl+Shift+=") - self.actFontLarger.triggered.connect(self.fontSizeLargerRequested) - # Lists self.actBullets = QAction("•", self) - self.actBullets.setToolTip(strings._("toolbar_bulleted_list")) + self.actBullets.setToolTip("Bulleted list") self.actBullets.setCheckable(True) self.actBullets.triggered.connect(self.bulletsRequested) self.actNumbers = QAction("1.", self) - self.actNumbers.setToolTip(strings._("toolbar_numbered_list")) + self.actNumbers.setToolTip("Numbered list") self.actNumbers.setCheckable(True) self.actNumbers.triggered.connect(self.numbersRequested) - self.actCheckboxes = QAction("☑", self) - self.actCheckboxes.setToolTip(strings._("toolbar_toggle_checkboxes")) + self.actCheckboxes = QAction("☐", self) + self.actCheckboxes.setToolTip("Toggle checkboxes") self.actCheckboxes.triggered.connect(self.checkboxesRequested) # Images - self.actInsertImg = QAction("📸", self) - self.actInsertImg.setToolTip(strings._("insert_images")) + self.actInsertImg = QAction("Image", self) + self.actInsertImg.setToolTip("Insert image") self.actInsertImg.setShortcut("Ctrl+Shift+I") self.actInsertImg.triggered.connect(self.insertImageRequested) # History button - self.actHistory = QAction("↺", self) - self.actHistory.setToolTip(strings._("history")) + self.actHistory = QAction("History", self) self.actHistory.triggered.connect(self.historyRequested) - # Alarm / reminder - self.actAlarm = QAction("⏰", self) - self.actAlarm.setToolTip(strings._("toolbar_alarm")) - self.actAlarm.triggered.connect(self.alarmRequested) - - # Focus timer - self.actTimer = QAction("⌛", self) - self.actTimer.setToolTip(strings._("toolbar_pomodoro_timer")) - self.actTimer.setCheckable(True) - self.actTimer.triggered.connect(self.timerRequested) - - # Documents - self.actDocuments = QAction("📁", self) - self.actDocuments.setToolTip(strings._("toolbar_documents")) - self.actDocuments.triggered.connect(self.documentsRequested) - # Set exclusive buttons in QActionGroups self.grpHeadings = QActionGroup(self) self.grpHeadings.setExclusive(True) @@ -158,15 +124,10 @@ class ToolBar(QToolBar): self.actH2, self.actH3, self.actNormal, - self.actFontSmaller, - self.actFontLarger, self.actBullets, self.actNumbers, self.actCheckboxes, self.actInsertImg, - self.actAlarm, - self.actTimer, - self.actDocuments, self.actHistory, ] ) @@ -183,20 +144,14 @@ class ToolBar(QToolBar): self._style_letter_button(self.actH1, "H1") self._style_letter_button(self.actH2, "H2") self._style_letter_button(self.actH3, "H3") - self._style_letter_button(self.actNormal, "P") - self._style_letter_button(self.actFontSmaller, "P-") - self._style_letter_button(self.actFontLarger, "P+") + self._style_letter_button(self.actNormal, "N") # Lists self._style_letter_button(self.actBullets, "•") self._style_letter_button(self.actNumbers, "1.") - self._style_letter_button(self.actCheckboxes, "☑") - self._style_letter_button(self.actAlarm, "⏰") - self._style_letter_button(self.actTimer, "⌛") - self._style_letter_button(self.actDocuments, "📁") # History - self._style_letter_button(self.actHistory, "↺") + self._style_letter_button(self.actHistory, "View History") def _style_letter_button( self, diff --git a/bouquin/version_check.py b/bouquin/version_check.py deleted file mode 100644 index 5b62d02..0000000 --- a/bouquin/version_check.py +++ /dev/null @@ -1,406 +0,0 @@ -from __future__ import annotations - -import importlib.metadata -import os -import re -import subprocess # nosec -import tempfile -from importlib.resources import files -from pathlib import Path - -import requests -from PySide6.QtCore import QStandardPaths, Qt -from PySide6.QtGui import QGuiApplication, QImage, QPainter, QPixmap -from PySide6.QtSvg import QSvgRenderer -from PySide6.QtWidgets import QApplication, QMessageBox, QProgressDialog, QWidget - -from . import strings -from .settings import APP_NAME - -# Where to fetch the latest version string from -VERSION_URL = "https://mig5.net/bouquin/version.txt" - -# Name of the installed distribution according to pyproject.toml -# (used with importlib.metadata.version) -DIST_NAME = "bouquin" - -# Base URL where AppImages are hosted -APPIMAGE_BASE_URL = "https://git.mig5.net/mig5/bouquin/releases/download" - -# Where we expect to find the bundled public key, relative to the *installed* package. -GPG_PUBKEY_RESOURCE = ("bouquin", "keys", "mig5.asc") - - -class VersionChecker: - """ - Handles: - * showing the version dialog - * checking for updates - * downloading & verifying a new AppImage - - All dialogs use `parent` as their parent widget. - """ - - def __init__(self, parent: QWidget | None = None): - self._parent = parent - - # ---------- Version helpers ---------- # - - def _logo_pixmap(self, logical_size: int = 96) -> QPixmap: - """ - Render the SVG logo to a high-DPI-aware QPixmap so it stays crisp. - """ - svg_path = Path(__file__).resolve().parent / "icons" / "bouquin.svg" - - # Logical size (what Qt layouts see) - dpr = QGuiApplication.primaryScreen().devicePixelRatio() - img_size = int(logical_size * dpr) - - image = QImage(img_size, img_size, QImage.Format_ARGB32) - image.fill(Qt.transparent) - - renderer = QSvgRenderer(str(svg_path)) - painter = QPainter(image) - renderer.render(painter) - painter.end() - - pixmap = QPixmap.fromImage(image) - pixmap.setDevicePixelRatio(dpr) - return pixmap - - def current_version(self) -> str: - """ - Return the current app version as reported by importlib.metadata - """ - try: - return importlib.metadata.version(DIST_NAME) - except importlib.metadata.PackageNotFoundError: - # Fallback for editable installs / dev trees - return "0.0.0" - - @staticmethod - def _parse_version(v: str) -> tuple[int, ...]: - """ - Very small helper to compare simple semantic versions like 1.2.3. - Extracts numeric components and returns them as a tuple. - """ - parts = re.findall(r"\d+", v) - if not parts: - return (0,) - return tuple(int(p) for p in parts) - - def _is_newer_version(self, available: str, current: str) -> bool: - """ - True if `available` > `current` according to _parse_version. - """ - return self._parse_version(available) > self._parse_version(current) - - # ---------- Public entrypoint for Help → Version ---------- # - - def show_version_dialog(self) -> None: - """ - Show the Version dialog with a 'Check for updates' button. - """ - version = self.current_version() - version_formatted = f"{APP_NAME} {version}" - - box = QMessageBox(self._parent) - box.setWindowTitle(strings._("version")) - - box.setIconPixmap(self._logo_pixmap(96)) - - box.setText(version_formatted) - - check_button = box.addButton( - strings._("check_for_updates"), QMessageBox.ActionRole - ) - box.addButton(QMessageBox.Close) - - box.exec() - - if box.clickedButton() is check_button: - self.check_for_updates() - - # ---------- Core update logic ---------- # - - def check_for_updates(self) -> None: - """ - Fetch VERSION_URL, compare against the current version, and optionally - download + verify a new AppImage. - """ - current = self.current_version() - - try: - resp = requests.get(VERSION_URL, timeout=10) - resp.raise_for_status() - available_raw = resp.text.strip() - except Exception as e: - QMessageBox.warning( - self._parent, - strings._("update"), - strings._("could_not_check_for_updates") + str(e), - ) - return - - if not available_raw: - QMessageBox.warning( - self._parent, - strings._("update"), - strings._("update_server_returned_an_empty_version_string"), - ) - return - - if not self._is_newer_version(available_raw, current): - QMessageBox.information( - self._parent, - strings._("update"), - strings._("you_are_running_the_latest_version") + f"({current}).", - ) - return - - # Newer version is available - reply = QMessageBox.question( - self._parent, - strings._("update"), - ( - strings._("there_is_a_new_version_available") - + available_raw - + "\n\n" - + strings._("download_the_appimage") - ), - QMessageBox.Yes | QMessageBox.No, - ) - if reply != QMessageBox.Yes: - return - - self._download_and_verify_appimage(available_raw) - - # ---------- Download + verification helpers ---------- # - def _download_file( - self, - url: str, - dest_path: Path, - timeout: int = 30, - progress: QProgressDialog | None = None, - label: str | None = None, - ) -> None: - """ - Stream a URL to a local file, optionally updating a QProgressDialog. - If the user cancels via the dialog, raises RuntimeError. - """ - resp = requests.get(url, timeout=timeout, stream=True) - resp.raise_for_status() - - dest_path.parent.mkdir(parents=True, exist_ok=True) - - total_bytes: int | None = None - content_length = resp.headers.get("Content-Length") - if content_length is not None: - try: - total_bytes = int(content_length) - except ValueError: - total_bytes = None - - if progress is not None: - progress.setLabelText( - label or strings._("downloading") + f" {dest_path.name}..." - ) - # Unknown size → busy indicator; known size → real range - if total_bytes is not None and total_bytes > 0: - progress.setRange(0, total_bytes) - else: - progress.setRange(0, 0) # pragma: no cover - progress.setValue(0) - progress.show() - QApplication.processEvents() - - downloaded = 0 - with dest_path.open("wb") as f: - for chunk in resp.iter_content(chunk_size=8192): - if not chunk: - continue # pragma: no cover - - f.write(chunk) - downloaded += len(chunk) - - if progress is not None: - if total_bytes is not None and total_bytes > 0: - progress.setValue(downloaded) - else: - # Just bump a little so the dialog looks alive - progress.setValue(progress.value() + 1) # pragma: no cover - QApplication.processEvents() - - if progress.wasCanceled(): - raise RuntimeError(strings._("download_cancelled")) - - if progress is not None and total_bytes is not None and total_bytes > 0: - progress.setValue(total_bytes) - QApplication.processEvents() - - def _download_and_verify_appimage(self, version: str) -> None: - """ - Download the AppImage + its GPG signature to the user's Downloads dir, - then verify it with a bundled public key. - """ - # Where to put the file - download_dir = QStandardPaths.writableLocation(QStandardPaths.DownloadLocation) - if not download_dir: - download_dir = os.path.expanduser("~/Downloads") - download_dir = Path(download_dir) - download_dir.mkdir(parents=True, exist_ok=True) - - # Construct AppImage filename and URLs - appimage_path = download_dir / "Bouquin.AppImage" - sig_path = Path(str(appimage_path) + ".asc") - - appimage_url = f"{APPIMAGE_BASE_URL}/{version}/Bouquin.AppImage" - sig_url = f"{appimage_url}.asc" - - # Progress dialog covering both downloads - progress = QProgressDialog( - "Downloading update...", - "Cancel", - 0, - 100, - self._parent, - ) - progress.setWindowTitle(strings._("update")) - progress.setWindowModality(Qt.WindowModal) - progress.setAutoClose(False) - progress.setAutoReset(False) - - try: - # AppImage download - self._download_file( - appimage_url, - appimage_path, - progress=progress, - label=strings._("downloading") + " Bouquin.AppImage...", - ) - # Signature download (usually tiny, but we still show it) - self._download_file( - sig_url, - sig_path, - progress=progress, - label=strings._("downloading") + " signature...", - ) - except RuntimeError: - # User cancelled - for p in (appimage_path, sig_path): - try: - if p.exists(): - p.unlink() # pragma: no cover - except OSError: # pragma: no cover - pass - - progress.close() - QMessageBox.information( - self._parent, - strings._("update"), - strings._("download_cancelled"), - ) - return - except Exception as e: - # Other error - for p in (appimage_path, sig_path): - try: - if p.exists(): - p.unlink() # pragma: no cover - except OSError: # pragma: no cover - pass - - progress.close() - QMessageBox.critical( - self._parent, - strings._("update"), - strings._("failed_to_download_update") + str(e), - ) - return - - progress.close() - - # Load the bundled public key - try: - pkg, *rel = GPG_PUBKEY_RESOURCE - pubkey_bytes = (files(pkg) / "/".join(rel)).read_bytes() - except Exception as e: # pragma: no cover - QMessageBox.critical( - self._parent, - strings._("update"), - strings._("could_not_read_bundled_gpg_public_key") + str(e), - ) - # On failure, delete the downloaded files for safety - for p in (appimage_path, sig_path): - try: - if p.exists(): - p.unlink() - except OSError: # pragma: no cover - pass - return - - # Use a temporary GNUPGHOME so we don't touch the user's main keyring - try: - with tempfile.TemporaryDirectory() as gnupg_home: - pubkey_path = Path(gnupg_home) / "pubkey.asc" - pubkey_path.write_bytes(pubkey_bytes) - - # Import the key - subprocess.run( - ["gpg", "--homedir", gnupg_home, "--import", str(pubkey_path)], - check=True, - stdout=subprocess.DEVNULL, - stderr=subprocess.PIPE, - ) # nosec - - # Verify the signature - subprocess.run( - [ - "gpg", - "--homedir", - gnupg_home, - "--verify", - str(sig_path), - str(appimage_path), - ], - check=True, - stdout=subprocess.DEVNULL, - stderr=subprocess.PIPE, - ) # nosec - except FileNotFoundError: - # gpg not installed / not on PATH - for p in (appimage_path, sig_path): - try: - if p.exists(): - p.unlink() # pragma: no cover - except OSError: # pragma: no cover - pass - - QMessageBox.critical( - self._parent, - strings._("update"), - strings._("could_not_find_gpg_executable"), - ) - return - except subprocess.CalledProcessError as e: - for p in (appimage_path, sig_path): - try: - if p.exists(): - p.unlink() # pragma: no cover - except OSError: # pragma: no cover - pass - - QMessageBox.critical( - self._parent, - strings._("update"), - strings._("gpg_signature_verification_failed") - + e.stderr.decode(errors="ignore"), - ) - return - - # Success - QMessageBox.information( - self._parent, - strings._("update"), - strings._("downloaded_and_verified_new_appimage") + str(appimage_path), - ) diff --git a/find_unused_strings.py b/find_unused_strings.py deleted file mode 100755 index 5341001..0000000 --- a/find_unused_strings.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/env python3 - -import argparse -import ast -import json -from pathlib import Path -from typing import Dict, Set - - -BASE_DIR = Path(__file__).resolve().parent / "bouquin" -LOCALES_DIR = BASE_DIR / "locales" - - -def load_json_keys(locale: str) -> Set[str]: - """Load all keys from the given locale JSON file.""" - path = LOCALES_DIR / f"{locale}.json" - with path.open(encoding="utf-8") as f: - data = json.load(f) - return set(data.keys()) - - -class KeyParamFinder(ast.NodeVisitor): - """ - First pass: - For each function/method, figure out which parameters are later passed - into _(), translated(), or strings._(). - - Example: in your _prompt_name, it discovers that title_key and label_key - are translation-key parameters. - """ - - def __init__(self) -> None: - # func_name -> {"param_positions": {param: arg_index}, "key_param_positions": set[arg_index]} - self.func_info: Dict[str, dict] = {} - self.current_func_name_stack: list[str] = [] - self.current_param_positions_stack: list[Dict[str, int]] = [] - self.current_class_stack: list[str] = [] - - # Track when we're inside a class so we can treat "self" specially - def visit_ClassDef(self, node: ast.ClassDef) -> None: - self.current_class_stack.append(node.name) - self.generic_visit(node) - self.current_class_stack.pop() - - def _enter_function(self, node: ast.FunctionDef | ast.AsyncFunctionDef) -> None: - funcname = node.name - params = [arg.arg for arg in node.args.args] - - # If we're inside a class and there is at least one param, - # assume the first one is "self"/"cls" and is implicit at call sites. - is_method = bool(self.current_class_stack) and len(params) > 0 - - param_positions: Dict[str, int] = {} - for i, name in enumerate(params): - if is_method and i == 0: - # skip self/cls; it doesn't correspond to an explicit arg in calls like self.method(...) - continue - call_index = i - 1 if is_method else i - param_positions[name] = call_index - - self.current_func_name_stack.append(funcname) - self.current_param_positions_stack.append(param_positions) - - self.func_info.setdefault( - funcname, - { - "param_positions": param_positions, - "key_param_positions": set(), - }, - ) - # If the function name is reused, last definition wins - self.func_info[funcname]["param_positions"] = param_positions - - def _exit_function(self) -> None: - self.current_func_name_stack.pop() - self.current_param_positions_stack.pop() - - def visit_FunctionDef(self, node: ast.FunctionDef) -> None: - self._enter_function(node) - self.generic_visit(node) - self._exit_function() - - def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef) -> None: - self._enter_function(node) - self.generic_visit(node) - self._exit_function() - - def visit_Call(self, node: ast.Call) -> None: - # Only care about calls *inside* functions - if not self.current_func_name_stack: - return self.generic_visit(node) - - func = node.func - func_name: str | None = None - - if isinstance(func, ast.Name): - func_name = func.id - elif isinstance(func, ast.Attribute) and isinstance(func.value, ast.Name): - # e.g. strings._(...) - func_name = f"{func.value.id}.{func.attr}" - - # Is this a translation call? - if func_name in {"_", "translated", "strings._"}: - cur_name = self.current_func_name_stack[-1] - param_positions = self.current_param_positions_stack[-1] - - # Positional first arg - if node.args: - first = node.args[0] - if isinstance(first, ast.Name): - pname = first.id - if pname in param_positions: - idx = param_positions[pname] - self.func_info[cur_name]["key_param_positions"].add(idx) - - # Keyword args, e.g. strings._(key=title_key) - for kw in node.keywords or []: - if isinstance(kw.value, ast.Name): - pname = kw.value.id - if pname in param_positions: - idx = param_positions[pname] - self.func_info[cur_name]["key_param_positions"].add(idx) - - self.generic_visit(node) - - -class UsedKeyCollector(ast.NodeVisitor): - """ - Second pass: - - Collect string literals passed directly to _()/translated()/strings._() - - Collect string literals passed into parameters that we know are - "translation-key parameters" of wrapper functions/methods. - """ - - def __init__(self, func_info: Dict[str, dict]) -> None: - self.func_info = func_info - self.used_keys: Set[str] = set() - - def visit_Call(self, node: ast.Call) -> None: - func = node.func - - def full_name(f: ast.expr) -> str | None: - if isinstance(f, ast.Name): - return f.id - if isinstance(f, ast.Attribute) and isinstance(f.value, ast.Name): - return f"{f.value.id}.{f.attr}" - return None - - func_full = full_name(func) - - # 1) Direct translation calls like _("key") or strings._("key") - if func_full in {"_", "translated", "strings._"}: - if node.args: - first = node.args[0] - if isinstance(first, ast.Constant) and isinstance(first.value, str): - self.used_keys.add(first.value) - for kw in node.keywords or []: - if isinstance(kw.value, ast.Constant) and isinstance( - kw.value.value, str - ): - self.used_keys.add(kw.value.value) - - # 2) Wrapper calls: functions whose params we know are translation-key params - called_base_name: str | None = None - if isinstance(func, ast.Name): - called_base_name = func.id - elif isinstance(func, ast.Attribute): - called_base_name = func.attr # e.g. self._prompt_name -> "_prompt_name" - - if called_base_name in self.func_info: - info = self.func_info[called_base_name] - param_positions: Dict[str, int] = info["param_positions"] - key_positions: Set[int] = info["key_param_positions"] - - # positional args - for idx, arg in enumerate(node.args): - if ( - idx in key_positions - and isinstance(arg, ast.Constant) - and isinstance(arg.value, str) - ): - self.used_keys.add(arg.value) - - # keyword args - for kw in node.keywords or []: - if kw.arg is None: - continue # **kwargs, ignore - param_name = kw.arg - if param_name in param_positions: - idx = param_positions[param_name] - if idx in key_positions: - val = kw.value - if isinstance(val, ast.Constant) and isinstance(val.value, str): - self.used_keys.add(val.value) - - self.generic_visit(node) - - -def collect_used_keys() -> Set[str]: - """Parse all .py files and collect all translation keys used.""" - trees: list[ast.AST] = [] - - # Read and parse all Python files in this folder - for path in BASE_DIR.glob("*.py"): - # Optionally skip this script itself - if path.name == Path(__file__).name: - continue - src = path.read_text(encoding="utf-8") - tree = ast.parse(src, filename=str(path)) - trees.append(tree) - - # First pass: find which parameters are translation-key params - finder = KeyParamFinder() - for tree in trees: - finder.visit(tree) - - # Second pass: collect string literals passed to those parameters - collector = UsedKeyCollector(finder.func_info) - for tree in trees: - collector.visit(tree) - - return collector.used_keys - - -def main() -> None: - parser = argparse.ArgumentParser( - description="Find missing or unused strings for a given locale" - ) - parser.add_argument( - "--locale", - type=str, - default="en", - help="Locale key e.g en, fr, it", - ) - args = parser.parse_args() - - json_keys = load_json_keys(args.locale) - used_keys = collect_used_keys() - - unused_keys = sorted(json_keys - used_keys) - missing_in_json = sorted(used_keys - json_keys) - - print("=== Unused keys in JSON (present in locales but never used in code) ===") - if unused_keys: - for k in unused_keys: - print(" ", k) - else: - print(" (none)") - - print("\n=== Keys used in code but missing from JSON ===") - if missing_in_json: - for k in missing_in_json: - print(" ", k) - else: - print(" (none)") - - -if __name__ == "__main__": - main() diff --git a/poetry.lock b/poetry.lock index 115621c..6382937 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2,13 +2,13 @@ [[package]] name = "certifi" -version = "2025.11.12" +version = "2025.10.5" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.7" files = [ - {file = "certifi-2025.11.12-py3-none-any.whl", hash = "sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b"}, - {file = "certifi-2025.11.12.tar.gz", hash = "sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316"}, + {file = "certifi-2025.10.5-py3-none-any.whl", hash = "sha256:0f212c2744a9bb6de0c56639a6f68afe01ecd92d91f14ae897c4fe7bbeeef0de"}, + {file = "certifi-2025.10.5.tar.gz", hash = "sha256:47c09d31ccf2acf0be3f701ea53595ee7e0b8fa08801c6624be771df09ae7b43"}, ] [[package]] @@ -146,103 +146,115 @@ files = [ [[package]] name = "coverage" -version = "7.13.0" +version = "7.10.7" description = "Code coverage measurement for Python" optional = false -python-versions = ">=3.10" +python-versions = ">=3.9" files = [ - {file = "coverage-7.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:02d9fb9eccd48f6843c98a37bd6817462f130b86da8660461e8f5e54d4c06070"}, - {file = "coverage-7.13.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:367449cf07d33dc216c083f2036bb7d976c6e4903ab31be400ad74ad9f85ce98"}, - {file = "coverage-7.13.0-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:cdb3c9f8fef0a954c632f64328a3935988d33a6604ce4bf67ec3e39670f12ae5"}, - {file = "coverage-7.13.0-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d10fd186aac2316f9bbb46ef91977f9d394ded67050ad6d84d94ed6ea2e8e54e"}, - {file = "coverage-7.13.0-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7f88ae3e69df2ab62fb0bc5219a597cb890ba5c438190ffa87490b315190bb33"}, - {file = "coverage-7.13.0-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4be718e51e86f553bcf515305a158a1cd180d23b72f07ae76d6017c3cc5d791"}, - {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a00d3a393207ae12f7c49bb1c113190883b500f48979abb118d8b72b8c95c032"}, - {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:3a7b1cd820e1b6116f92c6128f1188e7afe421c7e1b35fa9836b11444e53ebd9"}, - {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:37eee4e552a65866f15dedd917d5e5f3d59805994260720821e2c1b51ac3248f"}, - {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:62d7c4f13102148c78d7353c6052af6d899a7f6df66a32bddcc0c0eb7c5326f8"}, - {file = "coverage-7.13.0-cp310-cp310-win32.whl", hash = "sha256:24e4e56304fdb56f96f80eabf840eab043b3afea9348b88be680ec5986780a0f"}, - {file = "coverage-7.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:74c136e4093627cf04b26a35dab8cbfc9b37c647f0502fc313376e11726ba303"}, - {file = "coverage-7.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0dfa3855031070058add1a59fdfda0192fd3e8f97e7c81de0596c145dea51820"}, - {file = "coverage-7.13.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4fdb6f54f38e334db97f72fa0c701e66d8479af0bc3f9bfb5b90f1c30f54500f"}, - {file = "coverage-7.13.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:7e442c013447d1d8d195be62852270b78b6e255b79b8675bad8479641e21fd96"}, - {file = "coverage-7.13.0-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1ed5630d946859de835a85e9a43b721123a8a44ec26e2830b296d478c7fd4259"}, - {file = "coverage-7.13.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7f15a931a668e58087bc39d05d2b4bf4b14ff2875b49c994bbdb1c2217a8daeb"}, - {file = "coverage-7.13.0-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:30a3a201a127ea57f7e14ba43c93c9c4be8b7d17a26e03bb49e6966d019eede9"}, - {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:7a485ff48fbd231efa32d58f479befce52dcb6bfb2a88bb7bf9a0b89b1bc8030"}, - {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:22486cdafba4f9e471c816a2a5745337742a617fef68e890d8baf9f3036d7833"}, - {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:263c3dbccc78e2e331e59e90115941b5f53e85cfcc6b3b2fbff1fd4e3d2c6ea8"}, - {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e5330fa0cc1f5c3c4c3bb8e101b742025933e7848989370a1d4c8c5e401ea753"}, - {file = "coverage-7.13.0-cp311-cp311-win32.whl", hash = "sha256:0f4872f5d6c54419c94c25dd6ae1d015deeb337d06e448cd890a1e89a8ee7f3b"}, - {file = "coverage-7.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:51a202e0f80f241ccb68e3e26e19ab5b3bf0f813314f2c967642f13ebcf1ddfe"}, - {file = "coverage-7.13.0-cp311-cp311-win_arm64.whl", hash = "sha256:d2a9d7f1c11487b1c69367ab3ac2d81b9b3721f097aa409a3191c3e90f8f3dd7"}, - {file = "coverage-7.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0b3d67d31383c4c68e19a88e28fc4c2e29517580f1b0ebec4a069d502ce1e0bf"}, - {file = "coverage-7.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:581f086833d24a22c89ae0fe2142cfaa1c92c930adf637ddf122d55083fb5a0f"}, - {file = "coverage-7.13.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:0a3a30f0e257df382f5f9534d4ce3d4cf06eafaf5192beb1a7bd066cb10e78fb"}, - {file = "coverage-7.13.0-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:583221913fbc8f53b88c42e8dbb8fca1d0f2e597cb190ce45916662b8b9d9621"}, - {file = "coverage-7.13.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f5d9bd30756fff3e7216491a0d6d520c448d5124d3d8e8f56446d6412499e74"}, - {file = "coverage-7.13.0-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a23e5a1f8b982d56fa64f8e442e037f6ce29322f1f9e6c2344cd9e9f4407ee57"}, - {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9b01c22bc74a7fb44066aaf765224c0d933ddf1f5047d6cdfe4795504a4493f8"}, - {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:898cce66d0836973f48dda4e3514d863d70142bdf6dfab932b9b6a90ea5b222d"}, - {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3ab483ea0e251b5790c2aac03acde31bff0c736bf8a86829b89382b407cd1c3b"}, - {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d84e91521c5e4cb6602fe11ece3e1de03b2760e14ae4fcf1a4b56fa3c801fcd"}, - {file = "coverage-7.13.0-cp312-cp312-win32.whl", hash = "sha256:193c3887285eec1dbdb3f2bd7fbc351d570ca9c02ca756c3afbc71b3c98af6ef"}, - {file = "coverage-7.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:4f3e223b2b2db5e0db0c2b97286aba0036ca000f06aca9b12112eaa9af3d92ae"}, - {file = "coverage-7.13.0-cp312-cp312-win_arm64.whl", hash = "sha256:086cede306d96202e15a4b77ace8472e39d9f4e5f9fd92dd4fecdfb2313b2080"}, - {file = "coverage-7.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:28ee1c96109974af104028a8ef57cec21447d42d0e937c0275329272e370ebcf"}, - {file = "coverage-7.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d1e97353dcc5587b85986cda4ff3ec98081d7e84dd95e8b2a6d59820f0545f8a"}, - {file = "coverage-7.13.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:99acd4dfdfeb58e1937629eb1ab6ab0899b131f183ee5f23e0b5da5cba2fec74"}, - {file = "coverage-7.13.0-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ff45e0cd8451e293b63ced93161e189780baf444119391b3e7d25315060368a6"}, - {file = "coverage-7.13.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f4f72a85316d8e13234cafe0a9f81b40418ad7a082792fa4165bd7d45d96066b"}, - {file = "coverage-7.13.0-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:11c21557d0e0a5a38632cbbaca5f008723b26a89d70db6315523df6df77d6232"}, - {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:76541dc8d53715fb4f7a3a06b34b0dc6846e3c69bc6204c55653a85dd6220971"}, - {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:6e9e451dee940a86789134b6b0ffbe31c454ade3b849bb8a9d2cca2541a8e91d"}, - {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:5c67dace46f361125e6b9cace8fe0b729ed8479f47e70c89b838d319375c8137"}, - {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f59883c643cb19630500f57016f76cfdcd6845ca8c5b5ea1f6e17f74c8e5f511"}, - {file = "coverage-7.13.0-cp313-cp313-win32.whl", hash = "sha256:58632b187be6f0be500f553be41e277712baa278147ecb7559983c6d9faf7ae1"}, - {file = "coverage-7.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:73419b89f812f498aca53f757dd834919b48ce4799f9d5cad33ca0ae442bdb1a"}, - {file = "coverage-7.13.0-cp313-cp313-win_arm64.whl", hash = "sha256:eb76670874fdd6091eedcc856128ee48c41a9bbbb9c3f1c7c3cf169290e3ffd6"}, - {file = "coverage-7.13.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:6e63ccc6e0ad8986386461c3c4b737540f20426e7ec932f42e030320896c311a"}, - {file = "coverage-7.13.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:494f5459ffa1bd45e18558cd98710c36c0b8fbfa82a5eabcbe671d80ecffbfe8"}, - {file = "coverage-7.13.0-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:06cac81bf10f74034e055e903f5f946e3e26fc51c09fc9f584e4a1605d977053"}, - {file = "coverage-7.13.0-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f2ffc92b46ed6e6760f1d47a71e56b5664781bc68986dbd1836b2b70c0ce2071"}, - {file = "coverage-7.13.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0602f701057c6823e5db1b74530ce85f17c3c5be5c85fc042ac939cbd909426e"}, - {file = "coverage-7.13.0-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:25dc33618d45456ccb1d37bce44bc78cf269909aa14c4db2e03d63146a8a1493"}, - {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:71936a8b3b977ddd0b694c28c6a34f4fff2e9dd201969a4ff5d5fc7742d614b0"}, - {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:936bc20503ce24770c71938d1369461f0c5320830800933bc3956e2a4ded930e"}, - {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:af0a583efaacc52ae2521f8d7910aff65cdb093091d76291ac5820d5e947fc1c"}, - {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f1c23e24a7000da892a312fb17e33c5f94f8b001de44b7cf8ba2e36fbd15859e"}, - {file = "coverage-7.13.0-cp313-cp313t-win32.whl", hash = "sha256:5f8a0297355e652001015e93be345ee54393e45dc3050af4a0475c5a2b767d46"}, - {file = "coverage-7.13.0-cp313-cp313t-win_amd64.whl", hash = "sha256:6abb3a4c52f05e08460bd9acf04fec027f8718ecaa0d09c40ffbc3fbd70ecc39"}, - {file = "coverage-7.13.0-cp313-cp313t-win_arm64.whl", hash = "sha256:3ad968d1e3aa6ce5be295ab5fe3ae1bf5bb4769d0f98a80a0252d543a2ef2e9e"}, - {file = "coverage-7.13.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:453b7ec753cf5e4356e14fe858064e5520c460d3bbbcb9c35e55c0d21155c256"}, - {file = "coverage-7.13.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:af827b7cbb303e1befa6c4f94fd2bf72f108089cfa0f8abab8f4ca553cf5ca5a"}, - {file = "coverage-7.13.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:9987a9e4f8197a1000280f7cc089e3ea2c8b3c0a64d750537809879a7b4ceaf9"}, - {file = "coverage-7.13.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:3188936845cd0cb114fa6a51842a304cdbac2958145d03be2377ec41eb285d19"}, - {file = "coverage-7.13.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a2bdb3babb74079f021696cb46b8bb5f5661165c385d3a238712b031a12355be"}, - {file = "coverage-7.13.0-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7464663eaca6adba4175f6c19354feea61ebbdd735563a03d1e472c7072d27bb"}, - {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8069e831f205d2ff1f3d355e82f511eb7c5522d7d413f5db5756b772ec8697f8"}, - {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:6fb2d5d272341565f08e962cce14cdf843a08ac43bd621783527adb06b089c4b"}, - {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:5e70f92ef89bac1ac8a99b3324923b4749f008fdbd7aa9cb35e01d7a284a04f9"}, - {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4b5de7d4583e60d5fd246dd57fcd3a8aa23c6e118a8c72b38adf666ba8e7e927"}, - {file = "coverage-7.13.0-cp314-cp314-win32.whl", hash = "sha256:a6c6e16b663be828a8f0b6c5027d36471d4a9f90d28444aa4ced4d48d7d6ae8f"}, - {file = "coverage-7.13.0-cp314-cp314-win_amd64.whl", hash = "sha256:0900872f2fdb3ee5646b557918d02279dc3af3dfb39029ac4e945458b13f73bc"}, - {file = "coverage-7.13.0-cp314-cp314-win_arm64.whl", hash = "sha256:3a10260e6a152e5f03f26db4a407c4c62d3830b9af9b7c0450b183615f05d43b"}, - {file = "coverage-7.13.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:9097818b6cc1cfb5f174e3263eba4a62a17683bcfe5c4b5d07f4c97fa51fbf28"}, - {file = "coverage-7.13.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:0018f73dfb4301a89292c73be6ba5f58722ff79f51593352759c1790ded1cabe"}, - {file = "coverage-7.13.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:166ad2a22ee770f5656e1257703139d3533b4a0b6909af67c6b4a3adc1c98657"}, - {file = "coverage-7.13.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f6aaef16d65d1787280943f1c8718dc32e9cf141014e4634d64446702d26e0ff"}, - {file = "coverage-7.13.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e999e2dcc094002d6e2c7bbc1fb85b58ba4f465a760a8014d97619330cdbbbf3"}, - {file = "coverage-7.13.0-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:00c3d22cf6fb1cf3bf662aaaa4e563be8243a5ed2630339069799835a9cc7f9b"}, - {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:22ccfe8d9bb0d6134892cbe1262493a8c70d736b9df930f3f3afae0fe3ac924d"}, - {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:9372dff5ea15930fea0445eaf37bbbafbc771a49e70c0aeed8b4e2c2614cc00e"}, - {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:69ac2c492918c2461bc6ace42d0479638e60719f2a4ef3f0815fa2df88e9f940"}, - {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:739c6c051a7540608d097b8e13c76cfa85263ced467168dc6b477bae3df7d0e2"}, - {file = "coverage-7.13.0-cp314-cp314t-win32.whl", hash = "sha256:fe81055d8c6c9de76d60c94ddea73c290b416e061d40d542b24a5871bad498b7"}, - {file = "coverage-7.13.0-cp314-cp314t-win_amd64.whl", hash = "sha256:445badb539005283825959ac9fa4a28f712c214b65af3a2c464f1adc90f5fcbc"}, - {file = "coverage-7.13.0-cp314-cp314t-win_arm64.whl", hash = "sha256:de7f6748b890708578fc4b7bb967d810aeb6fcc9bff4bb77dbca77dab2f9df6a"}, - {file = "coverage-7.13.0-py3-none-any.whl", hash = "sha256:850d2998f380b1e266459ca5b47bc9e7daf9af1d070f66317972f382d46f1904"}, - {file = "coverage-7.13.0.tar.gz", hash = "sha256:a394aa27f2d7ff9bc04cf703817773a59ad6dfbd577032e690f961d2460ee936"}, + {file = "coverage-7.10.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:fc04cc7a3db33664e0c2d10eb8990ff6b3536f6842c9590ae8da4c614b9ed05a"}, + {file = "coverage-7.10.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e201e015644e207139f7e2351980feb7040e6f4b2c2978892f3e3789d1c125e5"}, + {file = "coverage-7.10.7-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:240af60539987ced2c399809bd34f7c78e8abe0736af91c3d7d0e795df633d17"}, + {file = "coverage-7.10.7-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8421e088bc051361b01c4b3a50fd39a4b9133079a2229978d9d30511fd05231b"}, + {file = "coverage-7.10.7-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6be8ed3039ae7f7ac5ce058c308484787c86e8437e72b30bf5e88b8ea10f3c87"}, + {file = "coverage-7.10.7-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e28299d9f2e889e6d51b1f043f58d5f997c373cc12e6403b90df95b8b047c13e"}, + {file = "coverage-7.10.7-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:c4e16bd7761c5e454f4efd36f345286d6f7c5fa111623c355691e2755cae3b9e"}, + {file = "coverage-7.10.7-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:b1c81d0e5e160651879755c9c675b974276f135558cf4ba79fee7b8413a515df"}, + {file = "coverage-7.10.7-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:606cc265adc9aaedcc84f1f064f0e8736bc45814f15a357e30fca7ecc01504e0"}, + {file = "coverage-7.10.7-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:10b24412692df990dbc34f8fb1b6b13d236ace9dfdd68df5b28c2e39cafbba13"}, + {file = "coverage-7.10.7-cp310-cp310-win32.whl", hash = "sha256:b51dcd060f18c19290d9b8a9dd1e0181538df2ce0717f562fff6cf74d9fc0b5b"}, + {file = "coverage-7.10.7-cp310-cp310-win_amd64.whl", hash = "sha256:3a622ac801b17198020f09af3eaf45666b344a0d69fc2a6ffe2ea83aeef1d807"}, + {file = "coverage-7.10.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a609f9c93113be646f44c2a0256d6ea375ad047005d7f57a5c15f614dc1b2f59"}, + {file = "coverage-7.10.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:65646bb0359386e07639c367a22cf9b5bf6304e8630b565d0626e2bdf329227a"}, + {file = "coverage-7.10.7-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5f33166f0dfcce728191f520bd2692914ec70fac2713f6bf3ce59c3deacb4699"}, + {file = "coverage-7.10.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:35f5e3f9e455bb17831876048355dca0f758b6df22f49258cb5a91da23ef437d"}, + {file = "coverage-7.10.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4da86b6d62a496e908ac2898243920c7992499c1712ff7c2b6d837cc69d9467e"}, + {file = "coverage-7.10.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6b8b09c1fad947c84bbbc95eca841350fad9cbfa5a2d7ca88ac9f8d836c92e23"}, + {file = "coverage-7.10.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4376538f36b533b46f8971d3a3e63464f2c7905c9800db97361c43a2b14792ab"}, + {file = "coverage-7.10.7-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:121da30abb574f6ce6ae09840dae322bef734480ceafe410117627aa54f76d82"}, + {file = "coverage-7.10.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:88127d40df529336a9836870436fc2751c339fbaed3a836d42c93f3e4bd1d0a2"}, + {file = "coverage-7.10.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ba58bbcd1b72f136080c0bccc2400d66cc6115f3f906c499013d065ac33a4b61"}, + {file = "coverage-7.10.7-cp311-cp311-win32.whl", hash = "sha256:972b9e3a4094b053a4e46832b4bc829fc8a8d347160eb39d03f1690316a99c14"}, + {file = "coverage-7.10.7-cp311-cp311-win_amd64.whl", hash = "sha256:a7b55a944a7f43892e28ad4bc0561dfd5f0d73e605d1aa5c3c976b52aea121d2"}, + {file = "coverage-7.10.7-cp311-cp311-win_arm64.whl", hash = "sha256:736f227fb490f03c6488f9b6d45855f8e0fd749c007f9303ad30efab0e73c05a"}, + {file = "coverage-7.10.7-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7bb3b9ddb87ef7725056572368040c32775036472d5a033679d1fa6c8dc08417"}, + {file = "coverage-7.10.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:18afb24843cbc175687225cab1138c95d262337f5473512010e46831aa0c2973"}, + {file = "coverage-7.10.7-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:399a0b6347bcd3822be369392932884b8216d0944049ae22925631a9b3d4ba4c"}, + {file = "coverage-7.10.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:314f2c326ded3f4b09be11bc282eb2fc861184bc95748ae67b360ac962770be7"}, + {file = "coverage-7.10.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c41e71c9cfb854789dee6fc51e46743a6d138b1803fab6cb860af43265b42ea6"}, + {file = "coverage-7.10.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc01f57ca26269c2c706e838f6422e2a8788e41b3e3c65e2f41148212e57cd59"}, + {file = "coverage-7.10.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a6442c59a8ac8b85812ce33bc4d05bde3fb22321fa8294e2a5b487c3505f611b"}, + {file = "coverage-7.10.7-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:78a384e49f46b80fb4c901d52d92abe098e78768ed829c673fbb53c498bef73a"}, + {file = "coverage-7.10.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5e1e9802121405ede4b0133aa4340ad8186a1d2526de5b7c3eca519db7bb89fb"}, + {file = "coverage-7.10.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d41213ea25a86f69efd1575073d34ea11aabe075604ddf3d148ecfec9e1e96a1"}, + {file = "coverage-7.10.7-cp312-cp312-win32.whl", hash = "sha256:77eb4c747061a6af8d0f7bdb31f1e108d172762ef579166ec84542f711d90256"}, + {file = "coverage-7.10.7-cp312-cp312-win_amd64.whl", hash = "sha256:f51328ffe987aecf6d09f3cd9d979face89a617eacdaea43e7b3080777f647ba"}, + {file = "coverage-7.10.7-cp312-cp312-win_arm64.whl", hash = "sha256:bda5e34f8a75721c96085903c6f2197dc398c20ffd98df33f866a9c8fd95f4bf"}, + {file = "coverage-7.10.7-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:981a651f543f2854abd3b5fcb3263aac581b18209be49863ba575de6edf4c14d"}, + {file = "coverage-7.10.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:73ab1601f84dc804f7812dc297e93cd99381162da39c47040a827d4e8dafe63b"}, + {file = "coverage-7.10.7-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:a8b6f03672aa6734e700bbcd65ff050fd19cddfec4b031cc8cf1c6967de5a68e"}, + {file = "coverage-7.10.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:10b6ba00ab1132a0ce4428ff68cf50a25efd6840a42cdf4239c9b99aad83be8b"}, + {file = "coverage-7.10.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c79124f70465a150e89340de5963f936ee97097d2ef76c869708c4248c63ca49"}, + {file = "coverage-7.10.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:69212fbccdbd5b0e39eac4067e20a4a5256609e209547d86f740d68ad4f04911"}, + {file = "coverage-7.10.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7ea7c6c9d0d286d04ed3541747e6597cbe4971f22648b68248f7ddcd329207f0"}, + {file = "coverage-7.10.7-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:b9be91986841a75042b3e3243d0b3cb0b2434252b977baaf0cd56e960fe1e46f"}, + {file = "coverage-7.10.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:b281d5eca50189325cfe1f365fafade89b14b4a78d9b40b05ddd1fc7d2a10a9c"}, + {file = "coverage-7.10.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:99e4aa63097ab1118e75a848a28e40d68b08a5e19ce587891ab7fd04475e780f"}, + {file = "coverage-7.10.7-cp313-cp313-win32.whl", hash = "sha256:dc7c389dce432500273eaf48f410b37886be9208b2dd5710aaf7c57fd442c698"}, + {file = "coverage-7.10.7-cp313-cp313-win_amd64.whl", hash = "sha256:cac0fdca17b036af3881a9d2729a850b76553f3f716ccb0360ad4dbc06b3b843"}, + {file = "coverage-7.10.7-cp313-cp313-win_arm64.whl", hash = "sha256:4b6f236edf6e2f9ae8fcd1332da4e791c1b6ba0dc16a2dc94590ceccb482e546"}, + {file = "coverage-7.10.7-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:a0ec07fd264d0745ee396b666d47cef20875f4ff2375d7c4f58235886cc1ef0c"}, + {file = "coverage-7.10.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd5e856ebb7bfb7672b0086846db5afb4567a7b9714b8a0ebafd211ec7ce6a15"}, + {file = "coverage-7.10.7-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:f57b2a3c8353d3e04acf75b3fed57ba41f5c0646bbf1d10c7c282291c97936b4"}, + {file = "coverage-7.10.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1ef2319dd15a0b009667301a3f84452a4dc6fddfd06b0c5c53ea472d3989fbf0"}, + {file = "coverage-7.10.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83082a57783239717ceb0ad584de3c69cf581b2a95ed6bf81ea66034f00401c0"}, + {file = "coverage-7.10.7-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:50aa94fb1fb9a397eaa19c0d5ec15a5edd03a47bf1a3a6111a16b36e190cff65"}, + {file = "coverage-7.10.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:2120043f147bebb41c85b97ac45dd173595ff14f2a584f2963891cbcc3091541"}, + {file = "coverage-7.10.7-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:2fafd773231dd0378fdba66d339f84904a8e57a262f583530f4f156ab83863e6"}, + {file = "coverage-7.10.7-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:0b944ee8459f515f28b851728ad224fa2d068f1513ef6b7ff1efafeb2185f999"}, + {file = "coverage-7.10.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4b583b97ab2e3efe1b3e75248a9b333bd3f8b0b1b8e5b45578e05e5850dfb2c2"}, + {file = "coverage-7.10.7-cp313-cp313t-win32.whl", hash = "sha256:2a78cd46550081a7909b3329e2266204d584866e8d97b898cd7fb5ac8d888b1a"}, + {file = "coverage-7.10.7-cp313-cp313t-win_amd64.whl", hash = "sha256:33a5e6396ab684cb43dc7befa386258acb2d7fae7f67330ebb85ba4ea27938eb"}, + {file = "coverage-7.10.7-cp313-cp313t-win_arm64.whl", hash = "sha256:86b0e7308289ddde73d863b7683f596d8d21c7d8664ce1dee061d0bcf3fbb4bb"}, + {file = "coverage-7.10.7-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:b06f260b16ead11643a5a9f955bd4b5fd76c1a4c6796aeade8520095b75de520"}, + {file = "coverage-7.10.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:212f8f2e0612778f09c55dd4872cb1f64a1f2b074393d139278ce902064d5b32"}, + {file = "coverage-7.10.7-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3445258bcded7d4aa630ab8296dea4d3f15a255588dd535f980c193ab6b95f3f"}, + {file = "coverage-7.10.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bb45474711ba385c46a0bfe696c695a929ae69ac636cda8f532be9e8c93d720a"}, + {file = "coverage-7.10.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:813922f35bd800dca9994c5971883cbc0d291128a5de6b167c7aa697fcf59360"}, + {file = "coverage-7.10.7-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:93c1b03552081b2a4423091d6fb3787265b8f86af404cff98d1b5342713bdd69"}, + {file = "coverage-7.10.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:cc87dd1b6eaf0b848eebb1c86469b9f72a1891cb42ac7adcfbce75eadb13dd14"}, + {file = "coverage-7.10.7-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:39508ffda4f343c35f3236fe8d1a6634a51f4581226a1262769d7f970e73bffe"}, + {file = "coverage-7.10.7-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:925a1edf3d810537c5a3abe78ec5530160c5f9a26b1f4270b40e62cc79304a1e"}, + {file = "coverage-7.10.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2c8b9a0636f94c43cd3576811e05b89aa9bc2d0a85137affc544ae5cb0e4bfbd"}, + {file = "coverage-7.10.7-cp314-cp314-win32.whl", hash = "sha256:b7b8288eb7cdd268b0304632da8cb0bb93fadcfec2fe5712f7b9cc8f4d487be2"}, + {file = "coverage-7.10.7-cp314-cp314-win_amd64.whl", hash = "sha256:1ca6db7c8807fb9e755d0379ccc39017ce0a84dcd26d14b5a03b78563776f681"}, + {file = "coverage-7.10.7-cp314-cp314-win_arm64.whl", hash = "sha256:097c1591f5af4496226d5783d036bf6fd6cd0cbc132e071b33861de756efb880"}, + {file = "coverage-7.10.7-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:a62c6ef0d50e6de320c270ff91d9dd0a05e7250cac2a800b7784bae474506e63"}, + {file = "coverage-7.10.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:9fa6e4dd51fe15d8738708a973470f67a855ca50002294852e9571cdbd9433f2"}, + {file = "coverage-7.10.7-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:8fb190658865565c549b6b4706856d6a7b09302c797eb2cf8e7fe9dabb043f0d"}, + {file = "coverage-7.10.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:affef7c76a9ef259187ef31599a9260330e0335a3011732c4b9effa01e1cd6e0"}, + {file = "coverage-7.10.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6e16e07d85ca0cf8bafe5f5d23a0b850064e8e945d5677492b06bbe6f09cc699"}, + {file = "coverage-7.10.7-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:03ffc58aacdf65d2a82bbeb1ffe4d01ead4017a21bfd0454983b88ca73af94b9"}, + {file = "coverage-7.10.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:1b4fd784344d4e52647fd7857b2af5b3fbe6c239b0b5fa63e94eb67320770e0f"}, + {file = "coverage-7.10.7-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:0ebbaddb2c19b71912c6f2518e791aa8b9f054985a0769bdb3a53ebbc765c6a1"}, + {file = "coverage-7.10.7-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:a2d9a3b260cc1d1dbdb1c582e63ddcf5363426a1a68faa0f5da28d8ee3c722a0"}, + {file = "coverage-7.10.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a3cc8638b2480865eaa3926d192e64ce6c51e3d29c849e09d5b4ad95efae5399"}, + {file = "coverage-7.10.7-cp314-cp314t-win32.whl", hash = "sha256:67f8c5cbcd3deb7a60b3345dffc89a961a484ed0af1f6f73de91705cc6e31235"}, + {file = "coverage-7.10.7-cp314-cp314t-win_amd64.whl", hash = "sha256:e1ed71194ef6dea7ed2d5cb5f7243d4bcd334bfb63e59878519be558078f848d"}, + {file = "coverage-7.10.7-cp314-cp314t-win_arm64.whl", hash = "sha256:7fe650342addd8524ca63d77b2362b02345e5f1a093266787d210c70a50b471a"}, + {file = "coverage-7.10.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fff7b9c3f19957020cac546c70025331113d2e61537f6e2441bc7657913de7d3"}, + {file = "coverage-7.10.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bc91b314cef27742da486d6839b677b3f2793dfe52b51bbbb7cf736d5c29281c"}, + {file = "coverage-7.10.7-cp39-cp39-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:567f5c155eda8df1d3d439d40a45a6a5f029b429b06648235f1e7e51b522b396"}, + {file = "coverage-7.10.7-cp39-cp39-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2af88deffcc8a4d5974cf2d502251bc3b2db8461f0b66d80a449c33757aa9f40"}, + {file = "coverage-7.10.7-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c7315339eae3b24c2d2fa1ed7d7a38654cba34a13ef19fbcb9425da46d3dc594"}, + {file = "coverage-7.10.7-cp39-cp39-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:912e6ebc7a6e4adfdbb1aec371ad04c68854cd3bf3608b3514e7ff9062931d8a"}, + {file = "coverage-7.10.7-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:f49a05acd3dfe1ce9715b657e28d138578bc40126760efb962322c56e9ca344b"}, + {file = "coverage-7.10.7-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:cce2109b6219f22ece99db7644b9622f54a4e915dad65660ec435e89a3ea7cc3"}, + {file = "coverage-7.10.7-cp39-cp39-musllinux_1_2_riscv64.whl", hash = "sha256:f3c887f96407cea3916294046fc7dab611c2552beadbed4ea901cbc6a40cc7a0"}, + {file = "coverage-7.10.7-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:635adb9a4507c9fd2ed65f39693fa31c9a3ee3a8e6dc64df033e8fdf52a7003f"}, + {file = "coverage-7.10.7-cp39-cp39-win32.whl", hash = "sha256:5a02d5a850e2979b0a014c412573953995174743a3f7fa4ea5a6e9a3c5617431"}, + {file = "coverage-7.10.7-cp39-cp39-win_amd64.whl", hash = "sha256:c134869d5ffe34547d14e174c866fd8fe2254918cc0a95e99052903bc1543e07"}, + {file = "coverage-7.10.7-py3-none-any.whl", hash = "sha256:f7941f6f2fe6dd6807a1208737b8a0cbcf1cc6d7b07d24998ad2d63590868260"}, + {file = "coverage-7.10.7.tar.gz", hash = "sha256:f4ab143ab113be368a3e9b795f9cd7906c5ef407d6173fe9675a902e1fffc239"}, ] [package.dependencies] @@ -253,27 +265,27 @@ toml = ["tomli"] [[package]] name = "desktop-entry-lib" -version = "5.0" +version = "3.2" description = "A library for working with .desktop files" optional = false -python-versions = ">=3.10" +python-versions = ">=3.9" files = [ - {file = "desktop_entry_lib-5.0-py3-none-any.whl", hash = "sha256:e60a0c2c5e42492dbe5378e596b1de87d1b1c4dc74d1f41998a164ee27a1226f"}, - {file = "desktop_entry_lib-5.0.tar.gz", hash = "sha256:9a621bac1819fe21021356e41fec0ac096ed56e6eb5dcfe0639cd8654914b864"}, + {file = "desktop-entry-lib-3.2.tar.gz", hash = "sha256:12189249f86dde52d055ac28897ad1ed14ef965407a50fb3ad4ac6cb1a7e8cde"}, + {file = "desktop_entry_lib-3.2-py3-none-any.whl", hash = "sha256:600748b2aab2cafbb3ebc08b5c1ded024d66e0756868b6d26b5aff44d336c4b5"}, ] [package.extras] -xdg-desktop-portal = ["jeepney"] +test = ["pyfakefs", "pytest", "pytest-cov"] [[package]] name = "exceptiongroup" -version = "1.3.1" +version = "1.3.0" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.3.1-py3-none-any.whl", hash = "sha256:a7a39a3bd276781e98394987d3a5701d0c4edffb633bb7a5144577f82c773598"}, - {file = "exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219"}, + {file = "exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10"}, + {file = "exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88"}, ] [package.dependencies] @@ -298,30 +310,15 @@ all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2 [[package]] name = "iniconfig" -version = "2.3.0" +version = "2.1.0" description = "brain-dead simple config-ini parsing" optional = false -python-versions = ">=3.10" +python-versions = ">=3.8" files = [ - {file = "iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12"}, - {file = "iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730"}, + {file = "iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760"}, + {file = "iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7"}, ] -[[package]] -name = "markdown" -version = "3.10" -description = "Python implementation of John Gruber's Markdown." -optional = false -python-versions = ">=3.10" -files = [ - {file = "markdown-3.10-py3-none-any.whl", hash = "sha256:b5b99d6951e2e4948d939255596523444c0e677c669700b1d17aa4a8a464cb7c"}, - {file = "markdown-3.10.tar.gz", hash = "sha256:37062d4f2aa4b2b6b32aefb80faa300f82cc790cb949a35b8caede34f2b68c0e"}, -] - -[package.extras] -docs = ["mdx_gh_links (>=0.2)", "mkdocs (>=1.6)", "mkdocs-gen-files", "mkdocs-literate-nav", "mkdocs-nature (>=0.6)", "mkdocs-section-index", "mkdocstrings[python]"] -testing = ["coverage", "pyyaml"] - [[package]] name = "packaging" version = "25.0" @@ -380,57 +377,57 @@ tomli = {version = "*", markers = "python_version < \"3.11\""} [[package]] name = "pyside6" -version = "6.10.1" +version = "6.10.0" description = "Python bindings for the Qt cross-platform application and UI framework" optional = false -python-versions = "<3.15,>=3.9" +python-versions = "<3.14,>=3.9" files = [ - {file = "pyside6-6.10.1-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:d0e70dd0e126d01986f357c2a555722f9462cf8a942bf2ce180baf69f468e516"}, - {file = "pyside6-6.10.1-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:4053bf51ba2c2cb20e1005edd469997976a02cec009f7c46356a0b65c137f1fa"}, - {file = "pyside6-6.10.1-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:7d3ca20a40139ca5324a7864f1d91cdf2ff237e11bd16354a42670f2a4eeb13c"}, - {file = "pyside6-6.10.1-cp39-abi3-win_amd64.whl", hash = "sha256:9f89ff994f774420eaa38cec6422fddd5356611d8481774820befd6f3bb84c9e"}, - {file = "pyside6-6.10.1-cp39-abi3-win_arm64.whl", hash = "sha256:9c5c1d94387d1a32a6fae25348097918ef413b87dfa3767c46f737c6d48ae437"}, + {file = "pyside6-6.10.0-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:c2cbc5dc2a164e3c7c51b3435e24203e90e5edd518c865466afccbd2e5872bb0"}, + {file = "pyside6-6.10.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:ae8c3c8339cd7c3c9faa7cc5c52670dcc8662ccf4b63a6fed61c6345b90c4c01"}, + {file = "pyside6-6.10.0-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:9f402f883e640048fab246d36e298a5e16df9b18ba2e8c519877e472d3602820"}, + {file = "pyside6-6.10.0-cp39-abi3-win_amd64.whl", hash = "sha256:70a8bcc73ea8d6baab70bba311eac77b9a1d31f658d0b418e15eb6ea36c97e6f"}, + {file = "pyside6-6.10.0-cp39-abi3-win_arm64.whl", hash = "sha256:4b709bdeeb89d386059343a5a706fc185cee37b517bda44c7d6b64d5fdaf3339"}, ] [package.dependencies] -PySide6_Addons = "6.10.1" -PySide6_Essentials = "6.10.1" -shiboken6 = "6.10.1" +PySide6_Addons = "6.10.0" +PySide6_Essentials = "6.10.0" +shiboken6 = "6.10.0" [[package]] name = "pyside6-addons" -version = "6.10.1" +version = "6.10.0" description = "Python bindings for the Qt cross-platform application and UI framework (Addons)" optional = false -python-versions = "<3.15,>=3.9" +python-versions = "<3.14,>=3.9" files = [ - {file = "pyside6_addons-6.10.1-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:4d2b82bbf9b861134845803837011e5f9ac7d33661b216805273cf0c6d0f8e82"}, - {file = "pyside6_addons-6.10.1-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:330c229b58d30083a7b99ed22e118eb4f4126408429816a4044ccd0438ae81b4"}, - {file = "pyside6_addons-6.10.1-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:56864b5fecd6924187a2d0f7e98d968ed72b6cc267caa5b294cd7e88fff4e54c"}, - {file = "pyside6_addons-6.10.1-cp39-abi3-win_amd64.whl", hash = "sha256:b6e249d15407dd33d6a2ffabd9dc6d7a8ab8c95d05f16a71dad4d07781c76341"}, - {file = "pyside6_addons-6.10.1-cp39-abi3-win_arm64.whl", hash = "sha256:0de303c0447326cdc6c8be5ab066ef581e2d0baf22560c9362d41b8304fdf2db"}, + {file = "pyside6_addons-6.10.0-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:88e61e21ee4643cdd9efb39ec52f4dc1ac74c0b45c5b7fa453d03c094f0a8a5c"}, + {file = "pyside6_addons-6.10.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:08d4ed46c4c9a353a9eb84134678f8fdd4ce17fb8cce2b3686172a7575025464"}, + {file = "pyside6_addons-6.10.0-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:15d32229d681be0bba1b936c4a300da43d01e1917ada5b57f9e03a387c245ab0"}, + {file = "pyside6_addons-6.10.0-cp39-abi3-win_amd64.whl", hash = "sha256:99d93a32c17c5f6d797c3b90dd58f2a8bae13abde81e85802c34ceafaee11859"}, + {file = "pyside6_addons-6.10.0-cp39-abi3-win_arm64.whl", hash = "sha256:92536427413f3b6557cf53f1a515cd766725ee46a170aff57ad2ff1dfce0ffb1"}, ] [package.dependencies] -PySide6_Essentials = "6.10.1" -shiboken6 = "6.10.1" +PySide6_Essentials = "6.10.0" +shiboken6 = "6.10.0" [[package]] name = "pyside6-essentials" -version = "6.10.1" +version = "6.10.0" description = "Python bindings for the Qt cross-platform application and UI framework (Essentials)" optional = false -python-versions = "<3.15,>=3.9" +python-versions = "<3.14,>=3.9" files = [ - {file = "pyside6_essentials-6.10.1-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:cd224aff3bb26ff1fca32c050e1c4d0bd9f951a96219d40d5f3d0128485b0bbe"}, - {file = "pyside6_essentials-6.10.1-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:e9ccbfb58c03911a0bce1f2198605b02d4b5ca6276bfc0cbcf7c6f6393ffb856"}, - {file = "pyside6_essentials-6.10.1-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:ec8617c9b143b0c19ba1cc5a7e98c538e4143795480cb152aee47802c18dc5d2"}, - {file = "pyside6_essentials-6.10.1-cp39-abi3-win_amd64.whl", hash = "sha256:9555a48e8f0acf63fc6a23c250808db841b28a66ed6ad89ee0e4df7628752674"}, - {file = "pyside6_essentials-6.10.1-cp39-abi3-win_arm64.whl", hash = "sha256:4d1d248644f1778f8ddae5da714ca0f5a150a5e6f602af2765a7d21b876da05c"}, + {file = "pyside6_essentials-6.10.0-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:003e871effe1f3e5b876bde715c15a780d876682005a6e989d89f48b8b93e93a"}, + {file = "pyside6_essentials-6.10.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:1d5e013a8698e37ab8ef360e6960794eb5ef20832a8d562e649b8c5a0574b2d8"}, + {file = "pyside6_essentials-6.10.0-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:b1dd0864f0577a448fb44426b91cafff7ee7cccd1782ba66491e1c668033f998"}, + {file = "pyside6_essentials-6.10.0-cp39-abi3-win_amd64.whl", hash = "sha256:fc167eb211dd1580e20ba90d299e74898e7a5a1306d832421e879641fc03b6fe"}, + {file = "pyside6_essentials-6.10.0-cp39-abi3-win_arm64.whl", hash = "sha256:6dd0936394cb14da2fd8e869899f5e0925a738b1c8d74c2f22503720ea363fb1"}, ] [package.dependencies] -shiboken6 = "6.10.1" +shiboken6 = "6.10.0" [[package]] name = "pytest" @@ -534,153 +531,147 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "shiboken6" -version = "6.10.1" +version = "6.10.0" description = "Python/C++ bindings helper module" optional = false -python-versions = "<3.15,>=3.9" +python-versions = "<3.14,>=3.9" files = [ - {file = "shiboken6-6.10.1-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:9f2990f5b61b0b68ecadcd896ab4441f2cb097eef7797ecc40584107d9850d71"}, - {file = "shiboken6-6.10.1-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:f4221a52dfb81f24a0d20cc4f8981cb6edd810d5a9fb28287ce10d342573a0e4"}, - {file = "shiboken6-6.10.1-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:c095b00f4d6bf578c0b2464bb4e264b351a99345374478570f69e2e679a2a1d0"}, - {file = "shiboken6-6.10.1-cp39-abi3-win_amd64.whl", hash = "sha256:c1601d3cda1fa32779b141663873741b54e797cb0328458d7466281f117b0a4e"}, - {file = "shiboken6-6.10.1-cp39-abi3-win_arm64.whl", hash = "sha256:5cf800917008587b551005a45add2d485cca66f5f7ecd5b320e9954e40448cc9"}, + {file = "shiboken6-6.10.0-cp39-abi3-macosx_13_0_universal2.whl", hash = "sha256:7a5f5f400ebfb3a13616030815708289c2154e701a60b9db7833b843e0bee543"}, + {file = "shiboken6-6.10.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:e612734da515d683696980107cdc0396a3ae0f07b059f0f422ec8a2333810234"}, + {file = "shiboken6-6.10.0-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:b01377e68d14132360efb0f4b7233006d26aa8ae9bb50edf00960c2a5f52d148"}, + {file = "shiboken6-6.10.0-cp39-abi3-win_amd64.whl", hash = "sha256:0bc5631c1bf150cbef768a17f5f289aae1cb4db6c6b0c19b2421394e27783717"}, + {file = "shiboken6-6.10.0-cp39-abi3-win_arm64.whl", hash = "sha256:dfc4beab5fec7dbbebbb418f3bf99af865d6953aa0795435563d4cbb82093b61"}, ] [[package]] name = "sqlcipher3-wheels" -version = "0.5.6" +version = "0.5.5.post0" description = "DB-API 2.0 interface for SQLCipher 3.x" optional = false python-versions = "*" files = [ - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e16c8caf59e86589fb5f52253420db07121f1f96e2a12e244f6fdcaf8b946530"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:337f2e059114729dd1529ee356c98e2aa06440d6a9772917514a3bda0647c61c"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f6bd900658446e1cdeebda0760adb9a89f55888b460623db88b100845cb51bc2"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:dc6fcca569858145cb5ba3c878997d1788973e36f689090178f807b9a44d9ca6"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-manylinux_2_28_i686.whl", hash = "sha256:eef50cc39554ad1fb82faa33d25c7f3cb11e2f7087b41109bc169db2c942f0c7"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:0fc36fc67f639a0e03cf6f7c6a5d1bc5cdd8005e8e07da3b21c54d4d81ed353b"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:53d0b861668d6847c7cc0dc7b443263b95a5cd211bcc326a457bd3122ebbb5a0"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:10aef293397a4ab25d8346ba5f96181214ab9c6a8836d83320cf23a2ad773a2c"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:1105e7edba36a29625a824bff0eca3685c1cf6e391182b85a9a73b4b1604eef3"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:5db9b4035e42a27672abbe75120908c74a235a496cd92b4c685fda1e95e9b19c"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:f9e3fb5e96c5067a8cfd7b2fa7d939e529e30439058bbc15d0e9adca5e4cff1b"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:6f3c1a8a4a2c04225f5159cf7f1c315101a89271afbaef4205c6fc50766c5535"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:fc0504a1dbe6d478614ef55eb80d0c02ead24bc91f34b41c07d404452389f42d"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-win32.whl", hash = "sha256:05ef2b35f176e3b29092ec9aa03b09f4803feddbabdc2174e7ccc608758f2beb"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-win_amd64.whl", hash = "sha256:0f6873e4badf64eb8c5771c9e8a726df46ac663bc8051dfefb51fe2a46358b37"}, - {file = "sqlcipher3_wheels-0.5.6-cp310-cp310-win_arm64.whl", hash = "sha256:9fd30c1cffa10f63f504a33494564efc0e0a475bbf069487016a9d2462d115e5"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a6c511bacd40ba769368b1abbf97fbefb285f525e6d2a399a704c22ba2aae37f"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:aa25610cda2b2a1b1cefddbd93488e939cf0059480f2fda5a8704acddd0e8935"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5a5258fb99e99b6fda6f011a0a4094ff99fe2e9b9ac7ce81cf646e0e779829a3"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:459836d52904fa006bf36e2144959bd21577c32947fdd173db50b037108a8620"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:5b36f9949f4d35c72f0626aaac109b17688c1d6a9a6e11de2538b4cfc32cfad0"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:87301b545556a1811780bb6fc6480ab1f2640d1d5b5e5e33ed404559ae383647"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:fcc4705b5b7bd3508d08a6389a45e14591071a3e575c2864c9c1c615df89e0da"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:0a231eb677a8246c47e423c710198631850c0a090e8f02a7fb1ad266ba517c56"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:71ef871c65ad7c61048acb4f57da29bc0d5e35874183006222c229b5f1f64c73"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c3480298c9bc4117207535636fe74b01b4860ecd74a028c73b42f5f0ddaa8661"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:d48cf218ed13f17e3037564f08fba7ddf2c260dac7993e3d4ac58ee30483f115"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:ff57a80904b9bd55e18774cb59bffacad06e196298381ee576ce683d1c09b032"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:50978685717cd9293ff5508c192695a894879f9faed5142d0e8d7b63310f87c2"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-win32.whl", hash = "sha256:24207dbb699ca68fc5fc7248385fdf33a92fb1e17a6ea88d3cf2345a18fb29ff"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-win_amd64.whl", hash = "sha256:40b1f8188a0aa5bbec354a12561b014b43a6a0d0a0d230a8a9378ed7b826b0ec"}, - {file = "sqlcipher3_wheels-0.5.6-cp311-cp311-win_arm64.whl", hash = "sha256:107ef02bbd0f2ffb39a564c14ebf3bedfa4569949a0d72ec8e106f754d715b7c"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:59a572b18d1ef8318e9f583a7b3e1a67b4b04ed4b783c3f29fa806635274d12a"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:32dfb8903b24db5879b1f922114f650bc6a15df9d071c55eefeb6937e13b2d20"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2f5770257736c43cbf910a22f74c1490ef1ecde0432e475904f038e64ffdacb0"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:c33f99ddfe08c0f34807046800e510316b8bac2974b3c5fb9ecb1ee25c391ac8"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:97d4c000deeb72c2421f555f3e55a8c161ddfb0499caabf60df2bfde6460a5fc"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:67d9889028b4adfcaecd32e1e60330e1764c209ad12438f0eec2a5145ebf4a2d"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:00cf178b15da486ab43ee2bed41edb1b393c5cfe2a48cae68893a2b31260dbd3"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:95bfa4c5ffdd72d9d8676c913d585b7885a42824824cf1d9e93d3669f01492dd"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:030ab50a8f4153cfe8dd5c98724909b210243af2350b9c79914838905a99518e"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:5dc3c3d9deea654f8ea9c1dbc7bc90561331e4da9c7055381fac6498ca7267a3"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8cc986e8aa89e5a4a30b4eb8fd841d913a4e22ada99ec42be83f69bde3d86a31"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:a41f0d30fa63d8db915566ec6987e68f064d96052cd6492ed8384b3e4807e60b"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f32fefe8a41e68334c545465813782fd45ef5cfe1082d012d95514c8a78e8015"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-win32.whl", hash = "sha256:ac2332f44758794a2fa19c77b824853e2a57ce5c27cc71c61066a52845be22d0"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-win_amd64.whl", hash = "sha256:6f016ba5a2a531938f332a234865dfc25d3a69abc169c3bf1d5c06c3c3f24601"}, - {file = "sqlcipher3_wheels-0.5.6-cp312-cp312-win_arm64.whl", hash = "sha256:101ce0f7403801b6988d1f6c94244900e0f6c5378666e0ffd74b300687a6f9ef"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:94527fa3994c0fa1275c23d9fbb02512aacc675f1e45f566c660f4f9d5376e75"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0920a4b24362522ba83b36a47495d174221361213207191c325749a621fabeca"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5061b07b121ebd76aa697755b1b8f642cc3a27a0f6d392180ab249b35f1c2394"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:79de8511bb1fec62128e1b366cdc0cbd2ad1d725f3e29f9c91e96946a3c67945"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:4b92c2f35bb8153cc20bcfc651536f51cc1194403782c542a852497ac789cbe2"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:2d55211e3d2addff8a2df7335927d7fe6d75aa9ed12b396a22a5a0bfe2773ed9"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:8cb31de5d67799cc2bba92f23adc10281d66c2c16ca6418b94d80500a164aa60"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:123796de3e471db5ed8b4ee4f97ec562ad38347ad678dad71133eade280202e0"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b6d34fabacfad4f301a22b5d8466d7ee3481f735bdb327d8756f04c81d3516c4"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:91b02fc765485c5b65f2a3eacfd2e16059253e007d0b5a5f24bba5fcea9032dd"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:13db7f23c553ffdd35f6e3b26415bdb9f100dcf89038873965caef769e8f1af5"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:4ba79a81cd591d32a3a225e3e9b50a9871324d0e414fb6d0866049d8820e4e46"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f97be07997681ca90fb339d5411fcb957bd7cbe810389404baed207cb366badd"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-win32.whl", hash = "sha256:9e56e0a7aa778da3d46323fc1233da5dcede795a6c7fe4c11980fec0ce8c3fe3"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-win_amd64.whl", hash = "sha256:744845e4aa3cc614590f967aa1d38cc5d549177a2a83ed68c1821b5fb0505f8a"}, - {file = "sqlcipher3_wheels-0.5.6-cp313-cp313-win_arm64.whl", hash = "sha256:c92de0b940533ca3a5b43a45d0768e0698b6ca95020b2fd47ec269b6bfc228d1"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:a3f558df797aabf51680b3fbce48c4b3df89c36ad7fcaa3886b2ed8057aa2786"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:7e216586720663960c82f046c495ef6d828e8e95c8fcf4c767b555fb9b8feead"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:3e4ef70d3af8ebe6ababe8eff93b8bd4ad288d0a38ab29a2420c91d636fbfe14"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:11e34aac6cb7e29d23e339c5de9e87700ddf09886e104640578b5afb566a2c50"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-manylinux_2_28_i686.whl", hash = "sha256:79e220312a075546e6be0a6062dda6315857b1478d78f97eb352f1383dde8ce2"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-manylinux_2_28_ppc64le.whl", hash = "sha256:b953af7b57867bcffeeab59681921671615ae4b42fd0a9234ad0be7e0e43dfd4"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-manylinux_2_28_s390x.whl", hash = "sha256:130ac318dbcb3a51a4377b0bf3e450c6c21d508a8b00d2d9d4b3ee6a46ab3595"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:5154c8022e58722987522ddce30f19fb69d6f8f6314959100d9f37c3dc5cba5b"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:bb4f91d1f5b7b927aa00a8d83724c58875d9d0e47bd81ca40445090ab521b5fa"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:e1c140bfa6b0a7e08f414f2a9f8f529f7d8c4cfa8386ce588e6c747c4ccc6615"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:18fc56dfb32c6ce370d929897205027f78275c32446d6b1be712d462789ae8c2"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:c03ec5e058fbf3fd94ecd8e0448834e8e7f46418eaec5fe5c7a0982c6e62c13f"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:08756c1b25aebabb25a55dfe6f323876caea0c69511e34553807ae1d7ab843dd"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-win32.whl", hash = "sha256:bdbc58d224d27c002aed8a6361b43f3651943ecbfac69cd2674bbe681cf83790"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-win_amd64.whl", hash = "sha256:dcc313f4519922c1ec3406b010d53f700750c1cf5331b9633a3c8b196307e852"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314-win_arm64.whl", hash = "sha256:dc1f0c77cc0395680176913a1d634a4014a1ebf02e7a7b2ac03a180b44241842"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:fc30e82d2b8f139ac1ab81a3b3d9a59da8e3ce3b1e753285727480667efd5417"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:f11d1d2c41141dd95f7d45f03dbe9f69a6427463e69db50609d83c0cd29980b5"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:92beff11fd9683941de7b47b8fc280e834b135ba7966d139b0ce2159b551ebad"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:3060403647df7d44844c2808a384e4c4cf4a2a1b65e509a8016aca971c08ad39"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-manylinux_2_28_i686.whl", hash = "sha256:9380de7e8fc952f376c9dae9ba1cdbb6a24ff5e41fd8f3b3cf39f1e305ed3248"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:9a26be381b0fb1c8d4fcdfd48182c78217ae9458513e4fe51b5045d4f94d41cb"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-manylinux_2_28_s390x.whl", hash = "sha256:c3be08f8d81372a6d084062f969f88be0b942ac449b0ac01825b853c12705421"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:c5bd4abbebc15f8a2a9a653500cd1abeb3aac13887fcc83de31ca40fce32e3a2"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:4bb3c2c8e9a1e16455b989b2c7598b8053029bcbb519dc22601fa82bc8896f89"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:aac8ca9d2b4e18637e61ea1d8193500a1186f0b113b9224dc74186190f41c8e7"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:3f237a41c3f08e69f2532aec29a2589097baa73886164537d90c744d3d2eb3b3"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:e6e59c3e0301cb04351b1cb12231aaadb40f56f779fb50a7857c6b4ed4c57297"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba2296a608081f4474f4447658a1e032d0b5506153baf68233471afde1463da9"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-win32.whl", hash = "sha256:8c8edfbd38a49ebbec2d1d56a000a499da2ac80b00488c156a1e0b8a7b8c10c6"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-win_amd64.whl", hash = "sha256:21df85bc14d5d86225c1e7466ff65cbcc10f0d1d4f466823b4534c4c0564554c"}, - {file = "sqlcipher3_wheels-0.5.6-cp314-cp314t-win_arm64.whl", hash = "sha256:64df3e807fb0e6d89c1e90ce7c900bb82b695c474e1a0945a5f92862cac8b63d"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3784b22a29e4a675b456ca6ff1841d61e0eb97a28d0ba23d3d8cb5fe6da88238"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e27881be24f03d8a67a6db763f5671aaa05205de2380b1793b5e20bdabe49fba"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:667b6eec50ed03111676a0f4565be133643c9ad8bc88e6eea1c96b2af590c417"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:4eaaa5cf77b125e05908b1200681e2988b1a6a307c7e677967053a1e4b07fba5"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-manylinux_2_28_i686.whl", hash = "sha256:4ead5b8f2607718548c8571e4a89fe735dd53443a2b5e42d8147eecd11b0d94b"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-manylinux_2_28_ppc64le.whl", hash = "sha256:d82a8a7b478d23368320ad185533d063ec14d11a1d188f07ace513a66bfa9580"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-manylinux_2_28_s390x.whl", hash = "sha256:39d871ee8c13d9b0326b24a02e5af21a7b1c8fb5e6f6f4ec62b935392202ec69"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:5a8737683621c2917a4ee9ff774e597a368c5b3d23f08ae53897d6bd1f8bfc0e"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:08b6922d5020384fa641c8dc416f6f2b143110c86dcf3aae086e7ce15b192eae"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:f9dcc7f830ec56c090884a83be265c51c0a4fd60bb033b000c69c3bee08d77d8"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:0848f628b1528dd6a19a36679d8cde4b6f1f8d288757ba2e3df5578b79d79e90"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:1476bb15586ce27ea5fae7c54469b2be4efe51ca9cefa20871a6c394a18892cc"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:de17d373d9e7807236013950f598bf59b9ed7c375938fdb95378a7114e55ff95"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-win32.whl", hash = "sha256:02fa9e7f98a8e9be871219014b9ac015ba630b51615d90a2c06d45547a4b0cf1"}, - {file = "sqlcipher3_wheels-0.5.6-cp38-cp38-win_amd64.whl", hash = "sha256:6b2d7daab225c578aec8109fde99624f281b4ccdc6c53c8cd8feb86d8e7d3cf2"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:abef5e28b4d1ca518291a8ca27af1cf9e4d68dd4a264d83874ec4d0a69589395"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cd4c12a5a60cbd533ba4a3b4131d23302283ba597739c7867066b4efefe178db"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4b7672837f1b9a6a67e375b743d74371d0428ead79ff367591145d06f3711c96"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:61c33e2697b0d91f3cbe806104e1d5b93961d3ab55ba55ee53bb36efe83c9933"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-manylinux_2_28_i686.whl", hash = "sha256:2e6eb09782dd719a1bb34af6e5ef25e5713c1f806231b472fcf64eb9288957af"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-manylinux_2_28_ppc64le.whl", hash = "sha256:6469b756ced0293e74806db2f114e5307cd4b05a559e986d3cc0b2eeb1eb8153"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-manylinux_2_28_s390x.whl", hash = "sha256:b6492f9bcb9296ac2179b5c9f7e7f329449b580836c0e8e5cfc2f3fe9af3486c"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:2e4968d98917309463f02e4a48abebd95ed3d37968346f2693ed8a08e2fe9794"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:50214729697a1ee9e7603ba62b8ea46d78903ae1332caaa94fbaedde113944b7"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:1ec9fd1dd5774d665903b8ba2e3e4f8ed72879dc42f6e9b2815040f0cb2d8ccd"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:ced8ab30d205c8b6225b5703885576e629266767b091158731ec76c8c490bef4"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:3c7242a267dd802fee273084a5707a95d02df4102afbea133c8f716234c7edcc"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:7a6c239d15085af4b0f3433fa274c1fc37369509b99a7c035a359d5142a0536d"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-win32.whl", hash = "sha256:cc29963df04a73d8420a4d023ba016c9013d86378969d8a11fe2148477282936"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-win_amd64.whl", hash = "sha256:38cc7bb3a371c4a5fe7f4236a409e64f1286796d780833243f9e15ef852f159d"}, - {file = "sqlcipher3_wheels-0.5.6-cp39-cp39-win_arm64.whl", hash = "sha256:186e49af3ddb98d260b95d436eaf58f2125712c268c8475627129c1f80a68164"}, - {file = "sqlcipher3_wheels-0.5.6.tar.gz", hash = "sha256:1d232c14be44db95a7f3018433cae01ecd18803fa2468fce3cc45ebd5e034942"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:836cff85673ab9bdfe0f3e2bc38aefddb5f3a4c0de397b92f83546bb94ea38aa"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a3fde9076a8810d19044f65fdfeeee5a9d044176ce91adc2258c8b18cb945474"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8ad3ccb27f3fc9260b1bcebfd33fc5af1c2a1bf6a50e8e1bf7991d492458b438"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94bb8ab8cf7ae3dc0d51dcb75bf242ae4bd2f18549bfc975fd696c181e9ea8ca"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:df0bf0a169b480615ea2021e7266e1154990762216d1fd8105b93d1fee336f49"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:79cc1af145345e9bd625c961e4efc8fc6c6eefcaec90fbcf1c6b981492c08031"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0d8b9f1c6d283acc5a0da16574c0f7690ba5b14cb5935f3078ccf8404a530075"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:952a23069a149a192a5eb8a9e552772b38c012825238175bc810f445a3aa8000"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:24f1a57a4aa18d9ecd38cfce69dd06e58cfb521151a8316e18183e603e7108f4"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:6568c64adc55f9882ba36c11a446810bd5d4c03796aab8ecb9024f3bca9eb2cd"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:26c2b58d2f2a9dd23ad4c310fb6c0f0c82ca4f36a0d4177a70f0efeb332798ee"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:46827ffc7e705c5ecdf23ec69f56dd55b20857dc3c3c4893e360de8a38b4e708"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:4033bbe2f0342936736ce7b8b2626f532509315576d5376764b410deae181cad"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-win32.whl", hash = "sha256:bfb26dbba945860427bd3f82c132e6d2ef409baa062d315b952dd5a930b25870"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-win_amd64.whl", hash = "sha256:168270b8fb295314aa4ee9f74435ceee42207bd16fe908f646a829b3a9daedad"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp310-cp310-win_arm64.whl", hash = "sha256:1f1bb2c4c6defa812eb0238055a283cf3c2f400e956a57c25cf65cbdbac6783f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:55d557376a90f14baf0f35e917f8644c3a8cf48897947fcd7ecf51d490dd689f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0f1739264a971901088fe1670befb8a8a707543186c8eecc58158ca287e309b2"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:920e19345b6c5335b61e9fbed2625f96dbc3b0269ab5120baeae2c9288f0be01"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6462734f6d0703f863f5968419d229de75bbf2a829f762bfb257b6df2355f977"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c397305b65612da76f254c692ff866571aa98fd3817ed0e40fce6d568d704966"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cf3467fe834075b58215c50f9db7355ef86a73d256ac8ba5fffb8c946741a5dc"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a76d783c095a3c95185757c418e3bad3eab69cbf986970d422cce5431e84d7f5"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8bf8d78895ee0f04dc525942a1f40796fa7c3d7d7fb36c987f55c243ce34192d"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d583a10dbe9a1752968788c2d6438461ec7068608ceaa72e6468d80727c3152e"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8c3156b39bb8f24dfbe17a49126d8fa404b00c01d7aa84e64a2293db1dae1a38"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:15c3cf77b31973aa008174518fa439d8620a093964c2d9edcb8d23d543345839"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:f5743db0f3492359c2ab3a56b6bed00ecba193f2c75c74e8e3d78a45f1eb7c95"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:cc40a213a3633f19c96432304a16f0cff7c4aeca1a3d2042d4be36e576e64a70"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-win32.whl", hash = "sha256:433456ce962ae50887d6428d55bad46e5748a2cdd3d036180eb0bcdbe8bae9f9"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-win_amd64.whl", hash = "sha256:ca4332b1890cc4f80587be8bd529e20475bd3291e07f11115b1fc773947b264a"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp311-cp311-win_arm64.whl", hash = "sha256:a4634300cb2440baf17a78d6481d10902de4a2a6518f83a5ab2fe081e6b20b42"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:bc8df43c11d767c6aac5cc300c1957356a9fd1b25f1946891003cf20a0146241"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:797653f08ecffcef2948dfd907fb20dab402d9efde6217c96befafc236e96c5b"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:dca428fde0d1a522473f766465324d6539d324f219f4f7c159a3eb0d4f9983c5"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48e97922240a04b44637eabf39f86d243fe61fe7db1bd2ad219eb4053158f263"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8d3a366e52a6732b1ccff14f9ca77ecbee53abfce87c417bf05d4301484584f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dce28a2431260251d7acf253ea1950983e48dfec64245126b39a770d5a88f507"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ea64cce27152cae453c353038336bda0dc1f885e5e8e30b5cd28b8c9b498bbeb"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:02d9e6120a496f083c525efc34408d4f2ca282da05bebcc967a0aa1e12a0d6ca"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:875cfc61bbf694b8327c2485e5ed40573e8b715f4e583502f12c51c8d5a92dd5"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0e9ed3ff9c00ba3888f8dbc0c7c84377ef66f21c5f4ac373fc690dcf5e9bd594"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:08ad6d767502429e497b6d03b5ae11e43e896d36f05ac8e60c12d8f124378bc1"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:ecdefdcf7ab8cb14b3147a59af83e8e3e5e3bed46fc43ab86a657f5c306a83d2"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:75ffe5677407bf20a32486eb6facfbb07a353ce7c9aecc9fefd4e9d3275605d7"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-win32.whl", hash = "sha256:97b6c6556b430b5c0dff53e8f709f90ba53294c2a3958a8c38f573c6dbf467d9"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-win_amd64.whl", hash = "sha256:248cae211991f1ffb3a885a1223e62abee70c6c208fc2224a8dbf73d4e825baa"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp312-cp312-win_arm64.whl", hash = "sha256:5a49fc3a859a53fd025dc2fa08410292d267018897fc63198de6c92860fa8be7"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:2f798e1591fa5ba14d9da08a54f18e7000fd74973cde12eb862a3928a69b7996"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:369011b8dc68741313a8b77bb68a70b76052390eaf819e4cd6e13d0acbea602d"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5658990462a728c1f4b472d23c1f7f577eb2bced5bbbf7c2b45158b8340484bd"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:907a166e4e563da67fe22c480244459512e32d3e00853b3f1e6fdb9da6aa2da6"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0ba972405e9f16042e37cbcb4fef47248339c8410847390d41268bd45dc3f6ca"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b5f1b380fe3b869f701f9d2a8c09e9edfeec261573c8bb009a3336717260d65"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e2978c9d964ad643b0bc61e19d8d608a515ff270e9a2f1f6c5aeb8ad56255def"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29457feb1516a2542aa7676e6d03bf913191690bf1ed6c82353782a380388508"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:021af568414741a45bfca41d682da64916a7873498a31d896cc34ad540939c6b"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:7471d12eef489eea60cc3806bae0690f6d0733f7aea371a3ad5c5642f3bc04a9"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0f5faf683db9ade192a870e28b1eeeec2eb0aeca18e88fa52195a4639974c7cb"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:64fe6bac67d2b807b91102eef41d7f389e008ded80575ba597b454e05f9522e5"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:63ef1e23eb9729e79783e2ab4b19f64276c155ba0a85ba1eeb21e248c6ce0956"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-win32.whl", hash = "sha256:4eafde00138dd3753085b4f5eab0811247207b699de862589f886a94ad3628a4"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-win_amd64.whl", hash = "sha256:909864f275460646d0bf5475dc42e9c2cadd79cd40805ea32fe9a69300595301"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp313-cp313-win_arm64.whl", hash = "sha256:a831846cc6b01d7f99576efbf797b61a269dffa6885f530b6957573ce1a24f10"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:aaad03f3eb099401306fead806908c85b923064a9da7a99c33a72c3b7c9143bf"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74d4b4cde184d9e354152fd1867bcbaee468529865703ad863840a0ce4eb60cd"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ac3ad3cf9e1d0f08e8d22a65115368f2b22b9e96403fa644e146e1221c65c454"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45c4d3dca4acdbc5543bb00aee1e0715db797aa2819db5b7ca3feed3ab3366ff"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cf7026851ea60d63c1a88f62439da78b68bfbfec192c781255e3cfb34b6efc12"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7ae4a83678c41c2cdbf3c2b18fc46be32225260c7b4807087bdb43793ee90fa"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-musllinux_1_2_aarch64.whl", hash = "sha256:678c67d60b35eced29777fe9398b6e6a6638156f143c80662a0c7c99ce115be7"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-musllinux_1_2_i686.whl", hash = "sha256:9830af5aef2c17686d6e7c78c20b92c7b57c9d7921a03e4c549b48fe0e98c5c0"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-musllinux_1_2_ppc64le.whl", hash = "sha256:08651e17c868a6a22124b6ab71e939a5bb4737e0535f381ce35077dc8116c4b3"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-musllinux_1_2_s390x.whl", hash = "sha256:b58b4c944d7ce20cd7b426ae8834433b5b1152391960960b778b37803f0ffc1c"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:2b38818468ddb0c8fc4b172031d65ced3be22ba82360c45909a0546b2857d3e4"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-win32.whl", hash = "sha256:91d1f2284d13b68f213d05b51cd6242f4cfa065d291af6f353f9cbedd28d8c0d"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp36-cp36m-win_amd64.whl", hash = "sha256:a5c724f95366ba7a2895147b0690609b6774384fa8621aa46a66cf332e4b612f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e37b33263fad4accdba45c8566566d45fc01f47fd4afa3e265df9e0e3581d4f4"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f1e29495bc968e37352c315d23a38462d7e77fcfa1597d005d17ed93f9f3103"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ad8a774f545eb5471587e0389fca4f855f36d58901c65547796d59fc13aee458"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:75a5a0251e4ceca127b26d18f0965b7f3c820a2dd2c51c25015c819300fd5859"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:853e40535f0f57e8b605e1cbce1399c96bcd5ab99e60992d2c7669c689d0cbe5"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e04e1dd62d019cde936d18fcd21361f6c4695e0e73fd6dc509c4ccd9446d26d"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:2df377e3d04f5c427c9f79ef95bdf0b982bde76c1dbd4441f83268f3f1993a53"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:5f3cb8db19e7462ccb2e34b56feaccb2aac675ad8f77e28f8222b3e7c47d1f92"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:b40860b3e6d6108473836a29d3600e1b335192637e16e9421b43b58147ced3c1"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-musllinux_1_2_s390x.whl", hash = "sha256:ca4fd9e8b669e81bb74479bde61ee475d7a6832d667e2ce80e6136ddd7a0fedd"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:771e74a22f48c40b6402d0ca1d569ced5a796e118d4472da388744b5aa0ebd3f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-win32.whl", hash = "sha256:4589bfca18ecf787598262327f7329fe1f4fc2655c04899d84451562e2099a57"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp37-cp37m-win_amd64.whl", hash = "sha256:f646ab958a601bad8925a876f5aa68bdf0ec3584630143ed1ad8e9df4e447044"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:dfb8106a05af1cb1eadeea996171b52c80f18851972e49ffe91539e4fc064b0f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b8b9b77a898b721fc634858fc43552119d3d303485adc6f28f3e76f028d5ea04"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c65efab1a0ab14f75314039694ac35d3181a5c8cf43584bd537b36caf2a6ccf9"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b450eee7e201c48aae58e2d45ef5d309a19cd49952cfb58d546fefbeef0a100"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8f0997202d7628c4312f0398122bdc5ada7fa79939d248652af40d9da689ef8"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dae69bef7628236d426e408fb14a40f0027bac1658a06efd29549b26ba369372"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef48e874bcc3ebf623672ec99f9aaa7b8a4f62fb270e33dad6db3739ea111086"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9006dc1a73e2b2a53421aa72decbcff08cb109f67a20f7d15a64ab140e0a1d2"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:96c07a345740fa71c0d8fc5fa7ea182ee24f62ebbf33d4d10c8c72d866dc332d"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:85a78af6f6e782e0df36f93c9e7c2dd568204f60a2ea55025c21d1837dea95ec"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:19eadc55bf69f9e9799a808cdcfc6657cf30511cb32849235d555adfa048a99f"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:377e8ad3bb3c17c43f860b570fd15e048246ade92babc9b310f2c417500aca57"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:f8e07aec529d6fa31516201c524b0cfac108a9a6044a148f236291aae7991195"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-win32.whl", hash = "sha256:703ab55b77b1c1ebb80eb0b27574a8eadf109739d252de7f646dc41cb82f1a65"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp38-cp38-win_amd64.whl", hash = "sha256:b4f4b2e019c6d1ad33d5fc3163d31d0f731a073a5a52cdfae7b85408548ce342"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a84e3b098a29b8c298b01291cf8bc850a507ca45507d43674a84a8d33b7595b2"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9905b580cfdbd6945e44d81332483deace167d33e956ffae5c4b27eddeb676e7"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e0c403a7418631dc7185ef8053acc765101f4f64cc0bf50d1bc44ae7d40fc28e"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8d63f89bf28de4ce82a7c324275ce733bf31eb29ec1121e48261af89b5b7f30b"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fc6dc782f5be4883279079c79fa88578258a0fd24651f6d69b0f4be2716f7d7e"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:743c177822c60e66c5c9579b4f384bd98e60fd4a2abe0eacdec0af4747d925bc"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ec5eeb87220e4d2abf6faad1ecb3b3ee88c4d9caad6cf2ce4c0a73a91c4c7ad9"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9318b814363b4bc062e54852ea62f58b69e7da9e51211afd6c55e9170e1ae9a0"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:e7a1f58a2614f2ad9fcb4822f6da56313cbb88309880512bf5d01bd3d9142b87"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:ae9427ddde670f605c84f704c12d840628467cc0f0a8e9ce6489577eef6a0479"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:be75ae311433254af3c6fe6eb68bf80ac6ef547ec0cf4594f5b301a044682186"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:73e1438437bbe67d453e2908b90b17b357a992a9ac0011ad20af1ea7c2b4cd58"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:393c0a9af080c1c1a0801cca9448eff3633dafc1a7934fdce58a8d1c15d8bd2b"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-win32.whl", hash = "sha256:13a79fc8e9b69bf6d70e7fa5a53bd42fab83dc3e6e93da7fa82871ec40874e43"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-win_amd64.whl", hash = "sha256:b1648708e5bf599b4455bf330faa4777c3963669acb2f3fa25240123a01f8b2b"}, + {file = "sqlcipher3_wheels-0.5.5.post0-cp39-cp39-win_arm64.whl", hash = "sha256:4c3dd2f54bdd518b90e28b07c31cdfe34c8bd182c5107a30a9c2ef9569cd6cf9"}, + {file = "sqlcipher3_wheels-0.5.5.post0.tar.gz", hash = "sha256:2c291ba05fa3e57c9b4d407d2751aa69266b5372468e7402daaa312b251aca7f"}, ] [[package]] @@ -747,22 +738,22 @@ files = [ [[package]] name = "urllib3" -version = "2.6.2" +version = "2.5.0" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.9" files = [ - {file = "urllib3-2.6.2-py3-none-any.whl", hash = "sha256:ec21cddfe7724fc7cb4ba4bea7aa8e2ef36f607a4bab81aa6ce42a13dc3f03dd"}, - {file = "urllib3-2.6.2.tar.gz", hash = "sha256:016f9c98bb7e98085cb2b4b17b87d2c702975664e4f060c6532e64d1c1a5e797"}, + {file = "urllib3-2.5.0-py3-none-any.whl", hash = "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"}, + {file = "urllib3-2.5.0.tar.gz", hash = "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760"}, ] [package.extras] -brotli = ["brotli (>=1.2.0)", "brotlicffi (>=1.2.0.0)"] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] h2 = ["h2 (>=4,<5)"] socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] -zstd = ["backports-zstd (>=1.0.0)"] +zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" -python-versions = ">=3.10,<3.14" -content-hash = "86db2b4d6498ce9eba7fa9aedf9ce58fec6a63542b5f3bdb3cf6c4067e5b87df" +python-versions = ">=3.9,<3.14" +content-hash = "8c65ccc55e84371f8695117dcd01ca9ad2d78b159327045eced824e5f425a7d0" diff --git a/pyproject.toml b/pyproject.toml index 521e3d7..72a0f00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,20 +1,16 @@ [tool.poetry] name = "bouquin" -version = "0.7.3" +version = "0.2.1.6" description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher." authors = ["Miguel Jacq "] readme = "README.md" license = "GPL-3.0-or-later" repository = "https://git.mig5.net/mig5/bouquin" -packages = [{ include = "bouquin" }] -include = ["bouquin/locales/*.json", "bouquin/keys/mig5.asc", "bouquin/fonts/NotoSansSymbols2-Regular.ttf", "bouquin/fonts/OFL.txt"] [tool.poetry.dependencies] -python = ">=3.10,<3.14" +python = ">=3.9,<3.14" pyside6 = ">=6.8.1,<7.0.0" sqlcipher3-wheels = "^0.5.5.post0" -requests = "^2.32.5" -markdown = "^3.10" [tool.poetry.scripts] bouquin = "bouquin.__main__:main" @@ -32,12 +28,6 @@ pyproject-appimage = "^4.2" [tool.pyproject-appimage] script = "bouquin" output = "Bouquin.AppImage" -icon = "bouquin/icons/bouquin.svg" -rename-icon = "bouquin.png" -desktop-entry = "bouquin.desktop" - -[tool.vulture] -paths = ["bouquin", "vulture_ignorelist.py"] [build-system] requires = ["poetry-core"] diff --git a/release.sh b/release.sh index f416455..3144840 100755 --- a/release.sh +++ b/release.sh @@ -1,48 +1,16 @@ #!/bin/bash -set -eo pipefail - -# Parse the args -while getopts "v:" OPTION -do - case $OPTION in - v) - VERSION=$OPTARG - ;; - ?) - usage - exit - ;; - esac -done - -if [[ -z "${VERSION}" ]]; then - echo "You forgot to pass -v [version]!" - exit 1 -fi - -set +e -sed -i s/version.*$/version\ =\ \"${VERSION}\"/g pyproject.toml - -git add pyproject.toml -git commit -m "Bump to ${VERSION}" -git push origin main - set -e -# Clean caches etc -filedust -y . +rm -rf dist # Publish to Pypi poetry build poetry publish # Make AppImage -sudo apt-get -y install libfuse-dev poetry run pyproject-appimage mv Bouquin.AppImage dist/ # Sign packages for file in `ls -1 dist/`; do qubes-gpg-client --batch --armor --detach-sign dist/$file > dist/$file.asc; done - -ssh wolverine.mig5.net "echo ${VERSION} | tee /opt/www/mig5.net/bouquin/version.txt" diff --git a/screenshots/screenshot.png b/screenshots/screenshot.png index a5bc5e9..3a5d831 100644 Binary files a/screenshots/screenshot.png and b/screenshots/screenshot.png differ diff --git a/screenshots/statistics.png b/screenshots/statistics.png deleted file mode 100644 index 9feb1c4..0000000 Binary files a/screenshots/statistics.png and /dev/null differ diff --git a/screenshots/tags.png b/screenshots/tags.png deleted file mode 100644 index 7330f08..0000000 Binary files a/screenshots/tags.png and /dev/null differ diff --git a/screenshots/time.png b/screenshots/time.png deleted file mode 100644 index 436dd8e..0000000 Binary files a/screenshots/time.png and /dev/null differ diff --git a/tests/conftest.py b/tests/conftest.py index 4058d77..c29e6bb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,19 +33,10 @@ def isolate_qsettings(tmp_path_factory): def tmp_db_cfg(tmp_path): from bouquin.db import DBConfig - default_db = tmp_path / "notebook.db" + db_path = tmp_path / "notebook.db" key = "test-secret-key" return DBConfig( - path=default_db, - key=key, - idle_minutes=0, - theme="light", - move_todos=True, - tags=True, - time_log=True, - reminders=True, - locale="en", - font_size=11, + path=db_path, key=key, idle_minutes=0, theme="light", move_todos=True ) @@ -58,65 +49,3 @@ def fresh_db(tmp_db_cfg): assert ok, "DB connect() should succeed" yield db db.close() - - -@pytest.fixture(autouse=True) -def _stub_code_block_editor_dialog(monkeypatch): - """ - In tests, replace the interactive CodeBlockEditorDialog with a tiny stub - that never shows a real QDialog and never blocks on exec(). - """ - import bouquin.markdown_editor as markdown_editor - from PySide6.QtWidgets import QDialog - - class _TestCodeBlockEditorDialog: - def __init__( - self, code: str, language: str | None, parent=None, allow_delete=False - ): - # Simulate what the real dialog would “start with” - self._code = code - self._language = language - - def exec(self) -> int: - # Pretend the user clicked OK immediately. - # (If you prefer “Cancel by default”, return Rejected instead.) - return QDialog.DialogCode.Accepted - - def code(self) -> str: - # In tests we just return the initial code unchanged. - return self._code - - def language(self) -> str | None: - # Ditto for language. - return self._language - - # MarkdownEditor imported CodeBlockEditorDialog into its own module, - # so patch that name – everything in MarkdownEditor will use this stub. - monkeypatch.setattr( - markdown_editor, "CodeBlockEditorDialog", _TestCodeBlockEditorDialog - ) - - -# --- Freeze Qt time helper (for alarm parsing tests) --- -@pytest.fixture -def freeze_qt_time(monkeypatch): - """Freeze QDateTime.currentDateTime/QTime.currentTime to midday today. - - This avoids flakiness when tests run close to midnight, so that - QTime.currentTime().addSecs(3600) is still the same calendar day. - """ - import bouquin.main_window as _mwmod - from PySide6.QtCore import QDate, QDateTime, QTime - - today = QDate.currentDate() - fixed_time = QTime(12, 0) - fixed_dt = QDateTime(today, fixed_time) - - # Patch the *imported* Qt symbols that main_window uses - monkeypatch.setattr( - _mwmod.QDateTime, "currentDateTime", staticmethod(lambda: QDateTime(fixed_dt)) - ) - monkeypatch.setattr( - _mwmod.QTime, "currentTime", staticmethod(lambda: QTime(fixed_time)) - ) - yield diff --git a/tests/test_bug_report_dialog.py b/tests/test_bug_report_dialog.py deleted file mode 100644 index df839fd..0000000 --- a/tests/test_bug_report_dialog.py +++ /dev/null @@ -1,324 +0,0 @@ -import bouquin.bug_report_dialog as bugmod -from bouquin import strings -from bouquin.bug_report_dialog import BugReportDialog -from PySide6.QtGui import QTextCursor -from PySide6.QtWidgets import QMessageBox - - -def test_bug_report_truncates_text_to_max_chars(qtbot): - dlg = BugReportDialog() - qtbot.addWidget(dlg) - dlg.show() - - max_chars = getattr(dlg, "MAX_CHARS", 5000) - - # Make a string longer than the allowed maximum - long_text = "x" * (max_chars + 50) - - # Setting the text should trigger textChanged -> _enforce_max_length - dlg.text_edit.setPlainText(long_text) - - # Let Qt process the signal/slot if needed - qtbot.wait(10) - - current = dlg.text_edit.toPlainText() - assert len(current) == max_chars - assert current == long_text[:max_chars] - - -def test_bug_report_allows_up_to_max_chars_unchanged(qtbot): - dlg = BugReportDialog() - qtbot.addWidget(dlg) - dlg.show() - - max_chars = getattr(dlg, "MAX_CHARS", 5000) - exact_text = "y" * max_chars - - dlg.text_edit.setPlainText(exact_text) - qtbot.wait(10) - - current = dlg.text_edit.toPlainText() - # Should not be trimmed if it's exactly the limit - assert len(current) == max_chars - assert current == exact_text - - -def test_bug_report_send_success_201_shows_info_and_accepts(qtbot, monkeypatch): - dlg = BugReportDialog() - qtbot.addWidget(dlg) - dlg.show() - - # Non-empty message so we don't hit the "empty" warning branch - dlg.text_edit.setPlainText("Hello, something broke.") - qtbot.wait(10) - - # Make version() deterministic - def fake_version(pkg_name): - assert pkg_name == "bouquin" - return "1.2.3" - - monkeypatch.setattr( - bugmod.importlib.metadata, "version", fake_version, raising=True - ) - - # Capture the POST call and fake a 201 Created response - calls = {} - - class DummyResp: - status_code = 201 - - def fake_post(url, json=None, timeout=None): - calls["url"] = url - calls["json"] = json - calls["timeout"] = timeout - return DummyResp() - - monkeypatch.setattr(bugmod.requests, "post", fake_post, raising=True) - - # Capture information / critical message boxes - info_called = {} - crit_called = {} - - def fake_info(parent, title, text, *a, **k): - info_called["title"] = title - info_called["text"] = str(text) - return 0 - - def fake_critical(parent, title, text, *a, **k): - crit_called["title"] = title - crit_called["text"] = str(text) - return 0 - - monkeypatch.setattr( - bugmod.QMessageBox, "information", staticmethod(fake_info), raising=True - ) - monkeypatch.setattr( - bugmod.QMessageBox, "critical", staticmethod(fake_critical), raising=True - ) - - # Don't actually close the dialog in the test; just record that accept() was called - accepted = {} - - def fake_accept(): - accepted["called"] = True - - dlg.accept = fake_accept - - # Call the send logic directly - dlg._send() - - # --- Assertions --------------------------------------------------------- - - # POST was called with the expected URL and JSON payload - assert calls["url"] == f"{bugmod.BUG_REPORT_HOST}/{bugmod.ROUTE}" - assert calls["json"]["message"] == "Hello, something broke." - assert calls["json"]["version"] == "1.2.3" - # No attachment fields expected any more - - # Success path: information dialog shown, critical not shown - assert "title" in info_called - assert "text" in info_called - assert crit_called == {} - - # Dialog accepted - assert accepted.get("called") is True - - -def test_bug_report_send_failure_non_201_shows_critical_and_not_accepted( - qtbot, monkeypatch -): - dlg = BugReportDialog() - qtbot.addWidget(dlg) - dlg.show() - - dlg.text_edit.setPlainText("Broken again.") - qtbot.wait(10) - - # Stub version() again - monkeypatch.setattr( - bugmod.importlib.metadata, - "version", - lambda name: "9.9.9", - raising=True, - ) - - # Fake a non-201 response (e.g. 500) - calls = {} - - class DummyResp: - status_code = 500 - - def fake_post(url, json=None, timeout=None): - calls["url"] = url - calls["json"] = json - calls["timeout"] = timeout - return DummyResp() - - monkeypatch.setattr(bugmod.requests, "post", fake_post, raising=True) - - info_called = {} - crit_called = {} - - def fake_info(parent, title, text, *a, **k): - info_called["title"] = title - info_called["text"] = str(text) - return 0 - - def fake_critical(parent, title, text, *a, **k): - crit_called["title"] = title - crit_called["text"] = str(text) - return 0 - - monkeypatch.setattr( - bugmod.QMessageBox, "information", staticmethod(fake_info), raising=True - ) - monkeypatch.setattr( - bugmod.QMessageBox, "critical", staticmethod(fake_critical), raising=True - ) - - accepted = {} - - def fake_accept(): - accepted["called"] = True - - dlg.accept = fake_accept - - dlg._send() - - # POST still called with JSON payload - assert calls["url"] == f"{bugmod.BUG_REPORT_HOST}/{bugmod.ROUTE}" - assert calls["json"]["message"] == "Broken again." - assert calls["json"]["version"] == "9.9.9" - - # Failure path: critical dialog shown, information not shown - assert crit_called # non-empty - assert info_called == {} - - # Dialog should NOT be accepted on failure - assert accepted.get("called") is not True - - -def test_bug_report_dialog_text_limit_clamps_cursor(qtbot): - """Test that cursor position is clamped when text exceeds limit.""" - strings.load_strings("en") - dialog = BugReportDialog() - qtbot.addWidget(dialog) - dialog.show() - - # Set text that exceeds MAX_CHARS - max_chars = dialog.MAX_CHARS - long_text = "A" * (max_chars + 100) - - # Set text and move cursor to end - dialog.text_edit.setPlainText(long_text) - dialog.text_edit.moveCursor(QTextCursor.MoveOperation.End) - - # Text should be truncated - assert len(dialog.text_edit.toPlainText()) == max_chars - - # Cursor should be clamped to max position - final_cursor = dialog.text_edit.textCursor() - assert final_cursor.position() <= max_chars - - -def test_bug_report_dialog_empty_text_shows_warning(qtbot, monkeypatch): - """Test that sending empty report shows warning.""" - strings.load_strings("en") - dialog = BugReportDialog() - qtbot.addWidget(dialog) - dialog.show() - - # Clear any text - dialog.text_edit.clear() - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - # Try to send empty report - dialog._send() - - assert warning_shown["shown"] - - -def test_bug_report_dialog_whitespace_only_shows_warning(qtbot, monkeypatch): - """Test that sending whitespace-only report shows warning.""" - strings.load_strings("en") - dialog = BugReportDialog() - qtbot.addWidget(dialog) - dialog.show() - - # Set whitespace only - dialog.text_edit.setPlainText(" \n\n \t\t ") - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._send() - - assert warning_shown["shown"] - - -def test_bug_report_dialog_network_error(qtbot, monkeypatch): - """Test handling network error during send.""" - strings.load_strings("en") - dialog = BugReportDialog() - qtbot.addWidget(dialog) - dialog.show() - - dialog.text_edit.setPlainText("Test bug report") - - # Mock requests.post to raise exception - import requests - - def mock_post(*args, **kwargs): - raise requests.exceptions.ConnectionError("Network error") - - monkeypatch.setattr(requests, "post", mock_post) - - critical_shown = {"shown": False} - - def mock_critical(*args): - critical_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "critical", mock_critical) - - dialog._send() - - assert critical_shown["shown"] - - -def test_bug_report_dialog_timeout_error(qtbot, monkeypatch): - """Test handling timeout error during send.""" - strings.load_strings("en") - dialog = BugReportDialog() - qtbot.addWidget(dialog) - dialog.show() - - dialog.text_edit.setPlainText("Test bug report") - - # Mock requests.post to raise timeout - import requests - - def mock_post(*args, **kwargs): - raise requests.exceptions.Timeout("Request timed out") - - monkeypatch.setattr(requests, "post", mock_post) - - critical_shown = {"shown": False} - - def mock_critical(*args): - critical_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "critical", mock_critical) - - dialog._send() - - assert critical_shown["shown"] diff --git a/tests/test_code_block_editor_dialog.py b/tests/test_code_block_editor_dialog.py deleted file mode 100644 index e64199b..0000000 --- a/tests/test_code_block_editor_dialog.py +++ /dev/null @@ -1,325 +0,0 @@ -from bouquin import strings -from bouquin.code_block_editor_dialog import ( - CodeBlockEditorDialog, - CodeEditorWithLineNumbers, -) -from PySide6.QtCore import QRect, QSize -from PySide6.QtGui import QFont, QPaintEvent -from PySide6.QtWidgets import QPushButton - - -def _find_button_by_text(widget, text): - for btn in widget.findChildren(QPushButton): - if text.lower() in btn.text().lower(): - return btn - return None - - -def test_code_block_dialog_delete_flow(qtbot): - dlg = CodeBlockEditorDialog("print(1)", "python", allow_delete=True) - qtbot.addWidget(dlg) - delete_txt = strings._("delete_code_block") - delete_btn = _find_button_by_text(dlg, delete_txt) - assert delete_btn is not None - assert not dlg.was_deleted() - with qtbot.waitSignal(dlg.finished, timeout=2000): - delete_btn.click() - assert dlg.was_deleted() - - -def test_code_block_dialog_language_and_code(qtbot): - dlg = CodeBlockEditorDialog("x = 1", "not-a-lang", allow_delete=False) - qtbot.addWidget(dlg) - delete_txt = strings._("delete_code_block") - assert _find_button_by_text(dlg, delete_txt) is None - assert dlg.code() == "x = 1" - assert dlg.language() is None - - -def test_line_number_area_size_hint(qtbot, app): - """Test _LineNumberArea.sizeHint() method.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - line_area = editor._line_number_area - size_hint = line_area.sizeHint() - - # Should return a QSize with width from editor - assert isinstance(size_hint, QSize) - assert size_hint.width() > 0 - assert size_hint.height() == 0 - - -def test_line_number_area_paint_event(qtbot, app): - """Test _LineNumberArea.paintEvent() method.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.setPlainText("Line 1\nLine 2\nLine 3") - editor.show() - - # Trigger a paint event on the line number area - line_area = editor._line_number_area - paint_event = QPaintEvent(QRect(0, 0, line_area.width(), line_area.height())) - line_area.paintEvent(paint_event) - - # Should not crash - - -def test_line_number_font_pixel_size_fallback(qtbot, app): - """Test _line_number_font() with pixel-sized font.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - # Set a pixel-sized font (pointSize will be -1) - font = QFont() - font.setPixelSize(14) - editor.setFont(font) - - # Get line number font - should use the fallback - line_font = editor._line_number_font() - - # Should have calculated a size - assert line_font.pointSizeF() > 0 or line_font.pixelSize() > 0 - - -def test_code_editor_resize_event(qtbot, app): - """Test CodeEditorWithLineNumbers.resizeEvent() method.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.show() - - # Resize the editor - editor.resize(400, 300) - - # Line number area should be repositioned - line_area = editor._line_number_area - assert line_area.geometry().width() > 0 - assert line_area.geometry().height() == editor.contentsRect().height() - - -def test_code_editor_update_with_scroll(qtbot, app): - """Test _update_line_number_area with dy (scroll) parameter.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - # Add enough text to enable scrolling - text = "\n".join([f"Line {i}" for i in range(100)]) - editor.setPlainText(text) - editor.show() - - # Trigger update with scroll offset - rect = QRect(0, 0, 100, 100) - editor._update_line_number_area(rect, dy=10) - - # Should not crash - - -def test_code_editor_update_without_scroll(qtbot, app): - """Test _update_line_number_area without scroll (dy=0).""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.setPlainText("Line 1\nLine 2") - editor.show() - - # Trigger update without scroll - rect = QRect(0, 0, 100, 100) - editor._update_line_number_area(rect, dy=0) - - # Should not crash - - -def test_code_editor_update_contains_viewport(qtbot, app): - """Test _update_line_number_area when rect contains viewport.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.setPlainText("Test") - editor.show() - - # Trigger update with rect that contains viewport - viewport_rect = editor.viewport().rect() - editor._update_line_number_area(viewport_rect, dy=0) - - # Should trigger width update (covers line 82) - - -def test_line_number_area_paint_with_multiple_blocks(qtbot, app): - """Test line_number_area_paint_event with multiple text blocks.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - # Add multiple lines - text = "\n".join([f"Line {i}" for i in range(20)]) - editor.setPlainText(text) - editor.show() - - # Force a paint event - line_area = editor._line_number_area - rect = QRect(0, 0, line_area.width(), line_area.height()) - paint_event = QPaintEvent(rect) - - # This should exercise the painting loop - editor.line_number_area_paint_event(paint_event) - - # Should not crash - - -def test_line_number_area_paint_with_long_file(qtbot, app): - """Test line_number_area_paint_event with many lines.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - # Add 1000+ lines to test digit calculation and painting - text = "\n".join([f"Line {i}" for i in range(1000)]) - editor.setPlainText(text) - editor.show() - - # Trigger paint event - line_area = editor._line_number_area - paint_event = QPaintEvent(line_area.rect()) - editor.line_number_area_paint_event(paint_event) - - # Line number width should accommodate 4 digits - width = editor.line_number_area_width() - assert width > 30 # Should be wider for 4-digit numbers - - -def test_code_block_editor_dialog_with_delete(qtbot, app): - """Test CodeBlockEditorDialog with allow_delete=True.""" - dialog = CodeBlockEditorDialog("print('hello')", "python", allow_delete=True) - qtbot.addWidget(dialog) - - # Should have delete button functionality - assert hasattr(dialog, "_delete_requested") - assert dialog._delete_requested is False - - # Simulate delete click - dialog._on_delete_clicked() - - assert dialog._delete_requested is True - assert dialog.was_deleted() is True - - -def test_code_block_editor_dialog_without_delete(qtbot, app): - """Test CodeBlockEditorDialog with allow_delete=False.""" - dialog = CodeBlockEditorDialog("print('hello')", "python", allow_delete=False) - qtbot.addWidget(dialog) - - # Should not have been deleted - assert dialog.was_deleted() is False - - -def test_code_block_editor_dialog_language_selection(qtbot, app): - """Test language selection in dialog.""" - dialog = CodeBlockEditorDialog("test", "javascript") - qtbot.addWidget(dialog) - - # Should have selected javascript - assert dialog.language() == "javascript" - - # Change language - dialog._lang_combo.setCurrentText("python") - assert dialog.language() == "python" - - # Empty language - dialog._lang_combo.setCurrentText("") - assert dialog.language() is None - - -def test_code_block_editor_dialog_code_retrieval(qtbot, app): - """Test getting code from dialog.""" - original_code = "def foo():\n pass" - dialog = CodeBlockEditorDialog(original_code, None) - qtbot.addWidget(dialog) - - # Should return the code - assert dialog.code() == original_code - - # Modify code - new_code = "def bar():\n return 42" - dialog._code_edit.setPlainText(new_code) - assert dialog.code() == new_code - - -def test_code_editor_with_empty_text(qtbot, app): - """Test editor with no text.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.show() - - # Should still paint line numbers - line_area = editor._line_number_area - paint_event = QPaintEvent(line_area.rect()) - editor.line_number_area_paint_event(paint_event) - - # Should not crash - - -def test_code_editor_block_count_changed(qtbot, app): - """Test that block count changes trigger width updates.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - initial_width = editor.line_number_area_width() - - # Add lots of lines (should require more digits) - text = "\n".join([f"Line {i}" for i in range(1000)]) - editor.setPlainText(text) - - new_width = editor.line_number_area_width() - - # Width should increase for more digits - assert new_width > initial_width - - -def test_code_editor_cursor_position_changed(qtbot, app): - """Test that cursor position changes update line number area.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.setPlainText("Line 1\nLine 2\nLine 3") - editor.show() - - # Move cursor - cursor = editor.textCursor() - cursor.movePosition(cursor.MoveOperation.End) - editor.setTextCursor(cursor) - - # Should trigger line number area update (via signal connection) - # Just verify it doesn't crash - - -def test_line_number_area_width_calculation(qtbot, app): - """Test line number area width calculation with various block counts.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - - # Test with 1 line (should use minimum 2 digits) - editor.setPlainText("One line") - width_1 = editor.line_number_area_width() - assert width_1 > 0 - - # Test with 10 lines (2 digits) - editor.setPlainText("\n".join(["Line"] * 10)) - width_10 = editor.line_number_area_width() - assert width_10 >= width_1 - - # Test with 100 lines (3 digits) - editor.setPlainText("\n".join(["Line"] * 100)) - width_100 = editor.line_number_area_width() - assert width_100 > width_10 - - -def test_code_editor_viewport_margins(qtbot, app): - """Test that viewport margins are set correctly.""" - editor = CodeEditorWithLineNumbers() - qtbot.addWidget(editor) - editor.setPlainText("Test") - editor.show() - - # Left margin should equal line number area width - margins = editor.viewportMargins() - line_width = editor.line_number_area_width() - - assert margins.left() == line_width - assert margins.top() == 0 - assert margins.right() == 0 - assert margins.bottom() == 0 diff --git a/tests/test_code_highlighter.py b/tests/test_code_highlighter.py deleted file mode 100644 index 57ab8e7..0000000 --- a/tests/test_code_highlighter.py +++ /dev/null @@ -1,398 +0,0 @@ -from bouquin.code_highlighter import CodeBlockMetadata, CodeHighlighter -from PySide6.QtGui import QFont, QTextCharFormat - - -def test_get_language_patterns_python(app): - """Test getting highlighting patterns for Python.""" - patterns = CodeHighlighter.get_language_patterns("python") - - assert len(patterns) > 0 - # Should have comment pattern - assert any("#" in p[0] for p in patterns) - # Should have string patterns - assert any('"' in p[0] for p in patterns) - # Should have keyword patterns - assert any("keyword" == p[1] for p in patterns) - - -def test_get_language_patterns_javascript(app): - """Test getting highlighting patterns for JavaScript.""" - patterns = CodeHighlighter.get_language_patterns("javascript") - - assert len(patterns) > 0 - # Should have // comment pattern - assert any("//" in p[0] for p in patterns) - # Should have /* */ comment pattern (with escaped asterisks in regex) - assert any(r"/\*" in p[0] for p in patterns) - - -def test_get_language_patterns_php(app): - """Test getting highlighting patterns for PHP.""" - patterns = CodeHighlighter.get_language_patterns("php") - - assert len(patterns) > 0 - # Should have # comment pattern - assert any("#" in p[0] for p in patterns) - # Should have // comment pattern - assert any("//" in p[0] for p in patterns) - # Should have /* */ comment pattern (with escaped asterisks in regex) - assert any(r"/\*" in p[0] for p in patterns) - - -def test_get_language_patterns_bash(app): - """Test getting highlighting patterns for Bash.""" - patterns = CodeHighlighter.get_language_patterns("bash") - - assert len(patterns) > 0 - # Should have # comment pattern - assert any("#" in p[0] for p in patterns) - # Should have bash keywords - keyword_patterns = [p for p in patterns if p[1] == "keyword"] - assert len(keyword_patterns) > 0 - - -def test_get_language_patterns_html(app): - """Test getting highlighting patterns for HTML.""" - patterns = CodeHighlighter.get_language_patterns("html") - - assert len(patterns) > 0 - # Should have tag pattern - assert any("tag" == p[1] for p in patterns) - # Should have HTML comment pattern - assert any("" in result - - -def test_code_block_metadata_serialize_sorted(app): - """Test that serialized metadata is sorted by block number.""" - metadata = CodeBlockMetadata() - metadata.set_language(5, "python") - metadata.set_language(2, "javascript") - metadata.set_language(8, "bash") - - result = metadata.serialize() - - # Find positions in string - pos_2 = result.find("2:") - pos_5 = result.find("5:") - pos_8 = result.find("8:") - - # Should be in order - assert pos_2 < pos_5 < pos_8 - - -def test_code_block_metadata_deserialize(app): - """Test deserializing metadata.""" - metadata = CodeBlockMetadata() - text = ( - "Some content\n\nMore content" - ) - - metadata.deserialize(text) - - assert metadata.get_language(0) == "python" - assert metadata.get_language(3) == "javascript" - assert metadata.get_language(5) == "bash" - - -def test_code_block_metadata_deserialize_empty(app): - """Test deserializing from text without metadata.""" - metadata = CodeBlockMetadata() - metadata.set_language(0, "python") # Set some initial data - - text = "Just some regular text with no metadata" - metadata.deserialize(text) - - # Should clear existing data - assert len(metadata._block_languages) == 0 - - -def test_code_block_metadata_deserialize_invalid_format(app): - """Test deserializing with invalid format.""" - metadata = CodeBlockMetadata() - text = "" - - metadata.deserialize(text) - - # Should handle gracefully, resulting in empty or minimal data - # Pairs without ':' should be skipped - assert len(metadata._block_languages) == 0 - - -def test_code_block_metadata_deserialize_invalid_block_number(app): - """Test deserializing with invalid block number.""" - metadata = CodeBlockMetadata() - text = "" - - metadata.deserialize(text) - - # Should skip invalid block number 'abc' - assert metadata.get_language(3) == "javascript" - assert "abc" not in str(metadata._block_languages) - - -def test_code_block_metadata_round_trip(app): - """Test serializing and deserializing preserves data.""" - metadata1 = CodeBlockMetadata() - metadata1.set_language(0, "python") - metadata1.set_language(2, "javascript") - metadata1.set_language(7, "bash") - - serialized = metadata1.serialize() - - metadata2 = CodeBlockMetadata() - metadata2.deserialize(serialized) - - assert metadata2.get_language(0) == "python" - assert metadata2.get_language(2) == "javascript" - assert metadata2.get_language(7) == "bash" - - -def test_python_keywords_present(app): - """Test that Python keywords are defined.""" - keywords = CodeHighlighter.KEYWORDS.get("python", []) - - assert "def" in keywords - assert "class" in keywords - assert "if" in keywords - assert "for" in keywords - assert "import" in keywords - - -def test_javascript_keywords_present(app): - """Test that JavaScript keywords are defined.""" - keywords = CodeHighlighter.KEYWORDS.get("javascript", []) - - assert "function" in keywords - assert "const" in keywords - assert "let" in keywords - assert "var" in keywords - assert "class" in keywords - - -def test_php_keywords_present(app): - """Test that PHP keywords are defined.""" - keywords = CodeHighlighter.KEYWORDS.get("php", []) - - assert "function" in keywords - assert "class" in keywords - assert "echo" in keywords - assert "require" in keywords - - -def test_bash_keywords_present(app): - """Test that Bash keywords are defined.""" - keywords = CodeHighlighter.KEYWORDS.get("bash", []) - - assert "if" in keywords - assert "then" in keywords - assert "fi" in keywords - assert "for" in keywords - - -def test_html_keywords_present(app): - """Test that HTML keywords are defined.""" - keywords = CodeHighlighter.KEYWORDS.get("html", []) - - assert "div" in keywords - assert "span" in keywords - assert "body" in keywords - assert "html" in keywords - - -def test_css_keywords_present(app): - """Test that CSS keywords are defined.""" - keywords = CodeHighlighter.KEYWORDS.get("css", []) - - assert "color" in keywords - assert "background" in keywords - assert "margin" in keywords - assert "padding" in keywords - - -def test_all_patterns_have_string_and_number(app): - """Test that all languages have string and number patterns.""" - languages = ["python", "javascript", "php", "bash", "html", "css"] - - for lang in languages: - patterns = CodeHighlighter.get_language_patterns(lang) - pattern_types = [p[1] for p in patterns] - - assert "string" in pattern_types, f"{lang} should have string pattern" - assert "number" in pattern_types, f"{lang} should have number pattern" - - -def test_patterns_have_regex_format(app): - """Test that patterns are in regex format.""" - patterns = CodeHighlighter.get_language_patterns("python") - - for pattern, pattern_type in patterns: - # Each pattern should be a string (regex pattern) - assert isinstance(pattern, str) - # Each type should be a string - assert isinstance(pattern_type, str) - - -def test_code_block_metadata_update_language(app): - """Test updating language for existing block.""" - metadata = CodeBlockMetadata() - - metadata.set_language(0, "python") - assert metadata.get_language(0) == "python" - - metadata.set_language(0, "javascript") - assert metadata.get_language(0) == "javascript" - - -def test_get_format_preserves_base_format_properties(app): - """Test that get_format_for_type preserves base format properties.""" - base_format = QTextCharFormat() - base_format.setFontPointSize(14) - - fmt = CodeHighlighter.get_format_for_type("keyword", base_format) - - # Should be based on the base_format - assert isinstance(fmt, QTextCharFormat) diff --git a/tests/test_db.py b/tests/test_db.py index f4f8bc4..42e50f3 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -1,11 +1,8 @@ -import csv -import datetime as dt -import json -from datetime import date, timedelta - import pytest -from bouquin.db import DBManager +import json, csv +import datetime as dt from sqlcipher3 import dbapi2 as sqlite +from bouquin.db import DBManager def _today(): @@ -20,10 +17,6 @@ def _tomorrow(): return (dt.date.today() + dt.timedelta(days=1)).isoformat() -def _days_ago(n): - return (date.today() - timedelta(days=n)).isoformat() - - def _entry(text, i=0): return f"{text} line {i}\nsecond line\n\n- [x] done\n- [ ] todo" @@ -63,10 +56,8 @@ def test_dates_with_content_and_search(fresh_db): assert _today() in dates and _yesterday() in dates and _tomorrow() in dates hits = list(fresh_db.search_entries("alpha")) - # search_entries now returns (kind, key, title, text, aux) - page_dates = [key for (kind, key, _title, _text, _aux) in hits if kind == "page"] - assert _today() in page_dates - assert _tomorrow() in page_dates + assert any(d == _today() for d, _ in hits) + assert any(d == _tomorrow() for d, _ in hits) def test_get_all_entries_and_export(fresh_db, tmp_path): @@ -84,6 +75,10 @@ def test_get_all_entries_and_export(fresh_db, tmp_path): fresh_db.export_csv(entries, str(csv_path)) assert csv_path.exists() and list(csv.reader(open(csv_path))) + txt_path = tmp_path / "export.txt" + fresh_db.export_txt(entries, str(txt_path)) + assert txt_path.exists() and txt_path.read_text().strip() + md_path = tmp_path / "export.md" fresh_db.export_markdown(entries, str(md_path)) md_text = md_path.read_text() @@ -171,451 +166,3 @@ def test_compact_error_path(monkeypatch, tmp_db_cfg): db.conn = BadConn() # Should not raise; just print error db.compact() - - -class _Cur: - def __init__(self, rows): - self._rows = rows - - def execute(self, *a, **k): - return self - - def fetchall(self): - return list(self._rows) - - -class _Conn: - def __init__(self, rows): - self._rows = rows - - def cursor(self): - return _Cur(self._rows) - - -def test_integrity_check_raises_with_details(tmp_db_cfg): - db = DBManager(tmp_db_cfg) - assert db.connect() - # Force the integrity check to report problems with text details - db.conn = _Conn([("bad page checksum",), (None,)]) - with pytest.raises(sqlite.IntegrityError) as ei: - db._integrity_ok() - # Message should contain the detail string - assert "bad page checksum" in str(ei.value) - - -def test_integrity_check_raises_without_details(tmp_db_cfg): - db = DBManager(tmp_db_cfg) - assert db.connect() - # Force the integrity check to report problems but without textual details - db.conn = _Conn([(None,), (None,)]) - with pytest.raises(sqlite.IntegrityError): - db._integrity_ok() - - -# ============================================================================ -# DB _strip_markdown and _count_words Tests -# ============================================================================ - - -def test_db_strip_markdown_empty_text(fresh_db): - """Test strip_markdown with empty text.""" - result = fresh_db._strip_markdown("") - assert result == "" - - -def test_db_strip_markdown_none_text(fresh_db): - """Test strip_markdown with None.""" - result = fresh_db._strip_markdown(None) - assert result == "" - - -def test_db_strip_markdown_fenced_code_blocks(fresh_db): - """Test stripping fenced code blocks.""" - text = """ -Some text here -```python -def hello(): - print("world") -``` -More text after -""" - result = fresh_db._strip_markdown(text) - assert "def hello" not in result - assert "Some text" in result - assert "More text" in result - - -def test_db_strip_markdown_inline_code(fresh_db): - """Test stripping inline code.""" - text = "Here is some `inline code` in text" - result = fresh_db._strip_markdown(text) - assert "`" not in result - assert "inline code" not in result - assert "Here is some" in result - assert "in text" in result - - -def test_db_strip_markdown_links(fresh_db): - """Test converting markdown links to plain text.""" - text = "Check out [this link](https://example.com) for more info" - result = fresh_db._strip_markdown(text) - assert "this link" in result - assert "https://example.com" not in result - assert "[" not in result - assert "]" not in result - - -def test_db_strip_markdown_emphasis_and_headers(fresh_db): - """Test stripping emphasis markers and headers.""" - text = """ -# Header 1 -## Header 2 -**bold text** and *italic text* -> blockquote -_underline_ -""" - result = fresh_db._strip_markdown(text) - assert "#" not in result - assert "*" not in result - assert "_" not in result - assert ">" not in result - assert "bold text" in result - assert "italic text" in result - - -def test_db_strip_markdown_html_tags(fresh_db): - """Test stripping HTML tags.""" - text = "Some bold and italic text with
divs
" - result = fresh_db._strip_markdown(text) - # The regex replaces tags with spaces, may leave some angle brackets from malformed HTML - # The important thing is that the words are preserved - assert "bold" in result - assert "italic" in result - assert "divs" in result - - -def test_db_strip_markdown_complex_document(fresh_db): - """Test stripping complex markdown document.""" - text = """ -# My Document - -This is a paragraph with **bold** and *italic* text. - -```javascript -const x = 10; -console.log(x); -``` - -Here's a [link](https://example.com) and some `code`. - -> A blockquote - -

HTML paragraph

-""" - result = fresh_db._strip_markdown(text) - assert "My Document" in result - assert "paragraph" in result - assert "const x" not in result - assert "https://example.com" not in result - assert "

" not in result - - -def test_db_count_words_simple(fresh_db): - """Test word counting on simple text.""" - text = "This is a simple test with seven words" - count = fresh_db._count_words(text) - assert count == 8 - - -def test_db_count_words_empty(fresh_db): - """Test word counting on empty text.""" - count = fresh_db._count_words("") - assert count == 0 - - -def test_db_count_words_with_markdown(fresh_db): - """Test word counting strips markdown first.""" - text = "**Bold** and *italic* and `code` words" - count = fresh_db._count_words(text) - # Should count: Bold, and, italic, and, words (5 words, code is in backticks so stripped) - assert count == 5 - - -def test_db_count_words_with_unicode(fresh_db): - """Test word counting with unicode characters.""" - text = "Hello 世界 café naïve résumé" - count = fresh_db._count_words(text) - # Should count all words including unicode - assert count >= 5 - - -def test_db_count_words_with_numbers(fresh_db): - """Test word counting includes numbers.""" - text = "There are 123 apples and 456 oranges" - count = fresh_db._count_words(text) - assert count == 7 - - -def test_db_count_words_with_punctuation(fresh_db): - """Test word counting handles punctuation correctly.""" - text = "Hello, world! How are you? I'm fine, thanks." - count = fresh_db._count_words(text) - # Hello, world, How, are, you, I, m, fine, thanks = 9 words - assert count == 9 - - -# ============================================================================ -# DB gather_stats Tests -# ============================================================================ - - -def test_db_gather_stats_empty_database(fresh_db): - """Test gather_stats on empty database.""" - stats = fresh_db.gather_stats() - - assert len(stats) == 22 - ( - pages_with_content, - total_revisions, - page_most_revisions, - page_most_revisions_count, - words_by_date, - total_words, - unique_tags, - page_most_tags, - page_most_tags_count, - revisions_by_date, - time_minutes_by_date, - total_time_minutes, - day_most_time, - day_most_time_minutes, - project_most_minutes_name, - project_most_minutes, - activity_most_minutes_name, - activity_most_minutes, - reminders_by_date, - total_reminders, - day_most_reminders, - day_most_reminders_count, - ) = stats - - assert pages_with_content == 0 - assert total_revisions == 0 - assert page_most_revisions is None - assert page_most_revisions_count == 0 - assert len(words_by_date) == 0 - assert total_words == 0 - assert unique_tags == 0 - assert page_most_tags is None - assert page_most_tags_count == 0 - assert len(revisions_by_date) == 0 - - -def test_db_gather_stats_with_content(fresh_db): - """Test gather_stats with actual content.""" - # Add multiple pages with different content - fresh_db.save_new_version("2024-01-01", "Hello world this is a test", "v1") - fresh_db.save_new_version( - "2024-01-01", "Hello world this is version two", "v2" - ) # 2nd revision - fresh_db.save_new_version("2024-01-02", "Another page with more words here", "v1") - - stats = fresh_db.gather_stats() - - ( - pages_with_content, - total_revisions, - page_most_revisions, - page_most_revisions_count, - words_by_date, - total_words, - unique_tags, - page_most_tags, - page_most_tags_count, - revisions_by_date, - *_rest, - ) = stats - - assert pages_with_content == 2 - assert total_revisions == 3 - assert page_most_revisions == "2024-01-01" - assert page_most_revisions_count == 2 - assert total_words > 0 - assert len(words_by_date) == 2 - - -def test_db_gather_stats_word_counting(fresh_db): - """Test that gather_stats counts words correctly.""" - # Add page with known word count - fresh_db.save_new_version("2024-01-01", "one two three four five", "test") - - stats = fresh_db.gather_stats() - _, _, _, _, words_by_date, total_words, _, _, _, *_rest = stats - - assert total_words == 5 - - test_date = date(2024, 1, 1) - assert test_date in words_by_date - assert words_by_date[test_date] == 5 - - -def test_db_gather_stats_with_tags(fresh_db): - """Test gather_stats with tags.""" - # Add tags - fresh_db.add_tag("tag1", "#ff0000") - fresh_db.add_tag("tag2", "#00ff00") - fresh_db.add_tag("tag3", "#0000ff") - - # Add pages with tags - fresh_db.save_new_version("2024-01-01", "Page 1", "test") - fresh_db.save_new_version("2024-01-02", "Page 2", "test") - - fresh_db.set_tags_for_page( - "2024-01-01", ["tag1", "tag2", "tag3"] - ) # Page 1 has 3 tags - fresh_db.set_tags_for_page("2024-01-02", ["tag1"]) # Page 2 has 1 tag - - stats = fresh_db.gather_stats() - _, _, _, _, _, _, unique_tags, page_most_tags, page_most_tags_count, *_rest = stats - - assert unique_tags == 3 - assert page_most_tags == "2024-01-01" - assert page_most_tags_count == 3 - - -def test_db_gather_stats_revisions_by_date(fresh_db): - """Test revisions_by_date tracking.""" - # Add multiple revisions on different dates - fresh_db.save_new_version("2024-01-01", "First", "v1") - fresh_db.save_new_version("2024-01-01", "Second", "v2") - fresh_db.save_new_version("2024-01-01", "Third", "v3") - fresh_db.save_new_version("2024-01-02", "Fourth", "v1") - - stats = fresh_db.gather_stats() - _, _, _, _, _, _, _, _, _, revisions_by_date, *_rest = stats - - assert date(2024, 1, 1) in revisions_by_date - assert revisions_by_date[date(2024, 1, 1)] == 3 - assert date(2024, 1, 2) in revisions_by_date - assert revisions_by_date[date(2024, 1, 2)] == 1 - - -def test_db_gather_stats_handles_malformed_dates(fresh_db): - """Test that gather_stats handles malformed dates gracefully.""" - # This is hard to test directly since the DB enforces date format - # But we can test that normal dates work - fresh_db.save_new_version("2024-01-15", "Test", "v1") - - stats = fresh_db.gather_stats() - _, _, _, _, _, _, _, _, _, revisions_by_date, *_rest = stats - - # Should have parsed the date correctly - assert date(2024, 1, 15) in revisions_by_date - - -def test_db_gather_stats_current_version_only(fresh_db): - """Test that word counts use current version only, not all revisions.""" - # Add multiple revisions - fresh_db.save_new_version("2024-01-01", "one two three", "v1") - fresh_db.save_new_version("2024-01-01", "one two three four five", "v2") - - stats = fresh_db.gather_stats() - _, _, _, _, words_by_date, total_words, _, _, _, *_rest = stats - - # Should count words from current version (5 words), not old version - assert total_words == 5 - assert words_by_date[date(2024, 1, 1)] == 5 - - -def test_db_gather_stats_no_tags(fresh_db): - """Test gather_stats when there are no tags.""" - fresh_db.save_new_version("2024-01-01", "No tags here", "test") - - stats = fresh_db.gather_stats() - _, _, _, _, _, _, unique_tags, page_most_tags, page_most_tags_count, *_rest = stats - - assert unique_tags == 0 - assert page_most_tags is None - assert page_most_tags_count == 0 - - -def test_db_gather_stats_exception_in_dates_with_content(fresh_db, monkeypatch): - """Test that gather_stats handles exception in dates_with_content.""" - - def bad_dates(): - raise RuntimeError("Simulated error") - - monkeypatch.setattr(fresh_db, "dates_with_content", bad_dates) - - # Should still return stats without crashing - stats = fresh_db.gather_stats() - pages_with_content = stats[0] - - # Should default to 0 when exception occurs - assert pages_with_content == 0 - - -def test_delete_version(fresh_db): - """Test deleting a specific version by version_id.""" - d = date.today().isoformat() - - # Create multiple versions - vid1, _ = fresh_db.save_new_version(d, "version 1", "note1") - vid2, _ = fresh_db.save_new_version(d, "version 2", "note2") - vid3, _ = fresh_db.save_new_version(d, "version 3", "note3") - - # Verify all versions exist - versions = fresh_db.list_versions(d) - assert len(versions) == 3 - - # Delete the second version - fresh_db.delete_version(version_id=vid2) - - # Verify it's deleted - versions_after = fresh_db.list_versions(d) - assert len(versions_after) == 2 - - # Make sure the deleted version is not in the list - version_ids = [v["id"] for v in versions_after] - assert vid2 not in version_ids - assert vid1 in version_ids - assert vid3 in version_ids - - -def test_update_reminder_active(fresh_db): - """Test updating the active status of a reminder.""" - from bouquin.reminders import Reminder, ReminderType - - # Create a reminder object - reminder = Reminder( - id=None, - text="Test reminder", - reminder_type=ReminderType.ONCE, - time_str="14:30", - date_iso=date.today().isoformat(), - active=True, - ) - - # Save it - reminder_id = fresh_db.save_reminder(reminder) - - # Verify it's active - reminders = fresh_db.get_all_reminders() - active_reminder = [r for r in reminders if r.id == reminder_id][0] - assert active_reminder.active is True - - # Deactivate it - fresh_db.update_reminder_active(reminder_id, False) - - # Verify it's inactive - reminders = fresh_db.get_all_reminders() - inactive_reminder = [r for r in reminders if r.id == reminder_id][0] - assert inactive_reminder.active is False - - # Reactivate it - fresh_db.update_reminder_active(reminder_id, True) - - # Verify it's active again - reminders = fresh_db.get_all_reminders() - reactivated_reminder = [r for r in reminders if r.id == reminder_id][0] - assert reactivated_reminder.active is True diff --git a/tests/test_document_utils.py b/tests/test_document_utils.py deleted file mode 100644 index e1301df..0000000 --- a/tests/test_document_utils.py +++ /dev/null @@ -1,289 +0,0 @@ -import tempfile -from pathlib import Path -from unittest.mock import patch - -from PySide6.QtCore import QUrl -from PySide6.QtGui import QDesktopServices -from PySide6.QtWidgets import QMessageBox, QWidget - - -def test_open_document_from_db_success(qtbot, app, fresh_db): - """Test successfully opening a document.""" - # Import here to avoid circular import issues - from bouquin.document_utils import open_document_from_db - - # Add a project and document - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content for document") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - # Mock QDesktopServices.openUrl - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - # Call the function - success = open_document_from_db( - fresh_db, doc_id, doc_path.name, parent_widget=None - ) - - # Verify success - assert success is True - - # Verify openUrl was called with a QUrl - assert mock_open.called - args = mock_open.call_args[0] - assert isinstance(args[0], QUrl) - - # Verify the URL points to a local file - url_string = args[0].toString() - assert url_string.startswith("file://") - assert "bouquin_doc_" in url_string - assert doc_path.suffix in url_string - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_with_parent_widget(qtbot, app, fresh_db): - """Test opening a document with a parent widget provided.""" - from bouquin.document_utils import open_document_from_db - - # Create a parent widget - parent = QWidget() - qtbot.addWidget(parent) - - # Add a project and document - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".pdf")) - doc_path.write_text("PDF content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - success = open_document_from_db( - fresh_db, doc_id, doc_path.name, parent_widget=parent - ) - - assert success is True - assert mock_open.called - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_nonexistent_document(qtbot, app, fresh_db): - """Test opening a non-existent document returns False.""" - from bouquin.document_utils import open_document_from_db - - # Try to open a document that doesn't exist - success = open_document_from_db( - fresh_db, doc_id=99999, file_name="nonexistent.txt", parent_widget=None - ) - - # Should return False - assert success is False - - -def test_open_document_from_db_shows_error_with_parent(qtbot, app, fresh_db): - """Test that error dialog is shown when parent widget is provided.""" - from bouquin.document_utils import open_document_from_db - - parent = QWidget() - qtbot.addWidget(parent) - - # Mock QMessageBox.warning - with patch.object(QMessageBox, "warning") as mock_warning: - success = open_document_from_db( - fresh_db, doc_id=99999, file_name="nonexistent.txt", parent_widget=parent - ) - - # Should return False and show warning - assert success is False - assert mock_warning.called - - # Verify warning was shown with correct parent - call_args = mock_warning.call_args[0] - assert call_args[0] is parent - - -def test_open_document_from_db_no_error_dialog_without_parent(qtbot, app, fresh_db): - """Test that no error dialog is shown when parent widget is None.""" - from bouquin.document_utils import open_document_from_db - - with patch.object(QMessageBox, "warning") as mock_warning: - success = open_document_from_db( - fresh_db, doc_id=99999, file_name="nonexistent.txt", parent_widget=None - ) - - # Should return False but NOT show warning - assert success is False - assert not mock_warning.called - - -def test_open_document_from_db_preserves_file_extension(qtbot, app, fresh_db): - """Test that the temporary file has the correct extension.""" - from bouquin.document_utils import open_document_from_db - - # Test various file extensions - extensions = [".txt", ".pdf", ".docx", ".xlsx", ".jpg", ".png"] - - for ext in extensions: - proj_id = fresh_db.add_project(f"Project for {ext}") - doc_path = Path(tempfile.mktemp(suffix=ext)) - doc_path.write_text(f"content for {ext}") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object( - QDesktopServices, "openUrl", return_value=True - ) as mock_open: - open_document_from_db(fresh_db, doc_id, doc_path.name) - - # Get the URL that was opened - url = mock_open.call_args[0][0] - url_string = url.toString() - - # Verify the extension is preserved - assert ext in url_string, f"Extension {ext} not found in {url_string}" - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_file_without_extension(qtbot, app, fresh_db): - """Test opening a document without a file extension.""" - from bouquin.document_utils import open_document_from_db - - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp()) # No suffix - doc_path.write_text("content without extension") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - success = open_document_from_db(fresh_db, doc_id, doc_path.name) - - # Should still succeed - assert success is True - assert mock_open.called - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_desktop_services_failure(qtbot, app, fresh_db): - """Test handling when QDesktopServices.openUrl returns False.""" - from bouquin.document_utils import open_document_from_db - - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - # Mock openUrl to return False (failure) - with patch.object(QDesktopServices, "openUrl", return_value=False): - success = open_document_from_db(fresh_db, doc_id, doc_path.name) - - # Should return False - assert success is False - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_binary_content(qtbot, app, fresh_db): - """Test opening a document with binary content.""" - from bouquin.document_utils import open_document_from_db - - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".bin")) - - # Write some binary data - binary_data = bytes([0, 1, 2, 3, 255, 254, 253]) - doc_path.write_bytes(binary_data) - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - success = open_document_from_db(fresh_db, doc_id, doc_path.name) - - assert success is True - assert mock_open.called - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_large_file(qtbot, app, fresh_db): - """Test opening a large document.""" - from bouquin.document_utils import open_document_from_db - - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".bin")) - - # Create a 1MB file - large_data = b"x" * (1024 * 1024) - doc_path.write_bytes(large_data) - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - success = open_document_from_db(fresh_db, doc_id, doc_path.name) - - assert success is True - assert mock_open.called - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_temp_file_prefix(qtbot, app, fresh_db): - """Test that temporary files have the correct prefix.""" - from bouquin.document_utils import open_document_from_db - - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - open_document_from_db(fresh_db, doc_id, doc_path.name) - - url = mock_open.call_args[0][0] - url_path = url.toLocalFile() - - # Verify the temp file has the bouquin_doc_ prefix - assert "bouquin_doc_" in url_path - finally: - doc_path.unlink(missing_ok=True) - - -def test_open_document_from_db_multiple_calls(qtbot, app, fresh_db): - """Test opening the same document multiple times.""" - from bouquin.document_utils import open_document_from_db - - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - with patch.object(QDesktopServices, "openUrl", return_value=True) as mock_open: - # Open the same document 3 times - for _ in range(3): - success = open_document_from_db(fresh_db, doc_id, doc_path.name) - assert success is True - - # Should have been called 3 times - assert mock_open.call_count == 3 - - # Each call should create a different temp file - call_urls = [call[0][0].toString() for call in mock_open.call_args_list] - # All URLs should be different (different temp files) - assert len(set(call_urls)) == 3 - finally: - doc_path.unlink(missing_ok=True) diff --git a/tests/test_documents.py b/tests/test_documents.py deleted file mode 100644 index 0740b40..0000000 --- a/tests/test_documents.py +++ /dev/null @@ -1,1060 +0,0 @@ -import tempfile -from pathlib import Path -from unittest.mock import MagicMock, patch - -from bouquin.db import DBConfig -from bouquin.documents import DocumentsDialog, TodaysDocumentsWidget -from PySide6.QtCore import Qt, QUrl -from PySide6.QtGui import QDesktopServices -from PySide6.QtWidgets import QDialog, QFileDialog, QMessageBox - -# ============================================================================= -# TodaysDocumentsWidget Tests -# ============================================================================= - - -def test_todays_documents_widget_init(qtbot, app, fresh_db): - """Test TodaysDocumentsWidget initialization.""" - date_iso = "2024-01-15" - widget = TodaysDocumentsWidget(fresh_db, date_iso) - qtbot.addWidget(widget) - - assert widget._db is fresh_db - assert widget._current_date == date_iso - assert widget.toggle_btn is not None - assert widget.open_btn is not None - assert widget.list is not None - assert not widget.body.isVisible() - - -def test_todays_documents_widget_reload_no_documents(qtbot, app, fresh_db): - """Test reload when there are no documents for today.""" - date_iso = "2024-01-15" - widget = TodaysDocumentsWidget(fresh_db, date_iso) - qtbot.addWidget(widget) - - # Should have one disabled item saying "no documents" - assert widget.list.count() == 1 - item = widget.list.item(0) - assert not (item.flags() & Qt.ItemIsEnabled) - - -def test_todays_documents_widget_reload_with_documents(qtbot, app, fresh_db): - """Test reload when there are documents for today.""" - # Add a project - proj_id = fresh_db.add_project("Test Project") - - # Add a document to the project - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - # Mark document as accessed today - date_iso = "2024-01-15" - # The todays_documents method checks updated_at, so we need to ensure - # the document shows up in today's query - - widget = TodaysDocumentsWidget(fresh_db, date_iso) - qtbot.addWidget(widget) - - # At minimum, widget should be created without error - assert widget.list is not None - finally: - doc_path.unlink(missing_ok=True) - - -def test_todays_documents_widget_set_current_date(qtbot, app, fresh_db): - """Test changing the current date.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - # Change date - widget.set_current_date("2024-01-16") - assert widget._current_date == "2024-01-16" - - -def test_todays_documents_widget_open_document(qtbot, app, fresh_db): - """Test opening a document.""" - # Add a project and document - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - # Mock QDesktopServices.openUrl - with patch.object( - QDesktopServices, "openUrl", return_value=True - ) as mock_open_url: - widget._open_document(doc_id, doc_path.name) - - # Verify openUrl was called - assert mock_open_url.called - args = mock_open_url.call_args[0] - assert isinstance(args[0], QUrl) - finally: - doc_path.unlink(missing_ok=True) - - -def test_todays_documents_widget_open_document_error(qtbot, app, fresh_db): - """Test opening a non-existent document shows error.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - # Try to open non-existent document - with patch.object(QMessageBox, "warning") as mock_warning: - widget._open_document(99999, "nonexistent.txt") - assert mock_warning.called - - -def test_todays_documents_widget_open_documents_dialog(qtbot, app, fresh_db): - """Test opening the full documents dialog.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - # Mock DocumentsDialog - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - - with patch("bouquin.documents.DocumentsDialog", return_value=mock_dialog): - widget._open_documents_dialog() - assert mock_dialog.exec.called - - -# ============================================================================= -# DocumentsDialog Tests -# ============================================================================= - - -def test_documents_dialog_init(qtbot, app, fresh_db): - """Test DocumentsDialog initialization.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog._db is fresh_db - assert dialog.project_combo is not None - assert dialog.search_edit is not None - assert dialog.table is not None - assert dialog.table.columnCount() == 5 - - -def test_documents_dialog_init_with_initial_project(qtbot, app, fresh_db): - """Test DocumentsDialog with initial project ID.""" - proj_id = fresh_db.add_project("Test Project") - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Should select the specified project - # Verify project combo is populated - assert dialog.project_combo.count() > 0 - - -def test_documents_dialog_reload_projects(qtbot, app, fresh_db): - """Test reloading projects list.""" - # Add some projects - fresh_db.add_project("Project 1") - fresh_db.add_project("Project 2") - - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Check projects are loaded (including "All projects" option) - assert dialog.project_combo.count() >= 2 - - -def test_documents_dialog_reload_documents_no_project(qtbot, app, fresh_db): - """Test reloading documents when no project is selected.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog._reload_documents() - # Should not crash - - -def test_documents_dialog_reload_documents_with_project(qtbot, app, fresh_db): - """Test reloading documents for a specific project.""" - # Add project and document - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Table should have at least one row - assert ( - dialog.table.rowCount() >= 0 - ) # Might be 0 or 1 depending on how DB is set up - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_add_document(qtbot, app, fresh_db): - """Test adding a document.""" - proj_id = fresh_db.add_project("Test Project") - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Create a temporary file to add - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - # Mock file dialog to return our test file - with patch.object( - QFileDialog, "getOpenFileNames", return_value=([str(doc_path)], "") - ): - dialog._on_add_clicked() - - # Verify document was added (table should reload) - # The count might not change if the view isn't refreshed properly in test - # but the DB should have the document - docs = fresh_db.documents_for_project(proj_id) - assert len(docs) > 0 - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_add_document_no_project(qtbot, app, fresh_db): - """Test adding a document with no project selected shows warning.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Set to "All projects" (None) - dialog.project_combo.setCurrentIndex(0) - - with patch.object(QMessageBox, "warning") as mock_warning: - dialog._on_add_clicked() - assert mock_warning.called - - -def test_documents_dialog_add_document_file_error(qtbot, app, fresh_db): - """Test adding a document that doesn't exist shows warning.""" - proj_id = fresh_db.add_project("Test Project") - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Mock file dialog to return a non-existent file - with patch.object( - QFileDialog, "getOpenFileNames", return_value=(["/nonexistent/file.txt"], "") - ): - with patch.object(QMessageBox, "warning"): - dialog._on_add_clicked() - # Should show warning for file not found - # (this depends on add_document_from_path implementation) - - -def test_documents_dialog_open_document(qtbot, app, fresh_db): - """Test opening a document from the dialog.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - with patch.object( - QDesktopServices, "openUrl", return_value=True - ) as mock_open_url: - dialog._open_document(doc_id, doc_path.name) - assert mock_open_url.called - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_delete_document(qtbot, app, fresh_db): - """Test deleting a document.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Select the document in the table - if dialog.table.rowCount() > 0: - dialog.table.setCurrentCell(0, 0) - - # Mock confirmation dialog - with patch.object( - QMessageBox, "question", return_value=QMessageBox.StandardButton.Yes - ): - dialog._on_delete_clicked() - - # Document should be deleted - fresh_db.documents_for_project(proj_id) - # Depending on implementation, might be 0 or filtered - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_delete_document_no_selection(qtbot, app, fresh_db): - """Test deleting with no selection does nothing.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Don't select anything - dialog.table.setCurrentCell(-1, -1) - - # Should not crash - dialog._on_delete_clicked() - - -def test_documents_dialog_delete_document_cancelled(qtbot, app, fresh_db): - """Test cancelling document deletion.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - dialog.table.setCurrentCell(0, 0) - - # Mock confirmation dialog to return No - with patch.object( - QMessageBox, "question", return_value=QMessageBox.StandardButton.No - ): - dialog._on_delete_clicked() - - # Document should still exist - docs = fresh_db.documents_for_project(proj_id) - assert len(docs) > 0 - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_edit_description(qtbot, app, fresh_db): - """Test editing a document's description inline.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - # Get the description cell - desc_item = dialog.table.item(0, dialog.DESC_COL) - if desc_item: - # Simulate editing - desc_item.setText("New description") - dialog._on_item_changed(desc_item) - - # Verify description was updated in DB - docs = fresh_db.documents_for_project(proj_id) - if len(docs) > 0: - _, _, _, _, description, _, _ = docs[0] - assert description == "New description" - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_edit_tags(qtbot, app, fresh_db): - """Test editing a document's tags inline.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - # Get the tags cell - tags_item = dialog.table.item(0, dialog.TAGS_COL) - if tags_item: - # Simulate editing tags - tags_item.setText("tag1, tag2, tag3") - dialog._on_item_changed(tags_item) - - # Verify tags were updated in DB - tags = fresh_db.get_tags_for_document(doc_id) - tag_names = [name for (_, name, _) in tags] - assert "tag1" in tag_names - assert "tag2" in tag_names - assert "tag3" in tag_names - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_tags_color_application(qtbot, app, fresh_db): - """Test that tag colors are applied to the tags cell.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - # Add a tag with a color - fresh_db.add_tag("colored_tag", "#FF0000") - fresh_db.set_tags_for_document(doc_id, ["colored_tag"]) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - tags_item = dialog.table.item(0, dialog.TAGS_COL) - if tags_item: - # Check that background color was applied - bg_color = tags_item.background().color() - assert bg_color.isValid() - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_search_functionality(qtbot, app, fresh_db): - """Test search functionality across all projects.""" - # Add multiple projects with documents - proj1 = fresh_db.add_project("Project 1") - proj2 = fresh_db.add_project("Project 2") - - doc1_path = Path(tempfile.mktemp(suffix=".txt")) - doc1_path.write_text("apple content") - doc2_path = Path(tempfile.mktemp(suffix=".txt")) - doc2_path.write_text("banana content") - - try: - fresh_db.add_document_from_path(proj1, str(doc1_path)) - fresh_db.add_document_from_path(proj2, str(doc2_path)) - - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Perform search - dialog.search_edit.setText("apple") - dialog._on_search_text_changed("apple") - - # Should show search results - # Implementation depends on search_documents query - finally: - doc1_path.unlink(missing_ok=True) - doc2_path.unlink(missing_ok=True) - - -def test_documents_dialog_manage_projects_button(qtbot, app, fresh_db): - """Test clicking manage projects button.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Mock TimeCodeManagerDialog - mock_mgr_dialog = MagicMock() - mock_mgr_dialog.exec.return_value = QDialog.Accepted - - with patch("bouquin.documents.TimeCodeManagerDialog", return_value=mock_mgr_dialog): - dialog._manage_projects() - assert mock_mgr_dialog.exec.called - - -def test_documents_dialog_format_size(qtbot, app, fresh_db): - """Test file size formatting.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Test various sizes - assert "B" in dialog._format_size(500) - assert "KB" in dialog._format_size(2048) - assert "MB" in dialog._format_size(2 * 1024 * 1024) - assert "GB" in dialog._format_size(2 * 1024 * 1024 * 1024) - - -def test_documents_dialog_current_project_all(qtbot, app, fresh_db): - """Test _current_project returns None for 'All Projects'.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Set to first item (All Projects) - dialog.project_combo.setCurrentIndex(0) - - proj_id = dialog._current_project() - assert proj_id is None - - -def test_documents_dialog_current_project_specific(qtbot, app, fresh_db): - """Test _current_project returns correct project ID.""" - proj_id = fresh_db.add_project("Test Project") - - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Find and select the test project - for i in range(dialog.project_combo.count()): - if dialog.project_combo.itemData(i) == proj_id: - dialog.project_combo.setCurrentIndex(i) - break - - current_proj = dialog._current_project() - if current_proj is not None: - assert current_proj == proj_id - - -def test_documents_dialog_table_double_click_opens_document(qtbot, app, fresh_db): - """Test double-clicking a document opens it.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - with patch.object(QDesktopServices, "openUrl", return_value=True): - # Simulate double-click - dialog._on_open_clicked() - - # Should attempt to open if a row is selected - # (behavior depends on whether table selection is set up properly) - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_selected_doc_meta_no_selection(qtbot, app, fresh_db): - """Test _selected_doc_meta with no selection.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - doc_id, file_name = dialog._selected_doc_meta() - assert doc_id is None - assert file_name is None - - -def test_documents_dialog_selected_doc_meta_with_selection(qtbot, app, fresh_db): - """Test _selected_doc_meta with a valid selection.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - dialog.table.setCurrentCell(0, 0) - - sel_doc_id, sel_file_name = dialog._selected_doc_meta() - # May or may not be None depending on how table is populated - # At minimum, should not crash - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_item_changed_ignores_during_reload(qtbot, app, fresh_db): - """Test _on_item_changed is ignored during reload.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Set reloading flag - dialog._reloading_docs = True - - # Create a mock item - from PySide6.QtWidgets import QTableWidgetItem - - item = QTableWidgetItem("test") - - # Should not crash or do anything - dialog._on_item_changed(item) - - dialog._reloading_docs = False - - -def test_documents_dialog_search_clears_properly(qtbot, app, fresh_db): - """Test clearing search box resets to project view.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Enter search text - dialog.search_edit.setText("test") - dialog._on_search_text_changed("test") - - # Clear search - dialog.search_edit.clear() - dialog._on_search_text_changed("") - - # Should reset to normal project view - assert dialog._search_text == "" - - -def test_todays_documents_widget_reload_with_project_names(qtbot, app, fresh_db): - """Test reload when documents have project names.""" - # Add a project and document - proj_id = fresh_db.add_project("My Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - # Mock todays_documents to return a document with project name - with patch.object(fresh_db, "todays_documents") as mock_today: - mock_today.return_value = [(doc_id, doc_path.name, "My Project")] - - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - widget.reload() - - # Should have one item with project name in label - assert widget.list.count() == 1 - item = widget.list.item(0) - assert "My Project" in item.text() - assert doc_path.name in item.text() - - # Check data was stored - data = item.data(Qt.ItemDataRole.UserRole) - assert isinstance(data, dict) - assert data["doc_id"] == doc_id - assert data["file_name"] == doc_path.name - finally: - doc_path.unlink(missing_ok=True) - - -def test_todays_documents_widget_on_toggle_expand(qtbot, app, fresh_db): - """Test toggle behavior when expanding.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - widget.show() - qtbot.waitExposed(widget) - - # Initially collapsed - assert not widget.body.isVisible() - - # Call _on_toggle directly - widget._on_toggle(True) - - # Should be expanded - assert widget.body.isVisible() - assert widget.toggle_btn.arrowType() == Qt.DownArrow - - -def test_todays_documents_widget_on_toggle_collapse(qtbot, app, fresh_db): - """Test toggle behavior when collapsing.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - widget.show() - qtbot.waitExposed(widget) - - # Expand first - widget._on_toggle(True) - assert widget.body.isVisible() - - # Now collapse - widget._on_toggle(False) - - # Should be collapsed - assert not widget.body.isVisible() - assert widget.toggle_btn.arrowType() == Qt.RightArrow - - -def test_todays_documents_widget_set_current_date_triggers_reload(qtbot, app, fresh_db): - """Test that set_current_date triggers a reload.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - # Mock reload to verify it's called - with patch.object(widget, "reload") as mock_reload: - widget.set_current_date("2024-01-16") - - assert widget._current_date == "2024-01-16" - assert mock_reload.called - - -def test_todays_documents_widget_double_click_with_invalid_data(qtbot, app, fresh_db): - """Test double-clicking item with invalid data.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - # Add item with invalid data - from PySide6.QtWidgets import QListWidgetItem - - item = QListWidgetItem("Test") - item.setData(Qt.ItemDataRole.UserRole, "not a dict") - widget.list.addItem(item) - - # Double-click should not crash - widget._open_selected_document(item) - - -def test_todays_documents_widget_double_click_with_missing_doc_id(qtbot, app, fresh_db): - """Test double-clicking item with missing doc_id.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - from PySide6.QtWidgets import QListWidgetItem - - item = QListWidgetItem("Test") - item.setData(Qt.ItemDataRole.UserRole, {"file_name": "test.txt"}) - widget.list.addItem(item) - - # Should return early without crashing - widget._open_selected_document(item) - - -def test_todays_documents_widget_double_click_with_missing_filename( - qtbot, app, fresh_db -): - """Test double-clicking item with missing file_name.""" - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - - from PySide6.QtWidgets import QListWidgetItem - - item = QListWidgetItem("Test") - item.setData(Qt.ItemDataRole.UserRole, {"doc_id": 1}) - widget.list.addItem(item) - - # Should return early without crashing - widget._open_selected_document(item) - - -def test_documents_dialog_reload_calls_on_init(qtbot, app, fresh_db): - """Test that _reload_documents is called on initialization.""" - # Add a project so the combo will have items - fresh_db.add_project("Test Project") - - # This covers line 300 - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Should have projects loaded (covers _reload_projects line 300-301) - assert dialog.project_combo.count() > 0 - - -def test_documents_dialog_tags_column_hidden_when_disabled(qtbot, app, tmp_path): - """Test that tags column is hidden when tags are disabled in config.""" - # Create a config with tags disabled - db_path = tmp_path / "test.db" - cfg = DBConfig( - path=db_path, - key="test-key", - idle_minutes=0, - theme="light", - move_todos=True, - tags=False, # Tags disabled - time_log=True, - reminders=True, - locale="en", - font_size=11, - ) - - from bouquin.db import DBManager - - db = DBManager(cfg) - db.connect() - - try: - # Add project and document - proj_id = db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test") - - try: - db.add_document_from_path(proj_id, str(doc_path)) - - # Patch load_db_config to return our custom config - with patch("bouquin.documents.load_db_config", return_value=cfg): - dialog = DocumentsDialog(db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Tags column should be hidden (covers lines 400-401) - # The column is hidden inside _reload_documents when there are rows - assert dialog.table.isColumnHidden(dialog.TAGS_COL) - finally: - doc_path.unlink(missing_ok=True) - finally: - db.close() - - -def test_documents_dialog_project_changed_triggers_reload(qtbot, app, fresh_db): - """Test that changing project triggers document reload.""" - fresh_db.add_project("Project 1") - fresh_db.add_project("Project 2") - - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Mock _reload_documents - with patch.object(dialog, "_reload_documents") as mock_reload: - # Change project - dialog._on_project_changed(1) - - # Should have triggered reload (covers line 421-424) - assert mock_reload.called - - -def test_documents_dialog_add_with_cancelled_dialog(qtbot, app, fresh_db): - """Test adding document when file dialog is cancelled.""" - proj_id = fresh_db.add_project("Test Project") - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Mock file dialog to return empty (cancelled) - with patch.object(QFileDialog, "getOpenFileNames", return_value=([], "")): - initial_count = dialog.table.rowCount() - dialog._on_add_clicked() - - # No documents should be added (covers line 442) - assert dialog.table.rowCount() == initial_count - - -def test_documents_dialog_delete_with_cancelled_confirmation(qtbot, app, fresh_db): - """Test deleting document when user cancels confirmation.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - dialog.table.setCurrentCell(0, 0) - - # Mock to return No - with patch.object( - QMessageBox, "question", return_value=QMessageBox.StandardButton.No - ): - dialog._on_delete_clicked() - - # Document should still exist (covers line 486) - docs = fresh_db.documents_for_project(proj_id) - assert len(docs) > 0 - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_edit_tags_with_empty_result(qtbot, app, fresh_db): - """Test editing tags when result is empty after setting.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - if dialog.table.rowCount() > 0: - tags_item = dialog.table.item(0, dialog.TAGS_COL) - if tags_item: - # Set empty tags - tags_item.setText("") - dialog._on_item_changed(tags_item) - - # Background should be cleared (covers lines 523-524) - # Just verify no crash - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_on_open_with_no_selection(qtbot, app, fresh_db): - """Test _on_open_clicked with no selection.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Don't select anything - dialog.table.setCurrentCell(-1, -1) - - # Should not crash (early return) - dialog._on_open_clicked() - - -def test_documents_dialog_search_with_results(qtbot, app, fresh_db): - """Test search functionality with actual results.""" - proj_id = fresh_db.add_project("Test Project") - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("searchable content") - - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - - # Update document to have searchable description - fresh_db.update_document_description(doc_id, "searchable description") - - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Mock search_documents to return results - with patch.object(fresh_db, "search_documents") as mock_search: - mock_search.return_value = [ - ( - doc_id, - proj_id, - "Test Project", - doc_path.name, - "searchable description", - 100, - "2024-01-15", - ) - ] - - # Perform search - dialog.search_edit.setText("searchable") - dialog._on_search_text_changed("searchable") - - # Should show results - assert dialog.table.rowCount() > 0 - finally: - doc_path.unlink(missing_ok=True) - - -def test_documents_dialog_on_item_changed_invalid_item(qtbot, app, fresh_db): - """Test _on_item_changed with None item.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Call with None - dialog._on_item_changed(None) - - # Should not crash - - -def test_documents_dialog_on_item_changed_no_file_item(qtbot, app, fresh_db): - """Test _on_item_changed when file item is None.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Manually add a row without proper file item - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - desc_item = QTableWidgetItem("Test") - dialog.table.setItem(0, dialog.DESC_COL, desc_item) - - # Call on_item_changed - dialog._on_item_changed(desc_item) - - # Should return early without crashing - - -def test_documents_dialog_format_size_edge_cases(qtbot, app, fresh_db): - """Test _format_size with edge cases.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Test 0 bytes - assert dialog._format_size(0) == "0 B" - - # Test exact KB boundary - assert "1.0 KB" in dialog._format_size(1024) - - # Test exact MB boundary - assert "1.0 MB" in dialog._format_size(1024 * 1024) - - # Test exact GB boundary - assert "1.0 GB" in dialog._format_size(1024 * 1024 * 1024) - - -def test_documents_dialog_selected_doc_meta_no_file_item(qtbot, app, fresh_db): - """Test _selected_doc_meta when file item is None.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Add a row without file item - dialog.table.setRowCount(1) - dialog.table.setCurrentCell(0, 0) - - doc_id, file_name = dialog._selected_doc_meta() - - # Should return None, None - assert doc_id is None - assert file_name is None - - -def test_documents_dialog_initial_project_selection(qtbot, app, fresh_db): - """Test dialog with initial_project_id selects correct project.""" - proj_id = fresh_db.add_project("Selected Project") - - # Add a document to ensure something shows - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text("test") - - try: - fresh_db.add_document_from_path(proj_id, str(doc_path)) - - dialog = DocumentsDialog(fresh_db, initial_project_id=proj_id) - qtbot.addWidget(dialog) - - # Should have selected the project - current_proj = dialog._current_project() - assert current_proj == proj_id - finally: - doc_path.unlink(missing_ok=True) - - -def test_todays_documents_widget_reload_multiple_documents(qtbot, app, fresh_db): - """Test reload with multiple documents.""" - proj_id = fresh_db.add_project("Project") - - # Add multiple documents - doc_ids = [] - for i in range(3): - doc_path = Path(tempfile.mktemp(suffix=".txt")) - doc_path.write_text(f"content {i}") - try: - doc_id = fresh_db.add_document_from_path(proj_id, str(doc_path)) - doc_ids.append((doc_id, doc_path.name)) - finally: - doc_path.unlink(missing_ok=True) - - # Mock todays_documents - with patch.object(fresh_db, "todays_documents") as mock_today: - mock_today.return_value = [ - (doc_id, name, "Project") for doc_id, name in doc_ids - ] - - widget = TodaysDocumentsWidget(fresh_db, "2024-01-15") - qtbot.addWidget(widget) - widget.reload() - - # Should have 3 items - assert widget.list.count() == 3 - - -def test_documents_dialog_manage_projects_button_clicked(qtbot, app, fresh_db): - """Test clicking manage projects button.""" - dialog = DocumentsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Mock TimeCodeManagerDialog - mock_mgr_dialog = MagicMock() - mock_mgr_dialog.exec.return_value = QDialog.Accepted - - with patch("bouquin.documents.TimeCodeManagerDialog", return_value=mock_mgr_dialog): - dialog._manage_projects() - - # Should have opened the manager dialog - assert mock_mgr_dialog.exec.called diff --git a/tests/test_find_bar.py b/tests/test_find_bar.py index de67c7e..47fab42 100644 --- a/tests/test_find_bar.py +++ b/tests/test_find_bar.py @@ -1,9 +1,9 @@ import pytest -from bouquin.find_bar import FindBar -from bouquin.markdown_editor import MarkdownEditor -from bouquin.theme import Theme, ThemeConfig, ThemeManager + from PySide6.QtGui import QTextCursor -from PySide6.QtWidgets import QTextEdit, QWidget +from bouquin.markdown_editor import MarkdownEditor +from bouquin.theme import ThemeManager, ThemeConfig, Theme +from bouquin.find_bar import FindBar @pytest.fixture @@ -15,6 +15,7 @@ def editor(app, qtbot): return ed +@pytest.mark.gui def test_findbar_basic_navigation(qtbot, editor): editor.from_markdown("alpha\nbeta\nalpha\nGamma\n") editor.moveCursor(QTextCursor.Start) @@ -111,6 +112,7 @@ def test_update_highlight_clear_when_empty(qtbot, editor): assert not editor.extraSelections() +@pytest.mark.gui def test_maybe_hide_and_wrap_prev(qtbot, editor): editor.setPlainText("a a a") fb = FindBar(editor=editor, shortcut_parent=editor) @@ -131,40 +133,3 @@ def test_maybe_hide_and_wrap_prev(qtbot, editor): c.movePosition(QTextCursor.Start) editor.setTextCursor(c) fb.find_prev() - - -def _make_fb(editor, qtbot): - """Create a FindBar with a live parent kept until teardown.""" - parent = QWidget() - qtbot.addWidget(parent) - fb = FindBar(editor=editor, parent=parent) - qtbot.addWidget(fb) - parent.show() - fb.show() - return fb, parent - - -def test_find_next_early_returns_no_editor(qtbot): - # No editor: should early return and not crash - fb, _parent = _make_fb(editor=None, qtbot=qtbot) - fb.find_next() - - -def test_find_next_early_returns_empty_text(qtbot): - ed = QTextEdit() - fb, _parent = _make_fb(editor=ed, qtbot=qtbot) - fb.edit.setText("") # empty -> early return - fb.find_next() - - -def test_find_prev_early_returns_empty_text(qtbot): - ed = QTextEdit() - fb, _parent = _make_fb(editor=ed, qtbot=qtbot) - fb.edit.setText("") # empty -> early return - fb.find_prev() - - -def test_update_highlight_early_returns_no_editor(qtbot): - fb, _parent = _make_fb(editor=None, qtbot=qtbot) - fb.edit.setText("abc") - fb._update_highlight() # should return without error diff --git a/tests/test_history_dialog.py b/tests/test_history_dialog.py index 98ab9c8..8b58f7a 100644 --- a/tests/test_history_dialog.py +++ b/tests/test_history_dialog.py @@ -1,6 +1,7 @@ -from bouquin.history_dialog import HistoryDialog +from PySide6.QtWidgets import QWidget, QMessageBox from PySide6.QtCore import Qt, QTimer -from PySide6.QtWidgets import QApplication, QMessageBox, QWidget + +from bouquin.history_dialog import HistoryDialog def test_history_dialog_lists_and_revert(qtbot, fresh_db): @@ -82,229 +83,3 @@ def test_history_dialog_revert_error_shows_message(qtbot, fresh_db): dlg._revert() finally: t.stop() - - -def test_revert_returns_when_no_item_selected(qtbot, fresh_db): - d = "2000-01-01" - fresh_db.save_new_version(d, "v1", "first") - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - # No selection at all -> early return - dlg.list.clearSelection() - dlg._revert() # should not raise - - -def test_revert_returns_when_current_selected(qtbot, fresh_db): - d = "2000-01-02" - fresh_db.save_new_version(d, "v1", "first") - # Create a second version so there is a 'current' - fresh_db.save_new_version(d, "v2", "second") - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - # Select the current item -> early return - for i in range(dlg.list.count()): - item = dlg.list.item(i) - if item.data(Qt.UserRole) == dlg._current_id: - dlg.list.setCurrentItem(item) - break - dlg._revert() # no-op - - -def test_revert_exception_shows_message(qtbot, fresh_db, monkeypatch): - """ - Trigger the exception path in _revert() and auto-accept the modal - QMessageBox that HistoryDialog pops so the test doesn't hang. - """ - d = "2000-01-03" - fresh_db.save_new_version(d, "v1", "first") - fresh_db.save_new_version(d, "v2", "second") - - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - - # Select a non-current item - for i in range(dlg.list.count()): - item = dlg.list.item(i) - if item.data(Qt.UserRole) != dlg._current_id: - dlg.list.setCurrentItem(item) - break - - # Make revert raise to hit the except/critical message path. - def boom(*_a, **_k): - raise RuntimeError("nope") - - monkeypatch.setattr(dlg._db, "revert_to_version", boom) - - # Prepare a small helper that keeps trying to close an active modal box, - # but gives up after a bounded number of attempts. - def make_closer(max_tries=50, interval_ms=10): - tries = {"n": 0} - - def closer(): - tries["n"] += 1 - w = QApplication.activeModalWidget() - if isinstance(w, QMessageBox): - # Prefer clicking the OK button if present; otherwise accept(). - ok = w.button(QMessageBox.Ok) - if ok is not None: - ok.click() - else: - w.accept() - elif tries["n"] < max_tries: - QTimer.singleShot(interval_ms, closer) - - return closer - - # Schedule auto-close right before we trigger the modal dialog. - QTimer.singleShot(0, make_closer()) - - # Should show the critical box, which our timer will accept; _revert returns. - dlg._revert() - - -def test_delete_version_from_history(qtbot, fresh_db): - """Test deleting a version through the history dialog.""" - d = "2001-01-01" - - # Create multiple versions - vid1, _ = fresh_db.save_new_version(d, "v1", "first") - vid2, _ = fresh_db.save_new_version(d, "v2", "second") - vid3, _ = fresh_db.save_new_version(d, "v3", "third") - - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - - # Verify we have 3 versions - assert dlg.list.count() == 3 - - # Select the first version (oldest, not current) - dlg.list.setCurrentRow(2) # Last row is oldest version - - # Call _delete - dlg._delete() - - # Verify the version was deleted - assert dlg.list.count() == 2 - - # Verify from DB - versions = fresh_db.list_versions(d) - assert len(versions) == 2 - - -def test_delete_current_version_returns_early(qtbot, fresh_db): - """Test that deleting the current version returns early without deleting.""" - d = "2001-01-02" - - # Create versions - vid1, _ = fresh_db.save_new_version(d, "v1", "first") - vid2, _ = fresh_db.save_new_version(d, "v2", "second") - - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - - # Find and select the current version - for i in range(dlg.list.count()): - item = dlg.list.item(i) - if item.data(Qt.UserRole) == dlg._current_id: - dlg.list.setCurrentItem(item) - break - - # Try to delete - should return early - dlg._delete() - - # Verify nothing was deleted - versions = fresh_db.list_versions(d) - assert len(versions) == 2 - - -def test_delete_version_with_error(qtbot, fresh_db, monkeypatch): - """Test that delete version error shows a message box.""" - d = "2001-01-03" - - # Create versions - vid1, _ = fresh_db.save_new_version(d, "v1", "first") - vid2, _ = fresh_db.save_new_version(d, "v2", "second") - - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - - # Select a non-current version - for i in range(dlg.list.count()): - item = dlg.list.item(i) - if item.data(Qt.UserRole) != dlg._current_id: - dlg.list.setCurrentItem(item) - break - - # Make delete_version raise an error - def boom(*args, **kwargs): - raise RuntimeError("Delete failed") - - monkeypatch.setattr(dlg._db, "delete_version", boom) - - # Set up auto-closer for message box - def make_closer(max_tries=50, interval_ms=10): - tries = {"n": 0} - - def closer(): - tries["n"] += 1 - w = QApplication.activeModalWidget() - if isinstance(w, QMessageBox): - ok = w.button(QMessageBox.Ok) - if ok is not None: - ok.click() - else: - w.accept() - elif tries["n"] < max_tries: - QTimer.singleShot(interval_ms, closer) - - return closer - - QTimer.singleShot(0, make_closer()) - - # Call delete - should show error message - dlg._delete() - - -def test_delete_multiple_versions(qtbot, fresh_db): - """Test deleting multiple versions at once.""" - d = "2001-01-04" - - # Create multiple versions - vid1, _ = fresh_db.save_new_version(d, "v1", "first") - vid2, _ = fresh_db.save_new_version(d, "v2", "second") - vid3, _ = fresh_db.save_new_version(d, "v3", "third") - vid4, _ = fresh_db.save_new_version(d, "v4", "fourth") - - w = QWidget() - dlg = HistoryDialog(fresh_db, d, parent=w) - qtbot.addWidget(dlg) - dlg.show() - - # Select multiple non-current items - selected_count = 0 - for i in range(dlg.list.count()): - item = dlg.list.item(i) - if item.data(Qt.UserRole) != dlg._current_id: - item.setSelected(True) - selected_count += 1 - if selected_count >= 2: # Select 2 items - break - - # Delete them - dlg._delete() - - # Verify versions were deleted (should have current + 1 remaining) - versions = fresh_db.list_versions(d) - assert len(versions) == 2 # Current + 1 that wasn't deleted diff --git a/tests/test_invoices.py b/tests/test_invoices.py deleted file mode 100644 index 89ef202..0000000 --- a/tests/test_invoices.py +++ /dev/null @@ -1,1346 +0,0 @@ -from datetime import date, timedelta - -import pytest -from bouquin.invoices import ( - _INVOICE_REMINDER_TIME, - InvoiceDetailMode, - InvoiceDialog, - InvoiceLineItem, - InvoicesDialog, - _invoice_due_reminder_text, -) -from bouquin.reminders import Reminder, ReminderType -from PySide6.QtCore import QDate, Qt -from PySide6.QtWidgets import QMessageBox - -# ============================================================================ -# Tests for InvoiceDetailMode enum -# ============================================================================ - - -def test_invoice_detail_mode_enum_values(app): - """Test InvoiceDetailMode enum has expected values.""" - assert InvoiceDetailMode.DETAILED == "detailed" - assert InvoiceDetailMode.SUMMARY == "summary" - - -def test_invoice_detail_mode_is_string(app): - """Test InvoiceDetailMode enum inherits from str.""" - assert isinstance(InvoiceDetailMode.DETAILED, str) - assert isinstance(InvoiceDetailMode.SUMMARY, str) - - -# ============================================================================ -# Tests for InvoiceLineItem dataclass -# ============================================================================ - - -def test_invoice_line_item_creation(app): - """Test creating an InvoiceLineItem instance.""" - item = InvoiceLineItem( - description="Development work", - hours=5.5, - rate_cents=10000, - amount_cents=55000, - ) - - assert item.description == "Development work" - assert item.hours == 5.5 - assert item.rate_cents == 10000 - assert item.amount_cents == 55000 - - -def test_invoice_line_item_with_zero_values(app): - """Test InvoiceLineItem with zero values.""" - item = InvoiceLineItem( - description="", - hours=0.0, - rate_cents=0, - amount_cents=0, - ) - - assert item.description == "" - assert item.hours == 0.0 - assert item.rate_cents == 0 - assert item.amount_cents == 0 - - -# ============================================================================ -# Tests for _invoice_due_reminder_text helper function -# ============================================================================ - - -def test_invoice_due_reminder_text_normal(app): - """Test reminder text generation with normal inputs.""" - result = _invoice_due_reminder_text("Project Alpha", "INV-001") - assert result == "Invoice INV-001 for Project Alpha is due" - - -def test_invoice_due_reminder_text_with_whitespace(app): - """Test reminder text strips whitespace from inputs.""" - result = _invoice_due_reminder_text(" Project Beta ", " INV-002 ") - assert result == "Invoice INV-002 for Project Beta is due" - - -def test_invoice_due_reminder_text_empty_project(app): - """Test reminder text with empty project name.""" - result = _invoice_due_reminder_text("", "INV-003") - assert result == "Invoice INV-003 for (no project) is due" - - -def test_invoice_due_reminder_text_empty_invoice_number(app): - """Test reminder text with empty invoice number.""" - result = _invoice_due_reminder_text("Project Gamma", "") - assert result == "Invoice ? for Project Gamma is due" - - -def test_invoice_due_reminder_text_both_empty(app): - """Test reminder text with both inputs empty.""" - result = _invoice_due_reminder_text("", "") - assert result == "Invoice ? for (no project) is due" - - -# ============================================================================ -# Tests for InvoiceDialog -# ============================================================================ - - -@pytest.fixture -def invoice_dialog_setup(qtbot, fresh_db): - """Set up a project with time logs for InvoiceDialog testing.""" - # Create a project - proj_id = fresh_db.add_project("Test Project") - - # Create an activity - act_id = fresh_db.add_activity("Development") - - # Set billing info - fresh_db.upsert_project_billing( - proj_id, - hourly_rate_cents=15000, # $150/hr - currency="USD", - tax_label="VAT", - tax_rate_percent=20.0, - client_name="John Doe", - client_company="Acme Corp", - client_address="123 Main St", - client_email="john@acme.com", - ) - - # Create some time logs - today = date.today() - start_date = (today - timedelta(days=7)).isoformat() - end_date = today.isoformat() - - # Add time logs for testing (2.5 hours = 150 minutes) - for i in range(3): - log_date = (today - timedelta(days=i)).isoformat() - fresh_db.add_time_log( - log_date, - proj_id, - act_id, - 150, # 2.5 hours in minutes - f"Note {i}", - ) - - time_rows = fresh_db.time_logs_for_range(proj_id, start_date, end_date) - - return { - "db": fresh_db, - "proj_id": proj_id, - "act_id": act_id, - "start_date": start_date, - "end_date": end_date, - "time_rows": time_rows, - } - - -def test_invoice_dialog_init(qtbot, invoice_dialog_setup): - """Test InvoiceDialog initialization.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - assert dialog._db is setup["db"] - assert dialog._project_id == setup["proj_id"] - assert dialog._start == setup["start_date"] - assert dialog._end == setup["end_date"] - assert len(dialog._time_rows) == 3 - - -def test_invoice_dialog_init_without_time_rows(qtbot, invoice_dialog_setup): - """Test InvoiceDialog initialization without explicit time_rows.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - ) - qtbot.addWidget(dialog) - - # Should fetch time rows from DB - assert len(dialog._time_rows) == 3 - - -def test_invoice_dialog_loads_billing_defaults(qtbot, invoice_dialog_setup): - """Test that InvoiceDialog loads billing defaults from project.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - assert dialog.currency_edit.text() == "USD" - assert dialog.rate_spin.value() == 150.0 - assert dialog.client_name_edit.text() == "John Doe" - assert dialog.client_company_combo.currentText() == "Acme Corp" - - -def test_invoice_dialog_no_billing_defaults(qtbot, fresh_db): - """Test InvoiceDialog with project that has no billing info.""" - proj_id = fresh_db.add_project("Test Project No Billing") - today = date.today() - start = (today - timedelta(days=1)).isoformat() - end = today.isoformat() - - dialog = InvoiceDialog(fresh_db, proj_id, start, end) - qtbot.addWidget(dialog) - - # Should use defaults - assert dialog.currency_edit.text() == "AUD" - assert dialog.rate_spin.value() == 0.0 - assert dialog.client_name_edit.text() == "" - - -def test_invoice_dialog_project_name(qtbot, invoice_dialog_setup): - """Test _project_name method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - project_name = dialog._project_name() - assert project_name == "Test Project" - - -def test_invoice_dialog_suggest_invoice_number(qtbot, invoice_dialog_setup): - """Test _suggest_invoice_number method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - invoice_number = dialog._suggest_invoice_number() - # Should be in format YYYY-001 for first invoice (3 digits) - current_year = date.today().year - assert invoice_number.startswith(str(current_year)) - assert invoice_number.endswith("-001") - - -def test_invoice_dialog_suggest_invoice_number_increments(qtbot, invoice_dialog_setup): - """Test that invoice number suggestions increment.""" - setup = invoice_dialog_setup - - # Create an invoice first - dialog1 = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog1) - - # Save an invoice to increment the counter - invoice_number_1 = dialog1._suggest_invoice_number() - setup["db"].create_invoice( - project_id=setup["proj_id"], - invoice_number=invoice_number_1, - issue_date=date.today().isoformat(), - due_date=(date.today() + timedelta(days=14)).isoformat(), - currency="USD", - tax_label=None, - tax_rate_percent=None, - detail_mode=InvoiceDetailMode.DETAILED, - line_items=[], - time_log_ids=[], - ) - - # Create another dialog and check the number increments - dialog2 = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog2) - - invoice_number_2 = dialog2._suggest_invoice_number() - current_year = date.today().year - assert invoice_number_2 == f"{current_year}-002" - - -def test_invoice_dialog_populate_detailed_rows(qtbot, invoice_dialog_setup): - """Test _populate_detailed_rows method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog._populate_detailed_rows(15000) # $150/hr in cents - - # Check that table has rows - assert dialog.table.rowCount() == 3 - - # Check that hours are displayed (COL_HOURS uses cellWidget, not item) - for row in range(3): - hours_widget = dialog.table.cellWidget(row, dialog.COL_HOURS) - assert hours_widget is not None - assert hours_widget.value() == 2.5 - - -def test_invoice_dialog_total_hours_from_table(qtbot, invoice_dialog_setup): - """Test _total_hours_from_table method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog._populate_detailed_rows(15000) - - total_hours = dialog._total_hours_from_table() - # 3 rows * 2.5 hours = 7.5 hours - assert total_hours == 7.5 - - -def test_invoice_dialog_detail_line_items(qtbot, invoice_dialog_setup): - """Test _detail_line_items method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog.rate_spin.setValue(150.0) - dialog._populate_detailed_rows(15000) - - line_items = dialog._detail_line_items() - assert len(line_items) == 3 - - for item in line_items: - assert isinstance(item, InvoiceLineItem) - assert item.hours == 2.5 - assert item.rate_cents == 15000 - assert item.amount_cents == 37500 # 2.5 * 15000 - - -def test_invoice_dialog_summary_line_items(qtbot, invoice_dialog_setup): - """Test _summary_line_items method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog.rate_spin.setValue(150.0) - dialog._populate_detailed_rows(15000) - - line_items = dialog._summary_line_items() - assert len(line_items) == 1 # Summary should have one line - - item = line_items[0] - assert isinstance(item, InvoiceLineItem) - # The description comes from summary_desc_edit which has a localized default - # Just check it's not empty - assert len(item.description) > 0 - assert item.hours == 7.5 # Total of 3 * 2.5 - assert item.rate_cents == 15000 - assert item.amount_cents == 112500 # 7.5 * 15000 - - -def test_invoice_dialog_recalc_amounts(qtbot, invoice_dialog_setup): - """Test _recalc_amounts method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog._populate_detailed_rows(15000) - dialog.rate_spin.setValue(200.0) # Change rate to $200/hr - - dialog._recalc_amounts() - - # Check that amounts were recalculated - for row in range(3): - amount_item = dialog.table.item(row, dialog.COL_AMOUNT) - assert amount_item is not None - # 2.5 hours * $200 = $500 - assert amount_item.text() == "500.00" - - -def test_invoice_dialog_recalc_totals(qtbot, invoice_dialog_setup): - """Test _recalc_totals method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog.rate_spin.setValue(100.0) - dialog._populate_detailed_rows(10000) - - # Enable tax - dialog.tax_checkbox.setChecked(True) - dialog.tax_rate_spin.setValue(10.0) - - dialog._recalc_totals() - - # 7.5 hours * $100 = $750 - # Tax: $750 * 10% = $75 - # Total: $750 + $75 = $825 - assert "750.00" in dialog.subtotal_label.text() - assert "75.00" in dialog.tax_label_total.text() - assert "825.00" in dialog.total_label.text() - - -def test_invoice_dialog_on_tax_toggled(qtbot, invoice_dialog_setup): - """Test _on_tax_toggled method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - dialog.show() - - # Initially unchecked (from fixture setup with tax) - dialog.tax_checkbox.setChecked(False) - dialog._on_tax_toggled(False) - - # Tax fields should be hidden - assert not dialog.tax_label.isVisible() - assert not dialog.tax_label_edit.isVisible() - assert not dialog.tax_rate_label.isVisible() - assert not dialog.tax_rate_spin.isVisible() - - # Check the box - dialog.tax_checkbox.setChecked(True) - dialog._on_tax_toggled(True) - - # Tax fields should be visible - assert dialog.tax_label.isVisible() - assert dialog.tax_label_edit.isVisible() - assert dialog.tax_rate_label.isVisible() - assert dialog.tax_rate_spin.isVisible() - - -def test_invoice_dialog_on_client_company_changed(qtbot, invoice_dialog_setup): - """Test _on_client_company_changed method for autofill.""" - setup = invoice_dialog_setup - - # Create another project with different client - proj_id_2 = setup["db"].add_project("Project 2") - setup["db"].upsert_project_billing( - proj_id_2, - hourly_rate_cents=20000, - currency="EUR", - tax_label="GST", - tax_rate_percent=15.0, - client_name="Jane Smith", - client_company="Tech Industries", - client_address="456 Oak Ave", - client_email="jane@tech.com", - ) - - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - # Initially should have first project's client - assert dialog.client_name_edit.text() == "John Doe" - - # Change to second company - dialog.client_company_combo.setCurrentText("Tech Industries") - dialog._on_client_company_changed("Tech Industries") - - # Should autofill with second client's info - assert dialog.client_name_edit.text() == "Jane Smith" - assert dialog.client_addr_edit.toPlainText() == "456 Oak Ave" - assert dialog.client_email_edit.text() == "jane@tech.com" - - -def test_invoice_dialog_create_due_date_reminder(qtbot, invoice_dialog_setup): - """Test _create_due_date_reminder method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - due_date = (date.today() + timedelta(days=14)).isoformat() - invoice_number = "INV-TEST-001" - invoice_id = 999 # Fake invoice ID for testing - - dialog._create_due_date_reminder(invoice_id, invoice_number, due_date) - - # Check that reminder was created - reminders = setup["db"].get_all_reminders() - assert len(reminders) > 0 - - # Find our reminder - expected_text = _invoice_due_reminder_text("Test Project", invoice_number) - matching_reminders = [r for r in reminders if r.text == expected_text] - assert len(matching_reminders) == 1 - - reminder = matching_reminders[0] - assert reminder.reminder_type == ReminderType.ONCE - assert reminder.date_iso == due_date - assert reminder.time_str == _INVOICE_REMINDER_TIME - - -# ============================================================================ -# Tests for InvoicesDialog -# ============================================================================ - - -@pytest.fixture -def invoices_dialog_setup(qtbot, fresh_db): - """Set up projects with invoices for InvoicesDialog testing.""" - # Create projects - proj_id_1 = fresh_db.add_project("Project Alpha") - proj_id_2 = fresh_db.add_project("Project Beta") - - # Create invoices for project 1 - today = date.today() - for i in range(3): - issue_date = (today - timedelta(days=i * 7)).isoformat() - due_date = (today - timedelta(days=i * 7) + timedelta(days=14)).isoformat() - paid_at = today.isoformat() if i == 0 else None # First one is paid - - fresh_db.create_invoice( - project_id=proj_id_1, - invoice_number=f"ALPHA-{i+1}", - issue_date=issue_date, - due_date=due_date, - currency="USD", - tax_label="VAT", - tax_rate_percent=20.0, - detail_mode=InvoiceDetailMode.DETAILED, - line_items=[("Development work", 10.0, 15000)], # 10 hours at $150/hr - time_log_ids=[], - ) - - # Update paid_at separately if needed - if paid_at: - invoice_rows = fresh_db.get_all_invoices(proj_id_1) - if invoice_rows: - inv_id = invoice_rows[0]["id"] - fresh_db.set_invoice_field_by_id(inv_id, "paid_at", paid_at) - - # Create invoices for project 2 - for i in range(2): - issue_date = (today - timedelta(days=i * 10)).isoformat() - due_date = (today - timedelta(days=i * 10) + timedelta(days=30)).isoformat() - - fresh_db.create_invoice( - project_id=proj_id_2, - invoice_number=f"BETA-{i+1}", - issue_date=issue_date, - due_date=due_date, - currency="EUR", - tax_label=None, - tax_rate_percent=None, - detail_mode=InvoiceDetailMode.SUMMARY, - line_items=[("Consulting services", 10.0, 20000)], # 10 hours at $200/hr - time_log_ids=[], - ) - - return { - "db": fresh_db, - "proj_id_1": proj_id_1, - "proj_id_2": proj_id_2, - } - - -def test_invoices_dialog_init(qtbot, invoices_dialog_setup): - """Test InvoicesDialog initialization.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"]) - qtbot.addWidget(dialog) - - assert dialog._db is setup["db"] - assert dialog.project_combo.count() >= 2 # 2 projects - - -def test_invoices_dialog_init_with_project_id(qtbot, invoices_dialog_setup): - """Test InvoicesDialog initialization with specific project.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Should select the specified project - current_proj = dialog._current_project() - assert current_proj == setup["proj_id_1"] - - -def test_invoices_dialog_reload_projects(qtbot, invoices_dialog_setup): - """Test _reload_projects method.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"]) - qtbot.addWidget(dialog) - - initial_count = dialog.project_combo.count() - assert initial_count >= 2 # Should have 2 projects from setup - - # Create a new project - setup["db"].add_project("Project Gamma") - - # Reload projects - dialog._reload_projects() - - # Should have one more project - assert dialog.project_combo.count() == initial_count + 1 - - -def test_invoices_dialog_current_project_specific(qtbot, invoices_dialog_setup): - """Test _current_project method when specific project is selected.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - current_proj = dialog._current_project() - assert current_proj == setup["proj_id_1"] - - -def test_invoices_dialog_reload_invoices_all_projects(qtbot, invoices_dialog_setup): - """Test _reload_invoices with first project selected by default.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"]) - qtbot.addWidget(dialog) - - # First project should be selected by default (Project Alpha with 3 invoices) - # The exact project depends on creation order, so just check we have some invoices - assert dialog.table.rowCount() in [2, 3] # Either proj1 (3) or proj2 (2) - - -def test_invoices_dialog_reload_invoices_single_project(qtbot, invoices_dialog_setup): - """Test _reload_invoices with single project selected.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - dialog._reload_invoices() - - # Should show only 3 invoices from proj1 - assert dialog.table.rowCount() == 3 - - -def test_invoices_dialog_on_project_changed(qtbot, invoices_dialog_setup): - """Test _on_project_changed method.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_2"]) - qtbot.addWidget(dialog) - - # Start with project 2 (2 invoices) - assert dialog.table.rowCount() == 2 - - # Find the index of project 1 - for i in range(dialog.project_combo.count()): - if dialog.project_combo.itemData(i) == setup["proj_id_1"]: - dialog.project_combo.setCurrentIndex(i) - break - - dialog._on_project_changed(dialog.project_combo.currentIndex()) - - # Should now show 3 invoices from proj1 - assert dialog.table.rowCount() == 3 - - -def test_invoices_dialog_remove_invoice_due_reminder(qtbot, invoices_dialog_setup): - """Test _remove_invoice_due_reminder method.""" - setup = invoices_dialog_setup - - # Create a reminder for an invoice - due_date = (date.today() + timedelta(days=7)).isoformat() - invoice_number = "TEST-REMINDER-001" - project_name = "Project Alpha" - - reminder_text = _invoice_due_reminder_text(project_name, invoice_number) - reminder = Reminder( - id=None, - text=reminder_text, - time_str=_INVOICE_REMINDER_TIME, - reminder_type=ReminderType.ONCE, - date_iso=due_date, - active=True, - ) - reminder.id = setup["db"].save_reminder(reminder) - - # Verify reminder exists - reminders = setup["db"].get_all_reminders() - assert len(reminders) == 1 - - # Create dialog and populate with invoices - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Manually add a row to test the removal (simulating the invoice row) - row = dialog.table.rowCount() - dialog.table.insertRow(row) - - # Set the project and invoice number items - from PySide6.QtWidgets import QTableWidgetItem - - proj_item = QTableWidgetItem(project_name) - num_item = QTableWidgetItem(invoice_number) - dialog.table.setItem(row, dialog.COL_PROJECT, proj_item) - dialog.table.setItem(row, dialog.COL_NUMBER, num_item) - - # Mock invoice_id - num_item.setData(Qt.ItemDataRole.UserRole, 999) - - # Call the removal method - dialog._remove_invoice_due_reminder(row, 999) - - # Reminder should be deleted - reminders_after = setup["db"].get_all_reminders() - assert len(reminders_after) == 0 - - -def test_invoices_dialog_on_item_changed_invoice_number(qtbot, invoices_dialog_setup): - """Test _on_item_changed for invoice number editing.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Get the first row's invoice ID - num_item = dialog.table.item(0, dialog.COL_NUMBER) - inv_id = num_item.data(Qt.ItemDataRole.UserRole) - - # Change the invoice number - num_item.setText("ALPHA-MODIFIED") - - # Trigger the change handler - dialog._on_item_changed(num_item) - - # Verify the change was saved to DB - invoice_data = setup["db"].get_invoice_field_by_id(inv_id, "invoice_number") - assert invoice_data["invoice_number"] == "ALPHA-MODIFIED" - - -def test_invoices_dialog_on_item_changed_empty_invoice_number( - qtbot, invoices_dialog_setup, monkeypatch -): - """Test _on_item_changed rejects empty invoice number.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Mock QMessageBox to auto-close - def mock_warning(*args, **kwargs): - return QMessageBox.Ok - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - # Get the first row's invoice number item - num_item = dialog.table.item(0, dialog.COL_NUMBER) - original_number = num_item.text() - - # Try to set empty invoice number - num_item.setText("") - dialog._on_item_changed(num_item) - - # Should be reset to original - assert num_item.text() == original_number - - -def test_invoices_dialog_on_item_changed_issue_date(qtbot, invoices_dialog_setup): - """Test _on_item_changed for issue date editing.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Get the first row - num_item = dialog.table.item(0, dialog.COL_NUMBER) - inv_id = num_item.data(Qt.ItemDataRole.UserRole) - - issue_item = dialog.table.item(0, dialog.COL_ISSUE_DATE) - new_date = "2024-01-15" - issue_item.setText(new_date) - - dialog._on_item_changed(issue_item) - - # Verify change was saved - invoice_data = setup["db"].get_invoice_field_by_id(inv_id, "issue_date") - assert invoice_data["issue_date"] == new_date - - -def test_invoices_dialog_on_item_changed_invalid_date( - qtbot, invoices_dialog_setup, monkeypatch -): - """Test _on_item_changed rejects invalid date format.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Mock QMessageBox - def mock_warning(*args, **kwargs): - return QMessageBox.Ok - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - issue_item = dialog.table.item(0, dialog.COL_ISSUE_DATE) - original_date = issue_item.text() - - # Try to set invalid date - issue_item.setText("not-a-date") - dialog._on_item_changed(issue_item) - - # Should be reset to original - assert issue_item.text() == original_date - - -def test_invoices_dialog_on_item_changed_due_before_issue( - qtbot, invoices_dialog_setup, monkeypatch -): - """Test _on_item_changed rejects due date before issue date.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Mock QMessageBox - def mock_warning(*args, **kwargs): - return QMessageBox.Ok - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - # Set issue date - issue_item = dialog.table.item(0, dialog.COL_ISSUE_DATE) - issue_item.setText("2024-02-01") - dialog._on_item_changed(issue_item) - - # Try to set due date before issue date - due_item = dialog.table.item(0, dialog.COL_DUE_DATE) - original_due = due_item.text() - due_item.setText("2024-01-01") - dialog._on_item_changed(due_item) - - # Should be reset - assert due_item.text() == original_due - - -def test_invoices_dialog_on_item_changed_currency(qtbot, invoices_dialog_setup): - """Test _on_item_changed for currency editing.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Get the first row - num_item = dialog.table.item(0, dialog.COL_NUMBER) - inv_id = num_item.data(Qt.ItemDataRole.UserRole) - - currency_item = dialog.table.item(0, dialog.COL_CURRENCY) - currency_item.setText("gbp") # lowercase - - dialog._on_item_changed(currency_item) - - # Should be normalized to uppercase - assert currency_item.text() == "GBP" - - # Verify change was saved - invoice_data = setup["db"].get_invoice_field_by_id(inv_id, "currency") - assert invoice_data["currency"] == "GBP" - - -def test_invoices_dialog_on_item_changed_tax_rate(qtbot, invoices_dialog_setup): - """Test _on_item_changed for tax rate editing.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Get the first row - num_item = dialog.table.item(0, dialog.COL_NUMBER) - inv_id = num_item.data(Qt.ItemDataRole.UserRole) - - tax_rate_item = dialog.table.item(0, dialog.COL_TAX_RATE) - tax_rate_item.setText("15.5") - - dialog._on_item_changed(tax_rate_item) - - # Verify change was saved - invoice_data = setup["db"].get_invoice_field_by_id(inv_id, "tax_rate_percent") - assert invoice_data["tax_rate_percent"] == 15.5 - - -def test_invoices_dialog_on_item_changed_invalid_tax_rate( - qtbot, invoices_dialog_setup, monkeypatch -): - """Test _on_item_changed rejects invalid tax rate.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Mock QMessageBox - def mock_warning(*args, **kwargs): - return QMessageBox.Ok - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - tax_rate_item = dialog.table.item(0, dialog.COL_TAX_RATE) - original_rate = tax_rate_item.text() - - # Try to set invalid tax rate - tax_rate_item.setText("not-a-number") - dialog._on_item_changed(tax_rate_item) - - # Should be reset to original - assert tax_rate_item.text() == original_rate - - -def test_invoices_dialog_on_item_changed_subtotal(qtbot, invoices_dialog_setup): - """Test _on_item_changed for subtotal editing.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Get the first row - num_item = dialog.table.item(0, dialog.COL_NUMBER) - inv_id = num_item.data(Qt.ItemDataRole.UserRole) - - subtotal_item = dialog.table.item(0, dialog.COL_SUBTOTAL) - subtotal_item.setText("1234.56") - - dialog._on_item_changed(subtotal_item) - - # Verify change was saved (in cents) - invoice_data = setup["db"].get_invoice_field_by_id(inv_id, "subtotal_cents") - assert invoice_data["subtotal_cents"] == 123456 - - # Should be normalized to 2 decimals - assert subtotal_item.text() == "1234.56" - - -def test_invoices_dialog_on_item_changed_invalid_amount( - qtbot, invoices_dialog_setup, monkeypatch -): - """Test _on_item_changed rejects invalid amount.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Mock QMessageBox - def mock_warning(*args, **kwargs): - return QMessageBox.Ok - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - subtotal_item = dialog.table.item(0, dialog.COL_SUBTOTAL) - original_subtotal = subtotal_item.text() - - # Try to set invalid amount - subtotal_item.setText("not-a-number") - dialog._on_item_changed(subtotal_item) - - # Should be reset to original - assert subtotal_item.text() == original_subtotal - - -def test_invoices_dialog_on_item_changed_paid_at_removes_reminder( - qtbot, invoices_dialog_setup -): - """Test that marking invoice as paid removes due date reminder.""" - setup = invoices_dialog_setup - - # Create a reminder for an invoice - due_date = (date.today() + timedelta(days=7)).isoformat() - invoice_number = "ALPHA-1" - project_name = "Project Alpha" - - reminder_text = _invoice_due_reminder_text(project_name, invoice_number) - reminder = Reminder( - id=None, - text=reminder_text, - time_str=_INVOICE_REMINDER_TIME, - reminder_type=ReminderType.ONCE, - date_iso=due_date, - active=True, - ) - reminder.id = setup["db"].save_reminder(reminder) - - # Verify reminder exists - reminders = setup["db"].get_all_reminders() - assert any(r.text == reminder_text for r in reminders) - - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Find the ALPHA-1 invoice row - for row in range(dialog.table.rowCount()): - num_item = dialog.table.item(row, dialog.COL_NUMBER) - if num_item and num_item.text() == "ALPHA-1": - # Mark as paid - paid_item = dialog.table.item(row, dialog.COL_PAID_AT) - paid_item.setText(date.today().isoformat()) - dialog._on_item_changed(paid_item) - break - - # Reminder should be removed - reminders_after = setup["db"].get_all_reminders() - assert not any(r.text == reminder_text for r in reminders_after) - - -def test_invoices_dialog_ignores_changes_while_reloading(qtbot, invoices_dialog_setup): - """Test that _on_item_changed is ignored during reload.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"], initial_project_id=setup["proj_id_1"]) - qtbot.addWidget(dialog) - - # Set reloading flag - dialog._reloading_invoices = True - - # Try to change an item - num_item = dialog.table.item(0, dialog.COL_NUMBER) - original_number = num_item.text() - inv_id = num_item.data(Qt.ItemDataRole.UserRole) - - num_item.setText("SHOULD-BE-IGNORED") - dialog._on_item_changed(num_item) - - # Change should not be saved to DB - invoice_data = setup["db"].get_invoice_field_by_id(inv_id, "invoice_number") - assert invoice_data["invoice_number"] == original_number - - -def test_invoice_dialog_update_mode_enabled(qtbot, invoice_dialog_setup): - """Test _update_mode_enabled method.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - dialog.show() - - # Initially detailed mode should be selected - assert dialog.rb_detailed.isChecked() - - # Table should be enabled in detailed mode - assert dialog.table.isEnabled() - - # Switch to summary mode - dialog.rb_summary.setChecked(True) - dialog._update_mode_enabled() - - # Table should be disabled in summary mode - assert not dialog.table.isEnabled() - - -def test_invoice_dialog_with_no_time_logs(qtbot, fresh_db): - """Test InvoiceDialog with project that has no time logs.""" - proj_id = fresh_db.add_project("Empty Project") - today = date.today() - start = (today - timedelta(days=7)).isoformat() - end = today.isoformat() - - dialog = InvoiceDialog(fresh_db, proj_id, start, end) - qtbot.addWidget(dialog) - - # Should handle empty time logs gracefully - assert len(dialog._time_rows) == 0 - assert dialog.table.rowCount() == 0 - - -def test_invoice_dialog_loads_client_company_list(qtbot, invoice_dialog_setup): - """Test that InvoiceDialog loads existing client companies.""" - setup = invoice_dialog_setup - - # Create another project with a different client company - proj_id_2 = setup["db"].add_project("Project 2") - setup["db"].upsert_project_billing( - proj_id_2, - hourly_rate_cents=10000, - currency="EUR", - tax_label="VAT", - tax_rate_percent=19.0, - client_name="Jane Doe", - client_company="Beta Corp", - client_address="456 Main St", - client_email="jane@beta.com", - ) - - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - # Should have both companies in the combo - companies = [ - dialog.client_company_combo.itemText(i) - for i in range(dialog.client_company_combo.count()) - ] - assert "Acme Corp" in companies - assert "Beta Corp" in companies - - -def test_invoice_line_item_equality(app): - """Test InvoiceLineItem equality.""" - item1 = InvoiceLineItem("Work", 5.0, 10000, 50000) - item2 = InvoiceLineItem("Work", 5.0, 10000, 50000) - item3 = InvoiceLineItem("Other", 5.0, 10000, 50000) - - assert item1 == item2 - assert item1 != item3 - - -def test_invoices_dialog_empty_database(qtbot, fresh_db): - """Test InvoicesDialog with no projects or invoices.""" - dialog = InvoicesDialog(fresh_db) - qtbot.addWidget(dialog) - - # Should have no projects in combo - assert dialog.project_combo.count() == 0 - assert dialog.table.rowCount() == 0 - - -def test_invoice_dialog_tax_initially_disabled(qtbot, fresh_db): - """Test that tax fields are hidden when tax_rate_percent is None.""" - proj_id = fresh_db.add_project("No Tax Project") - fresh_db.upsert_project_billing( - proj_id, - hourly_rate_cents=10000, - currency="USD", - tax_label="Tax", - tax_rate_percent=None, # No tax - client_name="Client", - client_company="Company", - client_address="Address", - client_email="email@test.com", - ) - - today = date.today() - start = (today - timedelta(days=1)).isoformat() - end = today.isoformat() - - dialog = InvoiceDialog(fresh_db, proj_id, start, end) - qtbot.addWidget(dialog) - dialog.show() - - # Tax checkbox should be unchecked - assert not dialog.tax_checkbox.isChecked() - - # Tax fields should be hidden - assert not dialog.tax_label.isVisible() - assert not dialog.tax_label_edit.isVisible() - assert not dialog.tax_rate_label.isVisible() - assert not dialog.tax_rate_spin.isVisible() - - -def test_invoice_dialog_dates_default_values(qtbot, invoice_dialog_setup): - """Test that issue and due dates have correct default values.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - # Issue date should be today - assert dialog.issue_date_edit.date() == QDate.currentDate() - - # Due date should be 14 days from today - QDate.currentDate().addDays(14) - assert dialog.issue_date_edit.date() == QDate.currentDate() - - -def test_invoice_dialog_checkbox_toggle_updates_totals(qtbot, invoice_dialog_setup): - """Test that unchecking a line item updates the total cost.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog.rate_spin.setValue(100.0) - dialog._populate_detailed_rows(10000) - dialog.tax_checkbox.setChecked(False) - - # Initial total: 3 rows * 2.5 hours * $100 = $750 - dialog._recalc_totals() - assert "750.00" in dialog.subtotal_label.text() - assert "750.00" in dialog.total_label.text() - - # Uncheck the first row - include_item = dialog.table.item(0, dialog.COL_INCLUDE) - include_item.setCheckState(Qt.Unchecked) - - # Wait for signal processing - qtbot.wait(10) - - # New total: 2 rows * 2.5 hours * $100 = $500 - assert "500.00" in dialog.subtotal_label.text() - assert "500.00" in dialog.total_label.text() - - -def test_invoice_dialog_checkbox_toggle_with_tax(qtbot, invoice_dialog_setup): - """Test that checkbox toggling works correctly with tax enabled.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog.rate_spin.setValue(100.0) - dialog._populate_detailed_rows(10000) - dialog.tax_checkbox.setChecked(True) - dialog.tax_rate_spin.setValue(10.0) - - # Initial: 3 rows * 2.5 hours * $100 = $750 - # Tax: $750 * 10% = $75 - # Total: $825 - dialog._recalc_totals() - assert "750.00" in dialog.subtotal_label.text() - assert "75.00" in dialog.tax_label_total.text() - assert "825.00" in dialog.total_label.text() - - # Uncheck two rows - dialog.table.item(0, dialog.COL_INCLUDE).setCheckState(Qt.Unchecked) - dialog.table.item(1, dialog.COL_INCLUDE).setCheckState(Qt.Unchecked) - - # Wait for signal processing - qtbot.wait(10) - - # New total: 1 row * 2.5 hours * $100 = $250 - # Tax: $250 * 10% = $25 - # Total: $275 - assert "250.00" in dialog.subtotal_label.text() - assert "25.00" in dialog.tax_label_total.text() - assert "275.00" in dialog.total_label.text() - - -def test_invoice_dialog_rechecking_items_updates_totals(qtbot, invoice_dialog_setup): - """Test that rechecking a previously unchecked item updates totals.""" - setup = invoice_dialog_setup - dialog = InvoiceDialog( - setup["db"], - setup["proj_id"], - setup["start_date"], - setup["end_date"], - setup["time_rows"], - ) - qtbot.addWidget(dialog) - - dialog.rate_spin.setValue(100.0) - dialog._populate_detailed_rows(10000) - dialog.tax_checkbox.setChecked(False) - - # Uncheck all items - for row in range(dialog.table.rowCount()): - dialog.table.item(row, dialog.COL_INCLUDE).setCheckState(Qt.Unchecked) - - qtbot.wait(10) - - # Total should be 0 - assert "0.00" in dialog.total_label.text() - - # Re-check first item - dialog.table.item(0, dialog.COL_INCLUDE).setCheckState(Qt.Checked) - qtbot.wait(10) - - # Total should be 1 row * 2.5 hours * $100 = $250 - assert "250.00" in dialog.total_label.text() - - -def test_invoices_dialog_select_initial_project(qtbot, invoices_dialog_setup): - """Test _select_initial_project method.""" - setup = invoices_dialog_setup - dialog = InvoicesDialog(setup["db"]) - qtbot.addWidget(dialog) - - # Initially should have first project selected (either proj1 or proj2) - initial_proj = dialog._current_project() - assert initial_proj in [setup["proj_id_1"], setup["proj_id_2"]] - - # Select specific project - dialog._select_initial_project(setup["proj_id_2"]) - - # Should now have proj_id_2 selected - assert dialog._current_project() == setup["proj_id_2"] diff --git a/tests/test_key_prompt.py b/tests/test_key_prompt.py index 9aedffb..07a0044 100644 --- a/tests/test_key_prompt.py +++ b/tests/test_key_prompt.py @@ -1,204 +1,9 @@ from bouquin.key_prompt import KeyPrompt -from PySide6.QtCore import QTimer -from PySide6.QtWidgets import QFileDialog, QLineEdit def test_key_prompt_roundtrip(qtbot): kp = KeyPrompt() qtbot.addWidget(kp) kp.show() - kp.key_entry.setText("swordfish") + kp.edit.setText("swordfish") assert kp.key() == "swordfish" - - -def test_key_prompt_with_db_path_browse(qtbot, app, tmp_path, monkeypatch): - """Test KeyPrompt with DB path selection - covers lines 57-67""" - test_db = tmp_path / "test.db" - test_db.touch() - - # Create prompt with show_db_change=True - prompt = KeyPrompt(show_db_change=True) - qtbot.addWidget(prompt) - - # Mock the file dialog to return a file - def mock_get_open_filename(*args, **kwargs): - return str(test_db), "SQLCipher DB (*.db)" - - monkeypatch.setattr(QFileDialog, "getOpenFileName", mock_get_open_filename) - - # Simulate clicking the browse button - # Find the browse button by looking through the widget's children - browse_btn = None - for child in prompt.findChildren(object): - if hasattr(child, "clicked") and hasattr(child, "text"): - if ( - "select" in str(child.text()).lower() - or "browse" in str(child.text()).lower() - ): - browse_btn = child - break - - if browse_btn: - browse_btn.click() - qtbot.wait(50) - - # Verify the path was set - assert prompt.path_edit is not None - assert str(test_db) in prompt.path_edit.text() - - -def test_key_prompt_with_db_path_no_file_selected(qtbot, app, tmp_path, monkeypatch): - """Test KeyPrompt when cancel is clicked in file dialog - covers line 64 condition""" - # Create prompt with show_db_change=True - prompt = KeyPrompt(show_db_change=True) - qtbot.addWidget(prompt) - - # Mock the file dialog to return empty string (user cancelled) - def mock_get_open_filename(*args, **kwargs): - return "", "" - - monkeypatch.setattr(QFileDialog, "getOpenFileName", mock_get_open_filename) - - # Store original path text - original_text = prompt.path_edit.text() if prompt.path_edit else "" - - # Simulate clicking the browse button - browse_btn = None - for child in prompt.findChildren(object): - if hasattr(child, "clicked") and hasattr(child, "text"): - if ( - "select" in str(child.text()).lower() - or "browse" in str(child.text()).lower() - ): - browse_btn = child - break - - if browse_btn: - browse_btn.click() - qtbot.wait(50) - - # Path should not have changed since no file was selected - if prompt.path_edit: - assert prompt.path_edit.text() == original_text - - -def test_key_prompt_with_existing_db_path(qtbot, app, tmp_path): - """Test KeyPrompt with existing DB path provided""" - test_db = tmp_path / "existing.db" - test_db.touch() - - prompt = KeyPrompt(show_db_change=True, initial_db_path=test_db) - qtbot.addWidget(prompt) - - # Verify the path is pre-filled - assert prompt.path_edit is not None - assert str(test_db) in prompt.path_edit.text() - - -def test_key_prompt_with_db_path_none_and_show_db_change(qtbot, app): - """Test KeyPrompt with show_db_change but no initial_db_path""" - prompt = KeyPrompt(show_db_change=True, initial_db_path=None) - qtbot.addWidget(prompt) - - # Path edit should exist but be empty - assert prompt.path_edit is not None - assert prompt.path_edit.text() == "" - - -def test_key_prompt_accept_with_valid_key(qtbot, app): - """Test accepting prompt with valid key""" - prompt = KeyPrompt() - qtbot.addWidget(prompt) - - # Enter a key - prompt.key_entry.setText("test-key-123") - - # Accept - QTimer.singleShot(0, prompt.accept) - qtbot.wait(50) - - assert prompt.key_entry.text() == "test-key-123" - - -def test_key_prompt_without_db_change(qtbot, app): - """Test KeyPrompt without show_db_change""" - prompt = KeyPrompt(show_db_change=False) - qtbot.addWidget(prompt) - - # Path edit should not exist - assert prompt.path_edit is None - - -def test_key_prompt_password_visibility(qtbot, app): - """Test password entry mode""" - prompt = KeyPrompt() - qtbot.addWidget(prompt) - - # Initially should be password mode - assert prompt.key_entry.echoMode() == QLineEdit.EchoMode.Password - - # Enter some text - prompt.key_entry.setText("secret") - - # The text should be obscured - assert prompt.key_entry.echoMode() == QLineEdit.EchoMode.Password - - -def test_key_prompt_key_method(qtbot, app): - """Test the key() method returns entered text""" - prompt = KeyPrompt() - qtbot.addWidget(prompt) - - prompt.key_entry.setText("my-secret-key") - - assert prompt.key() == "my-secret-key" - - -def test_key_prompt_db_path_method(qtbot, app, tmp_path): - """Test the db_path() method returns selected path""" - test_db = tmp_path / "test.db" - test_db.touch() - - prompt = KeyPrompt(show_db_change=True, initial_db_path=test_db) - qtbot.addWidget(prompt) - - # Should return the db_path - assert prompt.db_path() == test_db - - -def test_key_prompt_browse_with_initial_path(qtbot, app, tmp_path, monkeypatch): - """Test browsing when initial_db_path is set""" - initial_db = tmp_path / "initial.db" - initial_db.touch() - - new_db = tmp_path / "new.db" - new_db.touch() - - prompt = KeyPrompt(show_db_change=True, initial_db_path=initial_db) - qtbot.addWidget(prompt) - - # Mock the file dialog to return a different file - def mock_get_open_filename(*args, **kwargs): - # Verify that start_dir was passed correctly - return str(new_db), "SQLCipher DB (*.db)" - - monkeypatch.setattr(QFileDialog, "getOpenFileName", mock_get_open_filename) - - # Find and click browse button - browse_btn = None - for child in prompt.findChildren(object): - if hasattr(child, "clicked") and hasattr(child, "text"): - if ( - "select" in str(child.text()).lower() - or "browse" in str(child.text()).lower() - ): - browse_btn = child - break - - if browse_btn: - browse_btn.click() - qtbot.wait(50) - - # Verify new path was set - assert str(new_db) in prompt.path_edit.text() - assert prompt.db_path() == new_db diff --git a/tests/test_lock_overlay.py b/tests/test_lock_overlay.py index 46b3cfd..db6529b 100644 --- a/tests/test_lock_overlay.py +++ b/tests/test_lock_overlay.py @@ -1,9 +1,11 @@ -from bouquin.lock_overlay import LockOverlay -from bouquin.theme import Theme, ThemeConfig, ThemeManager +import pytest from PySide6.QtCore import QEvent from PySide6.QtWidgets import QWidget +from bouquin.lock_overlay import LockOverlay +from bouquin.theme import ThemeManager, ThemeConfig, Theme +@pytest.mark.gui def test_lock_overlay_reacts_to_theme(app, qtbot): host = QWidget() qtbot.addWidget(host) diff --git a/tests/test_main.py b/tests/test_main.py index 5bfb774..94d3b11 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,6 +1,5 @@ import importlib import runpy - import pytest @@ -43,9 +42,6 @@ def test_main_creates_and_shows(monkeypatch): def setOrganizationName(self, *_): pass - def setWindowIcon(self, *_): - pass - def exec(self): return 0 diff --git a/tests/test_main_window.py b/tests/test_main_window.py index 6c09e71..cad9139 100644 --- a/tests/test_main_window.py +++ b/tests/test_main_window.py @@ -1,33 +1,21 @@ -import importlib.metadata -from datetime import date, timedelta -from pathlib import Path -from unittest.mock import Mock, patch - -import bouquin.main_window as mwmod -import bouquin.version_check as version_check import pytest -from bouquin.db import DBConfig, DBManager -from bouquin.key_prompt import KeyPrompt +import bouquin.main_window as mwmod from bouquin.main_window import MainWindow -from bouquin.settings import get_settings from bouquin.theme import Theme, ThemeConfig, ThemeManager -from PySide6.QtCore import QDate, QEvent, QPoint, QRect, Qt, QTimer -from PySide6.QtGui import QCloseEvent, QKeyEvent, QMouseEvent, QTextCursor -from PySide6.QtWidgets import QApplication, QDialog, QMessageBox, QTableView, QWidget +from bouquin.settings import get_settings +from bouquin.key_prompt import KeyPrompt +from PySide6.QtCore import QEvent, QDate, QTimer +from PySide6.QtWidgets import QTableView, QApplication +@pytest.mark.gui def test_main_window_loads_and_saves(qtbot, app, tmp_db_cfg, fresh_db): s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) s.setValue("ui/idle_minutes", 0) s.setValue("ui/theme", "light") s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) w = MainWindow(themes=themes) @@ -53,7 +41,7 @@ def test_main_window_loads_and_saves(qtbot, app, tmp_db_cfg, fresh_db): def _auto_accept_keyprompt(): for wdg in QApplication.topLevelWidgets(): if isinstance(wdg, KeyPrompt): - wdg.key_entry.setText(tmp_db_cfg.key) + wdg.edit.setText(tmp_db_cfg.key) wdg.accept() w._enter_lock() @@ -64,7 +52,7 @@ def test_main_window_loads_and_saves(qtbot, app, tmp_db_cfg, fresh_db): def test_load_yesterday_todos_moves_items(qtbot, app, tmp_db_cfg, fresh_db): s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) s.setValue("ui/move_todos", True) s.setValue("ui/theme", "light") @@ -78,14 +66,15 @@ def test_load_yesterday_todos_moves_items(qtbot, app, tmp_db_cfg, fresh_db): qtbot.addWidget(w) w.show() - w._load_unchecked_todos() + w._load_yesterday_todos() assert "carry me" in w.editor.to_markdown() y_txt = fresh_db.get_entry(y) assert "carry me" not in y_txt or "- [ ]" not in y_txt -def test_open_docs_warning(qtbot, app, fresh_db, tmp_path, monkeypatch): +@pytest.mark.gui +def test_open_docs_and_bugs_warning(qtbot, app, fresh_db, tmp_path, monkeypatch): themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) w = MainWindow(themes=themes) qtbot.addWidget(w) @@ -106,14 +95,19 @@ def test_open_docs_warning(qtbot, app, fresh_db, tmp_path, monkeypatch): t = str(text) if "wiki" in t: called["docs"] = True + if "forms/mig5/contact" in t or "contact" in t: + called["bugs"] = True return 0 monkeypatch.setattr(mwmod, "QMessageBox", DummyMB, raising=True) # capture warnings + # Trigger both actions w._open_docs() - assert called["docs"] + w._open_bugs() + assert called["docs"] and called["bugs"] +@pytest.mark.gui def test_export_success_and_error(qtbot, app, fresh_db, tmp_path, monkeypatch): # Seed some content fresh_db.save_new_version("2001-01-01", "alpha", "n1") @@ -123,7 +117,7 @@ def test_export_success_and_error(qtbot, app, fresh_db, tmp_path, monkeypatch): from bouquin.settings import get_settings s = get_settings() - s.setValue("db/default_db", str(fresh_db.cfg.path)) + s.setValue("db/path", str(fresh_db.cfg.path)) s.setValue("db/key", fresh_db.cfg.key) s.setValue("ui/idle_minutes", 0) s.setValue("ui/theme", "light") @@ -133,20 +127,25 @@ def test_export_success_and_error(qtbot, app, fresh_db, tmp_path, monkeypatch): # Save as Markdown without extension -> should append .md and write file dest1 = tmp_path / "export_one" # no suffix - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: (str(dest1), "Markdown (*.md)")), - ) - # Use real QMessageBox class; just force decisions and silence popups + def fake_save1(*a, **k): + return str(dest1), "Markdown (*.md)" + + monkeypatch.setattr(mwmod.QFileDialog, "getSaveFileName", staticmethod(fake_save1)) + + info_log = {"ok": False} + + # Auto-accept the warning dialog monkeypatch.setattr( mwmod.QMessageBox, "exec", lambda self: mwmod.QMessageBox.Yes, raising=False ) + info_log = {"ok": False} monkeypatch.setattr( - mwmod.QMessageBox, "information", staticmethod(lambda *a, **k: 0), raising=False + mwmod.QMessageBox, + "information", + staticmethod(lambda *a, **k: info_log.__setitem__("ok", True) or 0), + raising=False, ) - # Critical should never trigger in the success path monkeypatch.setattr( mwmod.QMessageBox, "critical", @@ -155,9 +154,9 @@ def test_export_success_and_error(qtbot, app, fresh_db, tmp_path, monkeypatch): ), raising=False, ) - w._export() assert dest1.with_suffix(".md").exists() + assert info_log["ok"] # Now force an exception during export to hit error branch (patch the window's DB) def boom(): @@ -167,13 +166,14 @@ def test_export_success_and_error(qtbot, app, fresh_db, tmp_path, monkeypatch): # Different filename to avoid overwriting dest2 = tmp_path / "export_two" - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: (str(dest2), "CSV (*.csv)")), - ) + + def fake_save2(*a, **k): + return str(dest2), "CSV (*.csv)" + + monkeypatch.setattr(mwmod.QFileDialog, "getSaveFileName", staticmethod(fake_save2)) errs = {"hit": False} + # Auto-accept the warning dialog and capture the error message monkeypatch.setattr( mwmod.QMessageBox, "exec", lambda self: mwmod.QMessageBox.Yes, raising=False ) @@ -190,6 +190,7 @@ def test_export_success_and_error(qtbot, app, fresh_db, tmp_path, monkeypatch): assert errs["hit"] +@pytest.mark.gui def test_backup_path(qtbot, app, fresh_db, tmp_path, monkeypatch): themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) @@ -197,7 +198,7 @@ def test_backup_path(qtbot, app, fresh_db, tmp_path, monkeypatch): from bouquin.settings import get_settings s = get_settings() - s.setValue("db/default_db", str(fresh_db.cfg.path)) + s.setValue("db/path", str(fresh_db.cfg.path)) s.setValue("db/key", fresh_db.cfg.key) s.setValue("ui/idle_minutes", 0) s.setValue("ui/theme", "light") @@ -247,12 +248,13 @@ def test_backup_path(qtbot, app, fresh_db, tmp_path, monkeypatch): assert str(dest.with_suffix(".db")) in hit["text"] +@pytest.mark.gui def test_close_tab_edges_and_autosave(qtbot, app, fresh_db, monkeypatch): themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) from bouquin.settings import get_settings s = get_settings() - s.setValue("db/default_db", str(fresh_db.cfg.path)) + s.setValue("db/path", str(fresh_db.cfg.path)) s.setValue("db/key", fresh_db.cfg.key) s.setValue("ui/idle_minutes", 0) s.setValue("ui/theme", "light") @@ -281,6 +283,7 @@ def test_close_tab_edges_and_autosave(qtbot, app, fresh_db, monkeypatch): monkeypatch.delattr(w, "_save_editor_content", raising=False) +@pytest.mark.gui def test_restore_window_position_variants(qtbot, app, fresh_db, monkeypatch): themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) w = MainWindow(themes=themes) @@ -326,6 +329,7 @@ def test_restore_window_position_variants(qtbot, app, fresh_db, monkeypatch): assert called["max"] +@pytest.mark.gui def test_calendar_pos_mapping_and_context_menu(qtbot, app, fresh_db, monkeypatch): # Seed DB so refresh marks does something fresh_db.save_new_version("2021-08-15", "note", "") @@ -398,6 +402,7 @@ def test_calendar_pos_mapping_and_context_menu(qtbot, app, fresh_db, monkeypatch w._show_calendar_context_menu(cal_pos) +@pytest.mark.gui def test_event_filter_keypress_starts_idle_timer(qtbot, app): themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) w = MainWindow(themes=themes) @@ -405,2026 +410,3 @@ def test_event_filter_keypress_starts_idle_timer(qtbot, app): w.show() ev = QEvent(QEvent.KeyPress) w.eventFilter(w, ev) - - -def _make_main_window(tmp_db_cfg, app, monkeypatch, fresh_db=None): - """Create a MainWindow wired to an existing db config so it doesn't prompt for key.""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - # Force MainWindow to pick up our provided cfg - monkeypatch.setattr(mwmod, "load_db_config", lambda: tmp_db_cfg, raising=True) - # Make sure DB connects fine - if fresh_db is None: - fresh_db = DBManager(tmp_db_cfg) - assert fresh_db.connect() - w = MainWindow(themes) - return w - - -def test_init_exits_when_prompt_rejected(app, monkeypatch, tmp_path): - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - - # cfg with empty key and non-existent path => first_time True - cfg = DBConfig( - path=tmp_path / "does_not_exist.db", - key="", - idle_minutes=0, - theme="light", - move_todos=True, - ) - monkeypatch.setattr(mwmod, "load_db_config", lambda: cfg, raising=True) - - # Avoid accidentaly creating DB by short-circuiting the prompt loop - class MW(MainWindow): - def _prompt_for_key_until_valid(self, first_time: bool) -> bool: # noqa: N802 - assert first_time is True - return False - - with pytest.raises(SystemExit): - MW(themes) - - -@pytest.mark.parametrize( - "msg, expect_key_msg", - [ - ("file is not a database", True), - ("totally unrelated", False), - ], -) -def test_try_connect_maps_errors( - qtbot, tmp_db_cfg, app, monkeypatch, msg, expect_key_msg -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Make connect() raise - def boom(self): - raise Exception(msg) - - monkeypatch.setattr(mwmod.DBManager, "connect", boom, raising=True) - - shown = {} - - def fake_critical(parent, title, text, *a, **k): - shown["title"] = title - shown["text"] = str(text) - return 0 - - monkeypatch.setattr( - mwmod.QMessageBox, "critical", staticmethod(fake_critical), raising=True - ) - - w._try_connect() - - # And we still showed the right error message - assert "database" in shown["title"].lower() - if expect_key_msg: - assert "key" in shown["text"].lower() - else: - assert "unrelated" in shown["text"].lower() - # If closeEvent later explodes here, that is an app bug (should guard partial init). - - -# ---- _prompt_for_key_until_valid (324-332) ---- - - -def test_prompt_for_key_cancel_returns_false(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - class CancelPrompt: - def __init__(self, *a, **k): - pass - - def exec(self): - return mwmod.QDialog.Rejected - - def key(self): - return "" - - def db_path(self) -> Path | None: - return "foo.db" - - monkeypatch.setattr(mwmod, "KeyPrompt", CancelPrompt, raising=True) - assert w._prompt_for_key_until_valid(first_time=False) is False - - -def test_prompt_for_key_accept_then_connects(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - class OKPrompt: - def __init__(self, *a, **k): - pass - - def exec(self): - return mwmod.QDialog.Accepted - - def key(self): - return "abc" - - def db_path(self) -> Path | None: - return "foo.db" - - monkeypatch.setattr(mwmod, "KeyPrompt", OKPrompt, raising=True) - monkeypatch.setattr(w, "_try_connect", lambda: True, raising=True) - assert w._prompt_for_key_until_valid(first_time=True) is True - assert w.cfg.key == "abc" - - -# ---- Tabs/date management (368, 383, 388-391, 427-428, …) ---- - - -def test_reorder_tabs_by_date_and_tab_lookup(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - d1 = QDate.fromString("2024-01-10", "yyyy-MM-dd") - d2 = QDate.fromString("2024-01-01", "yyyy-MM-dd") - d3 = QDate.fromString("2024-02-01", "yyyy-MM-dd") - - e2 = w._create_new_tab(d2) - e3 = w._create_new_tab(d3) - e1 = w._create_new_tab(d1) # out of order on purpose - - # Force a reorder and verify ascending order for the three we added. - w._reorder_tabs_by_date() - order = [w.tab_widget.tabText(i) for i in range(w.tab_widget.count())] - today = QDate.currentDate().toString("yyyy-MM-dd") - order_wo_today = [d for d in order if d != today] - assert order_wo_today[:3] == ["2024-01-01", "2024-01-10", "2024-02-01"] - - # _tab_index_for_date finds existing and returns -1 for absent - assert w._tab_index_for_date(d2) != -1 - assert w._tab_index_for_date(QDate.fromString("1999-12-31", "yyyy-MM-dd")) == -1 - assert e1 is not None and e2 is not None and e3 is not None - - -def test_open_close_tabs_and_focus(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - today = QDate.currentDate() - ed = w._open_date_in_tab(today) # creates new if needed - assert hasattr(ed, "current_date") - # make another tab to allow closing - w._create_new_tab(today.addDays(1)) - count = w.tab_widget.count() - w._close_tab(0) - assert w.tab_widget.count() == count - 1 - - -# ---- _set_editor_markdown_preserve_view & load with extra_data (631) ---- - - -def test_load_selected_date_appends_extra_data_with_newline( - qtbot, tmp_db_cfg, app, monkeypatch, fresh_db -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch, fresh_db) - qtbot.addWidget(w) - w.db.save_new_version("2020-01-01", "first line", "seed") - w._load_selected_date("2020-01-01", extra_data="- [ ] carry") - assert "carry" in w.editor.toPlainText() - - -# ---- _save_editor_content early return (679) ---- - - -def test_save_editor_content_returns_without_current_date( - qtbot, tmp_db_cfg, app, monkeypatch -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - from PySide6.QtWidgets import QTextEdit - - other = QTextEdit() - w._save_editor_content(other) # should early-return, not crash - - -# ---- _adjust_today creates a tab (695-696) ---- - - -def test_adjust_today_creates_tab(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - w._adjust_today() - today = QDate.currentDate().toString("yyyy-MM-dd") - assert any(w.tab_widget.tabText(i) == today for i in range(w.tab_widget.count())) - - -# ---- _on_date_changed guard for context menus (745) ---- - - -def test_on_date_changed_early_return_when_context_menu( - qtbot, tmp_db_cfg, app, monkeypatch -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - w._showing_context_menu = True - # Should not throw or load - w._on_date_changed() - assert w._showing_context_menu is True # not toggled here - - -# ---- _save_current explicit paths (793-801, 809-810) ---- - - -def test_save_current_explicit_cancel(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - class CancelSave: - def __init__(self, *a, **k): - pass - - def exec(self): - return mwmod.QDialog.Rejected - - def note_text(self): - return "" - - monkeypatch.setattr(mwmod, "SaveDialog", CancelSave, raising=True) - # returns early, does not raise - w._save_current(explicit=True) - - -def test_save_current_explicit_accept(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - class OKSave: - def __init__(self, *a, **k): - pass - - def exec(self): - return mwmod.QDialog.Accepted - - def note_text(self): - return "manual" - - monkeypatch.setattr(mwmod, "SaveDialog", OKSave, raising=True) - w._save_current(explicit=True) # should start/restart timers without error - - -# ---- Search highlighting (852-854) ---- - - -def test_apply_search_highlights_adds_and_clears(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - d1 = QDate.currentDate() - d2 = d1.addDays(1) - w._apply_search_highlights({d1, d2}) - # now drop d2 so clear-path runs - w._apply_search_highlights({d1}) - fmt = w.calendar.dateTextFormat(d1) - assert fmt.background().style() != Qt.NoBrush - - -# ---- History dialog glue (956, 961-962) ---- - - -def test_open_history_accept_refreshes(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - called = {"load": False, "refresh": False} - - def fake_load(date_iso=None): - called["load"] = True - - def fake_refresh(): - called["refresh"] = True - - monkeypatch.setattr(w, "_load_selected_date", fake_load, raising=True) - monkeypatch.setattr(w, "_refresh_calendar_marks", fake_refresh, raising=True) - - class Dlg: - def __init__(self, *a, **k): - pass - - def exec(self): - return mwmod.QDialog.Accepted - - monkeypatch.setattr(mwmod, "HistoryDialog", Dlg, raising=True) - w._open_history() - assert called["load"] and called["refresh"] - - -# ---- Insert image picker (974, 981-989) ---- - - -def test_on_insert_image_calls_editor_insert( - qtbot, tmp_db_cfg, app, monkeypatch, tmp_path -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Make a tiny PNG file - from PySide6.QtGui import QImage - - img_path = tmp_path / "tiny.png" - img = QImage(1, 1, QImage.Format_ARGB32) - img.fill(0xFFFFFFFF) - img.save(str(img_path)) - - called = [] - - def fake_picker(*a, **k): - return ([str(img_path)], "Images (*.png)") - - monkeypatch.setattr( - mwmod.QFileDialog, "getOpenFileNames", staticmethod(fake_picker), raising=True - ) - - def recorder(path): - called.append(Path(path)) - - monkeypatch.setattr(w.editor, "insert_image_from_path", recorder, raising=True) - - w._on_insert_image() - assert called and called[0].name == "tiny.png" - - -# ---- Export flow branches (1062, 1078-1107) ---- - - -@pytest.mark.parametrize( - "filter_label, method", - [ - ("JSON (*.json)", "export_json"), - ("CSV (*.csv)", "export_csv"), - ("HTML (*.html)", "export_html"), - ("Markdown (*.md)", "export_markdown"), - ("SQL (*.sql)", "export_sql"), - ], -) -def test_export_calls_correct_method( - qtbot, tmp_db_cfg, app, monkeypatch, tmp_path, filter_label, method -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Confirm 'Yes' using the real QMessageBox; patch methods only - monkeypatch.setattr( - mwmod.QMessageBox, "exec", lambda self: mwmod.QMessageBox.Yes, raising=False - ) - monkeypatch.setattr( - mwmod.QMessageBox, "information", staticmethod(lambda *a, **k: 0), raising=False - ) - monkeypatch.setattr( - mwmod.QMessageBox, "critical", staticmethod(lambda *a, **k: 0), raising=False - ) - - # Return a path without extension to exercise default-ext logic too - out = tmp_path / "out" - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: (str(out), filter_label)), - raising=True, - ) - - # Provide some entries - monkeypatch.setattr( - w.db, "get_all_entries", lambda: [("2024-01-01", "x")], raising=True - ) - - called = {"name": None} - - def mark(*a, **k): - called["name"] = method - - monkeypatch.setattr(w.db, method, mark, raising=True) - w._export() - assert called["name"] == method - - -def test_export_unknown_filter_raises_and_is_caught( - qtbot, tmp_db_cfg, app, monkeypatch, tmp_path -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Pre-export confirmation: Yes - monkeypatch.setattr( - mwmod.QMessageBox, "exec", lambda self: mwmod.QMessageBox.Yes, raising=False - ) - - out = tmp_path / "weird" - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: (str(out), "WUT (*.wut)")), - raising=True, - ) - - # Capture the critical call - seen = {} - - def critical(parent, title, text, *a, **k): - seen["title"] = title - seen["text"] = str(text) - return 0 - - monkeypatch.setattr( - mwmod.QMessageBox, "critical", staticmethod(critical), raising=False - ) - - # And stub entries - monkeypatch.setattr(w.db, "get_all_entries", lambda: [], raising=True) - - w._export() - assert "export" in seen["title"].lower() - - -# ---- Backup handler (1147-1148) ---- - - -def test_backup_success_and_error(qtbot, tmp_db_cfg, app, monkeypatch, tmp_path): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Always choose a filename and the SQL option - out = tmp_path / "backup" - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: (str(out), "SQLCipher (*.db)")), - raising=True, - ) - - called = {"ok": False, "err": False} - - def ok_export(path): - called["ok"] = True - - def crit(parent, title, text, *a, **k): - called["err"] = True - return 0 - - # First success - monkeypatch.setattr(w.db, "export_sqlcipher", ok_export, raising=True) - monkeypatch.setattr( - mwmod.QMessageBox, "information", staticmethod(lambda *a, **k: 0), raising=False - ) - monkeypatch.setattr( - mwmod.QMessageBox, "critical", staticmethod(crit), raising=False - ) - w._backup() - assert called["ok"] - - # Then failure - def boom(path): - raise RuntimeError("nope") - - monkeypatch.setattr(w.db, "export_sqlcipher", boom, raising=True) - w._backup() - assert called["err"] - - -# ---- Help openers (1152-1169) ---- - - -def test_open_docs_show_warning_on_failure(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - monkeypatch.setattr( - mwmod.QDesktopServices, "openUrl", staticmethod(lambda *a: False), raising=True - ) - seen = {"docs": False, "bugs": False} - - def warn(parent, title, text, *a, **k): - if "documentation" in title.lower(): - seen["docs"] = True - return 0 - - monkeypatch.setattr( - mwmod, "QMessageBox", type("MB", (), {"warning": staticmethod(warn)}) - ) - w._open_docs() - - assert seen["docs"] - - -def test_open_version(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - called = {"title": None, "text": None, "check_called": False} - - # Fake QMessageBox that mimics the bits VersionChecker.show_version_dialog uses - class FakeMessageBox: - # provide the enum attributes the code references - Information = 0 - ActionRole = 1 - Close = 2 - - def __init__(self, parent=None): - self._parent = parent - self._icon = None - self._title = "" - self._text = "" - self._buttons = [] - self._clicked = None - - def setIcon(self, icon): - self._icon = icon - - def setIconPixmap(self, icon): - self._icon = icon - - def setWindowTitle(self, title): - self._title = title - called["title"] = title - - def setText(self, text): - self._text = text - called["text"] = text - - def addButton(self, *args, **kwargs): - # We don't care about the label/role, we just need a distinct object - btn = object() - self._buttons.append(btn) - return btn - - def exec(self): - # Simulate user clicking the *Close* button, i.e. the second button - if self._buttons: - # show_version_dialog adds buttons in order: - # 0 -> "Check for updates" - # 1 -> Close - self._clicked = self._buttons[-1] - - def clickedButton(self): - return self._clicked - - # Patch the QMessageBox used *inside* version_check.py - monkeypatch.setattr(version_check, "QMessageBox", FakeMessageBox) - - # Optional: track if check_for_updates would be called - def fake_check_for_updates(self): - called["check_called"] = True - - monkeypatch.setattr( - version_check.VersionChecker, "check_for_updates", fake_check_for_updates - ) - - # Call the entrypoint - w._open_version() - - # Assertions: title and text got set correctly - assert called["title"] is not None - assert "version" in called["title"].lower() - - version = importlib.metadata.version("bouquin") - assert version in called["text"] - - # And we simulated closing, so "Check for updates" should not have fired - assert called["check_called"] is False - - -# ---- Idle/lock/event filter helpers (1176, 1181-1187, 1193-1202, 1231-1233) ---- - - -def test_apply_idle_minutes_paths_and_unlock(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # remove timer to hit early return - delattr(w, "_idle_timer") - w._apply_idle_minutes(5) # no crash - - # re-create a timer and simulate locking then disabling idle - w._idle_timer = QTimer(w) - w._idle_timer.setSingleShot(True) - w._locked = True - w._apply_idle_minutes(0) - assert not w._locked # unlocked and overlay hidden path covered - - -def test_event_filter_sets_context_flag_and_keystart( - qtbot, tmp_db_cfg, app, monkeypatch -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - # Right-click on calendar with a real QMouseEvent - me = QMouseEvent( - QEvent.MouseButtonPress, - QPoint(0, 0), - Qt.RightButton, - Qt.RightButton, - Qt.NoModifier, - ) - w.eventFilter(w.calendar, me) - assert getattr(w, "_showing_context_menu", False) is True - - # KeyPress restarts idle timer when unlocked (real QKeyEvent) - w._locked = False - ke = QKeyEvent(QEvent.KeyPress, Qt.Key_A, Qt.NoModifier) - w.eventFilter(w, ke) - - -def test_unlock_exception_path(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - def boom(*a, **k): - raise RuntimeError("nope") - - monkeypatch.setattr(w, "_prompt_for_key_until_valid", boom, raising=True) - - captured = {} - - def critical(parent, title, text, *a, **k): - captured["title"] = title - return 0 - - monkeypatch.setattr( - mwmod, "QMessageBox", type("MB", (), {"critical": staticmethod(critical)}) - ) - w._on_unlock_clicked() - assert "unlock" in captured["title"].lower() - - -# ---- Focus helpers (1273-1275, 1290) ---- - - -def test_focus_editor_now_and_app_state(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - w.show() - # Locked => early return - w._locked = True - w._focus_editor_now() - # Active window path (force isActiveWindow) - w._locked = False - monkeypatch.setattr(w, "isActiveWindow", lambda: True, raising=True) - w._focus_editor_now() - # App state callback path - w._on_app_state_changed(Qt.ApplicationActive) - - -# ---- _rect_on_any_screen false path (1039) ---- - - -def test_rect_on_any_screen_false(qtbot, tmp_db_cfg, app, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - sc = QApplication.primaryScreen().availableGeometry() - far = QRect(sc.right() + 10_000, sc.bottom() + 10_000, 100, 100) - assert not w._rect_on_any_screen(far) - - -def test_reorder_tabs_with_undated_page_stays_last(qtbot, app, tmp_db_cfg, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Create two dated tabs (out of order), plus an undated QWidget page. - d1 = QDate.fromString("2024-02-01", "yyyy-MM-dd") - d2 = QDate.fromString("2024-01-01", "yyyy-MM-dd") - w._create_new_tab(d1) - w._create_new_tab(d2) - - misc = QWidget() - w.tab_widget.addTab(misc, "misc") - - # Reorder and check: dated tabs sorted first, undated kept after them - w._reorder_tabs_by_date() - labels = [w.tab_widget.tabText(i) for i in range(w.tab_widget.count())] - assert labels[0] <= labels[1] - assert labels[-1] == "misc" - - # Also cover lookup for an existing date - assert w._tab_index_for_date(d2) != -1 - - -def test_index_for_date_insert_positions(qtbot, app, tmp_db_cfg, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - a = QDate.fromString("2024-01-01", "yyyy-MM-dd") - c = QDate.fromString("2024-03-01", "yyyy-MM-dd") - d = QDate.fromString("2024-04-01", "yyyy-MM-dd") - - def expected(): - key = (d.year(), d.month(), d.day()) - for i in range(w.tab_widget.count()): - ed = w.tab_widget.widget(i) - cur = getattr(ed, "current_date", None) - if isinstance(cur, QDate) and cur.isValid(): - if (cur.year(), cur.month(), cur.day()) > key: - return i - return w.tab_widget.count() - - w._create_new_tab(a) - w._create_new_tab(c) - - # B belongs between A and C - b = QDate.fromString("2024-02-01", "yyyy-MM-dd") - assert w._index_for_date_insert(b) == 1 - - # Date prior to first should insert at 0 - z = QDate.fromString("2023-12-31", "yyyy-MM-dd") - assert w._index_for_date_insert(z) == 0 - - # Date after last should append - d = QDate.fromString("2024-04-01", "yyyy-MM-dd") - assert w._index_for_date_insert(d) == expected() - - -def test_on_tab_changed_early_and_stop_guard(qtbot, app, tmp_db_cfg, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Early return path - w._on_tab_changed(-1) - - # Create two tabs then make stop() raise to hit try/except guard - w._create_new_tab(QDate.fromString("2024-01-01", "yyyy-MM-dd")) - w._create_new_tab(QDate.fromString("2024-01-02", "yyyy-MM-dd")) - - def boom(): - raise RuntimeError("stop failed") - - monkeypatch.setattr(w._save_timer, "stop", boom, raising=True) - w._on_tab_changed(1) # should not raise - - -def test_show_calendar_context_menu_no_action(qtbot, app, tmp_db_cfg, monkeypatch): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - before = w.tab_widget.count() - - class DummyMenu: - def __init__(self, *a, **k): - pass - - def addAction(self, *a, **k): - return object() - - def exec_(self, *a, **k): - return None # return no action - - monkeypatch.setattr(mwmod, "QMenu", DummyMenu, raising=True) - w._show_calendar_context_menu(w.calendar.rect().center()) # nothing should happen - assert w.tab_widget.count() == before - - -def test_export_cancel_then_empty_filename( - qtbot, app, tmp_db_cfg, monkeypatch, tmp_path -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # 1) cancel at the confirmation dialog - class FullMB: - Yes = QMessageBox.Yes - No = QMessageBox.No - Warning = QMessageBox.Warning - - def __init__(self, *a, **k): - pass - - def setWindowTitle(self, *a): - pass - - def setText(self, *a): - pass - - def setStandardButtons(self, *a): - pass - - def setIcon(self, *a): - pass - - def show(self): - pass - - def adjustSize(self): - pass - - def exec(self): - return self.No - - @staticmethod - def information(*a, **k): - return 0 - - @staticmethod - def critical(*a, **k): - return 0 - - monkeypatch.setattr(mwmod, "QMessageBox", FullMB, raising=True) - w._export() # returns early on No - - # 2) Yes in confirmation, but user cancels file dialog (empty filename) - class YesOnly(FullMB): - def exec(self): - return self.Yes - - monkeypatch.setattr(mwmod, "QMessageBox", YesOnly, raising=True) - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: ("", "Markdown (*.md)")), - raising=False, - ) - w._export() # returns early at filename check - - -def test_set_editor_markdown_preserve_view_preserves( - qtbot, app, tmp_db_cfg, monkeypatch -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - long = "line\n" * 200 - w.editor.from_markdown(long) - w.editor.verticalScrollBar().setValue(50) - w.editor.moveCursor(QTextCursor.End) - pos_before = w.editor.textCursor().position() - v_before = w.editor.verticalScrollBar().value() - - # Same markdown → no rewrite, caret/scroll restored - w._set_editor_markdown_preserve_view(long) - assert w.editor.textCursor().position() == pos_before - assert w.editor.verticalScrollBar().value() == v_before - - # Different markdown → rewritten but caret restoration still executes - changed = long + "extra\n" - w._set_editor_markdown_preserve_view(changed) - assert w.editor.to_markdown().endswith("extra\n") - - -def test_load_date_into_editor_with_extra_data_forces_save( - qtbot, app, tmp_db_cfg, monkeypatch -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - called = {"iso": None, "explicit": None} - - def save_date(iso, explicit): - called.update(iso=iso, explicit=explicit) - - monkeypatch.setattr(w, "_save_date", save_date, raising=True) - d = QDate.fromString("2020-01-01", "yyyy-MM-dd") - w._load_date_into_editor(d, extra_data="- [ ] carry") - assert called["iso"] == "2020-01-01" and called["explicit"] is True - - -def test_reorder_tabs_moves_and_undated(qtbot, app, tmp_db_cfg, monkeypatch): - """Covers moveTab for both dated and undated buckets.""" - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Create out-of-order dated tabs - d1 = QDate.fromString("2024-01-10", "yyyy-MM-dd") - d2 = QDate.fromString("2024-01-01", "yyyy-MM-dd") - d3 = QDate.fromString("2024-02-01", "yyyy-MM-dd") - w._create_new_tab(d1) - w._create_new_tab(d3) - w._create_new_tab(d2) - - # Also insert an "undated" plain QWidget at the front to force a move later - undated = QWidget() - w.tab_widget.insertTab(0, undated, "undated") - - moved = {"calls": []} - tb = w.tab_widget.tabBar() - - def spy_moveTab(frm, to): - moved["calls"].append((frm, to)) - # don't actually move; we just need the call for coverage - - monkeypatch.setattr(tb, "moveTab", spy_moveTab, raising=True) - - w._reorder_tabs_by_date() - assert moved["calls"] # both dated and undated moves should have occurred - - -def test_date_from_calendar_view_none(qtbot, app, tmp_db_cfg, monkeypatch): - """Covers early return when calendar view can't be found.""" - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - monkeypatch.setattr( - w.calendar, - "findChild", - lambda *a, **k: None, # pretend the internal view is missing - raising=False, - ) - assert w._date_from_calendar_pos(QPoint(1, 1)) is None - - -def test_date_from_calendar_no_first_or_last(qtbot, app, tmp_db_cfg, monkeypatch): - """ - Covers early returns when first_index or last_index cannot be found - """ - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - class FakeModel: - def rowCount(self): - return 1 - - def columnCount(self): - return 1 - - class Idx: - def data(self): - return None # never equals first/last-day - - def index(self, *_): - return self.Idx() - - class FakeView: - def model(self): - return FakeModel() - - class VP: - def mapToGlobal(self, p): - return p - - def mapFrom(self, *_): # calendar-local -> viewport - return QPoint(0, 0) - - def viewport(self): - return self.VP() - - def indexAt(self, *_): - # return an *instance* whose isValid() returns False - return type("I", (), {"isValid": lambda self: False})() - - monkeypatch.setattr( - w.calendar, - "findChild", - lambda *a, **k: FakeView(), - raising=False, - ) - # Early return when first day (1) can't be found - assert w._date_from_calendar_pos(QPoint(5, 5)) is None - - -def test_save_editor_content_returns_if_no_conn(qtbot, app, tmp_db_cfg, monkeypatch): - """Covers DB not connected branch.""" - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # window editor has a current_date; simulate a dropped connection - assert isinstance(w.db, DBManager) - w.db.conn = None - # no crash -> branch hit - w._save_editor_content(w.editor) - - -def test_on_date_changed_stops_timer_and_saves_prev_when_dirty( - qtbot, app, tmp_db_cfg, monkeypatch -): - """ - Covers the exception-protected _save_timer.stop() and - the prev-date save path. - """ - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # Make timer.stop() raise so the except path is covered - w._dirty = True - w.editor.current_date = QDate.fromString("2024-01-01", "yyyy-MM-dd") - # make timer.stop() raise so the except path is exercised - monkeypatch.setattr( - w._save_timer, - "stop", - lambda: (_ for _ in ()).throw(RuntimeError("boom")), - raising=True, - ) - - saved = {"iso": None} - - def stub_save_date(iso, explicit=False, note=None): - saved["iso"] = iso - - monkeypatch.setattr(w, "_save_date", stub_save_date, raising=False) - - w._on_date_changed() - assert saved["iso"] == "2024-01-01" - - -def test_bind_toolbar_idempotent(qtbot, app, tmp_db_cfg, monkeypatch): - """Covers early return when toolbar is already bound.""" - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - w._bind_toolbar() - # Call again; line is covered if this no-ops - w._bind_toolbar() - - -def test_on_insert_image_no_selection_returns(qtbot, app, tmp_db_cfg, monkeypatch): - """Covers the early return when user selects no files.""" - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - monkeypatch.setattr( - mwmod.QFileDialog, - "getOpenFileNames", - staticmethod(lambda *a, **k: ([], "")), - raising=True, - ) - - # Ensure we would notice if it tried to insert anything - monkeypatch.setattr( - w.editor, - "insert_image_from_path", - lambda *a, **k: (_ for _ in ()).throw(AssertionError("should not insert")), - raising=True, - ) - w._on_insert_image() - - -def test_apply_idle_minutes_starts_when_unlocked(qtbot, app, tmp_db_cfg, monkeypatch): - """Covers set + start when minutes>0 and not locked.""" - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - w._locked = False - - hit = {"start": False} - monkeypatch.setattr( - w._idle_timer, - "start", - lambda *a, **k: hit.__setitem__("start", True), - raising=True, - ) - w._apply_idle_minutes(7) - assert hit["start"] - - -def test_close_event_handles_settings_failures(qtbot, app, tmp_db_cfg, monkeypatch): - """ - Covers exception swallowing around settings writes & ensures close proceeds - """ - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - qtbot.addWidget(w) - - # A couple of tabs so _save_editor_content runs during close - w._create_new_tab(QDate.fromString("2024-01-01", "yyyy-MM-dd")) - - # Make settings.setValue raise for coverage - orig_set = w.settings.setValue - - def flaky_set(*a, **k): - if a[0] in ("main/geometry", "main/windowState"): - raise RuntimeError("boom") - return orig_set(*a, **k) - - monkeypatch.setattr(w.settings, "setValue", flaky_set, raising=True) - - # Should not crash - w.close() - - -def test_on_date_changed_ignored_when_context_menu_shown( - qtbot, app, tmp_db_cfg, monkeypatch -): - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - # Simulate flag set by context menu to ensure early return path - w._showing_context_menu = True - w._on_date_changed() # should simply return without raising - assert True # reached - - -def test_closeEvent_swallows_exceptions(qtbot, app, tmp_db_cfg, monkeypatch): - called = {"save": False, "close": False} - w = _make_main_window(tmp_db_cfg, app, monkeypatch) - - def bad_save(editor): - called["save"] = True - raise RuntimeError("boom") - - class DummyDB: - def __init__(self): - self.conn = object() # <-- make conn truthy so branch is taken - - def close(self): - called["close"] = True - raise RuntimeError("kaboom") - - class DummyTabs: - def count(self): - return 1 # <-- ensures the save loop runs - - def widget(self, i): - return object() # any non-None editor-like object - - # Patch the pieces the closeEvent checks - w.tab_widget = DummyTabs() - w.db = DummyDB() - monkeypatch.setattr(w, "_save_editor_content", bad_save, raising=True) - - # Fire the event - ev = QCloseEvent() - w.closeEvent(ev) - - assert called["save"] and called["close"] - - -# ============================================================================ -# Tag Save Handler Tests -# ============================================================================ - - -def test_main_window_do_tag_save_with_editor(app, fresh_db, tmp_db_cfg, monkeypatch): - """Test _do_tag_save when editor has current_date""" - # Skip the key prompt - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Set a date on the editor - date = QDate(2024, 1, 15) - window.editor.current_date = date - window.editor.from_markdown("Test content") - - # Call _do_tag_save - window._do_tag_save() - - # Should have saved - fresh_db.get_entry("2024-01-15") - # May or may not have content depending on timing, but should not crash - assert True - - -def test_main_window_do_tag_save_no_editor(app, fresh_db, tmp_db_cfg, monkeypatch): - """Test _do_tag_save when editor doesn't have current_date""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Remove current_date attribute - if hasattr(window.editor, "current_date"): - delattr(window.editor, "current_date") - - # Call _do_tag_save - should handle gracefully - window._do_tag_save() - - assert True - - -def test_main_window_on_tag_added_triggers_deferred_save( - app, fresh_db, tmp_db_cfg, monkeypatch -): - """Test that _on_tag_added defers the save""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Mock QTimer.singleShot - with patch("PySide6.QtCore.QTimer.singleShot") as mock_timer: - window._on_tag_added() - - # Should have called singleShot - mock_timer.assert_called_once() - args = mock_timer.call_args[0] - assert args[0] == 0 # Delay of 0 - assert callable(args[1]) # Callback function - - -# ============================================================================ -# Tag Activation Tests -# ============================================================================ - - -def test_main_window_on_tag_activated_with_date(app, fresh_db, tmp_db_cfg, monkeypatch): - """Test _on_tag_activated when passed a date string""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Mock _load_selected_date - window._load_selected_date = Mock() - - # Call with date format - window._on_tag_activated("2024-01-15") - - # Should have called _load_selected_date - window._load_selected_date.assert_called_once_with("2024-01-15") - - -def test_main_window_on_tag_activated_with_tag_name( - app, fresh_db, tmp_db_cfg, monkeypatch -): - """Test _on_tag_activated when passed a tag name""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Mock the tag browser dialog (it's imported locally in the method) - with patch("bouquin.tag_browser.TagBrowserDialog") as mock_dialog: - mock_instance = Mock() - mock_instance.openDateRequested = Mock() - mock_instance.exec.return_value = QDialog.Accepted - mock_dialog.return_value = mock_instance - - # Call with tag name - window._on_tag_activated("worktag") - - # Should have opened dialog - mock_dialog.assert_called_once() - # Check focus_tag was passed - call_kwargs = mock_dialog.call_args[1] - assert call_kwargs.get("focus_tag") == "worktag" - - -# ============================================================================ -# Settings Path Change Tests -# ============================================================================ - - -def test_main_window_settings_path_change_success( - app, fresh_db, tmp_db_cfg, tmp_path, monkeypatch -): - """Test changing database path in settings""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - new_path = tmp_path / "new.db" - - # Mock the settings dialog - with patch("bouquin.main_window.SettingsDialog") as mock_dialog: - mock_instance = Mock() - mock_instance.exec.return_value = QDialog.Accepted - - # Create a new config with different path - new_cfg = Mock() - new_cfg.path = str(new_path) - new_cfg.key = tmp_db_cfg.key - new_cfg.idle_minutes = 15 - new_cfg.theme = "light" - new_cfg.move_todos = True - new_cfg.locale = "en" - new_cfg.font_size = 11 - - mock_instance.config = new_cfg - mock_dialog.return_value = mock_instance - - # Mock _prompt_for_key_until_valid to return True - window._prompt_for_key_until_valid = Mock(return_value=True) - # Also mock _load_selected_date and _refresh_calendar_marks since we don't have a real DB connection - window._load_selected_date = Mock() - window._refresh_calendar_marks = Mock() - - # Open settings - window._open_settings() - - # Path should have changed - assert window.cfg.path == str(new_path) - - -def test_main_window_settings_path_change_failure( - app, fresh_db, tmp_db_cfg, tmp_path, monkeypatch -): - """Test failed database path change shows warning""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - new_path = tmp_path / "new.db" - - # Mock the settings dialog - with patch("bouquin.main_window.SettingsDialog") as mock_dialog: - mock_instance = Mock() - mock_instance.exec.return_value = QDialog.Accepted - - new_cfg = Mock() - new_cfg.path = str(new_path) - new_cfg.key = tmp_db_cfg.key - new_cfg.idle_minutes = 15 - new_cfg.theme = "light" - new_cfg.move_todos = True - new_cfg.locale = "en" - new_cfg.font_size = 11 - - mock_instance.config = new_cfg - mock_dialog.return_value = mock_instance - - # Mock _prompt_for_key_until_valid to return False (failure) - window._prompt_for_key_until_valid = Mock(return_value=False) - - # Mock QMessageBox.warning - with patch.object(QMessageBox, "warning") as mock_warning: - # Open settings - window._open_settings() - - # Warning should have been shown - mock_warning.assert_called_once() - - -def test_main_window_settings_no_path_change(app, fresh_db, tmp_db_cfg, monkeypatch): - """Test settings change without path change""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - old_path = window.cfg.path - - # Mock the settings dialog - with patch("bouquin.main_window.SettingsDialog") as mock_dialog: - mock_instance = Mock() - mock_instance.exec.return_value = QDialog.Accepted - - # Create config with SAME path - new_cfg = Mock() - new_cfg.path = old_path - new_cfg.key = tmp_db_cfg.key - new_cfg.idle_minutes = 20 # Changed - new_cfg.theme = "dark" # Changed - new_cfg.move_todos = False # Changed - new_cfg.locale = "fr" # Changed - new_cfg.font_size = 12 # Changed - - mock_instance.config = new_cfg - mock_dialog.return_value = mock_instance - - # Open settings - window._open_settings() - - # Settings should be updated but path didn't change - assert window.cfg.idle_minutes == 20 - assert window.cfg.theme == "dark" - assert window.cfg.path == old_path - assert window.cfg.font_size == 12 - - -def test_main_window_settings_cancelled(app, fresh_db, tmp_db_cfg, monkeypatch): - """Test cancelling settings dialog""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - old_theme = window.cfg.theme - - # Mock the settings dialog to be rejected - with patch("bouquin.main_window.SettingsDialog") as mock_dialog: - mock_instance = Mock() - mock_instance.exec.return_value = QDialog.Rejected - mock_dialog.return_value = mock_instance - - # Open settings - window._open_settings() - - # Settings should NOT change - assert window.cfg.theme == old_theme - - -# ============================================================================ -# Update Tag Views Tests -# ============================================================================ - - -def test_main_window_update_tag_views_for_date(app, fresh_db, tmp_db_cfg, monkeypatch): - """Test _update_tag_views_for_date""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Set tags for a date - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - # Update tag views - window._update_tag_views_for_date("2024-01-15") - - # Tags widget should have been updated - assert window.tags._current_date == "2024-01-15" - - -def test_main_window_update_tag_views_no_tags_widget( - app, fresh_db, tmp_db_cfg, monkeypatch -): - """Test _update_tag_views_for_date when tags widget doesn't exist""" - monkeypatch.setattr( - "bouquin.main_window.KeyPrompt", - lambda *args, **kwargs: Mock(exec=lambda: True, key=lambda: tmp_db_cfg.key), - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes) - - # Remove tags widget - delattr(window, "tags") - - # Should handle gracefully - window._update_tag_views_for_date("2024-01-15") - - assert True - - -def test_main_window_without_tags(qtbot, app, tmp_db_cfg): - """Test main window when tags feature is disabled.""" - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", False) # Disabled - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Verify tags widget is hidden - assert window.tags.isHidden() - - -def test_main_window_without_time_log(qtbot, app, tmp_db_cfg): - """Test main window when time_log feature is disabled.""" - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", False) # Disabled - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Verify time_log widget is hidden - assert window.time_log.isHidden() - assert not window.toolBar.actTimer.isVisible() - - -def test_main_window_without_documents(qtbot, app, tmp_db_cfg): - """Test main window when documents feature is disabled.""" - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/documents", False) # Disabled - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Verify documents widget is hidden - assert window.todays_documents.isHidden() - assert not window.toolBar.actDocuments.isVisible() - - -def test_export_csv_format(qtbot, app, tmp_path, monkeypatch): - """Test exporting to CSV format - covers export path lines""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - # Add some data - w.db.save_new_version("2024-01-01", "Test content", "test") - - # Mock file dialog to return CSV - dest = tmp_path / "export_test.csv" - monkeypatch.setattr( - mwmod.QFileDialog, - "getSaveFileName", - staticmethod(lambda *a, **k: (str(dest), "CSV (*.csv)")), - ) - - # Mock QMessageBox to auto-accept - monkeypatch.setattr( - mwmod.QMessageBox, "exec", lambda self: mwmod.QMessageBox.Yes, raising=False - ) - monkeypatch.setattr( - mwmod.QMessageBox, "information", staticmethod(lambda *a, **k: 0), raising=False - ) - - w._export() - assert dest.exists() - - -def test_settings_dialog_with_locale_change(qtbot, app, tmp_path, monkeypatch): - """Test opening settings dialog and changing locale - covers settings dialog paths""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - # Mock the settings dialog to auto-accept - from bouquin.settings_dialog import SettingsDialog - - SettingsDialog.exec - - def fake_exec(self): - # Change locale before accepting - idx = self.locale_combobox.findData("fr") - if idx >= 0: - self.locale_combobox.setCurrentIndex(idx) - return mwmod.QDialog.Accepted - - monkeypatch.setattr(SettingsDialog, "exec", fake_exec) - - w._open_settings() - qtbot.wait(50) - - -def test_statistics_dialog_open(qtbot, app, tmp_path, monkeypatch): - """Test opening statistics dialog - covers statistics dialog paths""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - # Add some data - w.db.save_new_version("2024-01-01", "Test content", "test") - - from bouquin.statistics_dialog import StatisticsDialog - - StatisticsDialog.exec - - def fake_exec(self): - # Just accept immediately - return mwmod.QDialog.Accepted - - monkeypatch.setattr(StatisticsDialog, "exec", fake_exec) - - w._open_statistics() - qtbot.wait(50) - - -def test_bug_report_dialog_open(qtbot, app, tmp_path, monkeypatch): - """Test opening bug report dialog""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - from bouquin.bug_report_dialog import BugReportDialog - - BugReportDialog.exec - - def fake_exec(self): - return mwmod.QDialog.Rejected - - monkeypatch.setattr(BugReportDialog, "exec", fake_exec) - - w._open_bugs() - qtbot.wait(50) - - -def test_history_dialog_open_and_restore(qtbot, app, tmp_path, monkeypatch): - """Test opening history dialog and restoring a version""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - # Add some data - date_str = QDate.currentDate().toString("yyyy-MM-dd") - w.db.save_new_version(date_str, "Version 1", "v1") - w.db.save_new_version(date_str, "Version 2", "v2") - - from bouquin.history_dialog import HistoryDialog - - def fake_exec(self): - # Simulate selecting first version and accepting - if self.list.count() > 0: - self.list.setCurrentRow(0) - self._revert() - return mwmod.QDialog.Accepted - - monkeypatch.setattr(HistoryDialog, "exec", fake_exec) - - w._open_history() - qtbot.wait(50) - - -def test_goto_today_button(qtbot, app, tmp_path): - """Test going to today's date""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - # Move to a different date - past_date = QDate.currentDate().addDays(-30) - w.calendar.setSelectedDate(past_date) - - # Go back to today - w._adjust_today() - qtbot.wait(50) - - assert w.calendar.selectedDate() == QDate.currentDate() - - -def test_adjust_font_size(qtbot, app, tmp_path): - """Test adjusting font size""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/font_size", 12) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - initial_size = w.editor.font().pointSize() - - # Increase font size - w._on_font_larger_requested() - qtbot.wait(50) - assert w.editor.font().pointSize() > initial_size - - # Decrease font size - w._on_font_smaller_requested() - qtbot.wait(50) - - -def test_calendar_date_selection(qtbot, app, tmp_path): - """Test selecting a date from calendar""" - db_path = tmp_path / "notebook.db" - s = get_settings() - s.setValue("db/default_db", str(db_path)) - s.setValue("db/key", "test-key") - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - w = MainWindow(themes=themes) - qtbot.addWidget(w) - w.show() - - # Select a specific date - test_date = QDate(2024, 6, 15) - w.calendar.setSelectedDate(test_date) - qtbot.wait(50) - - # The window should load that date - assert test_date.toString("yyyy-MM-dd") in str(w._current_date_iso()) - - -def test_main_window_without_reminders(qtbot, app, tmp_db_cfg): - """Test main window when reminders feature is disabled.""" - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", False) # Disabled - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Verify reminders widget is hidden - assert window.upcoming_reminders.isHidden() - assert not window.toolBar.actAlarm.isVisible() - - -def test_close_current_tab(qtbot, app, tmp_db_cfg, fresh_db): - """Test closing the current tab via _close_current_tab.""" - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Open multiple tabs - today = date.today().isoformat() - tomorrow = (date.today() + timedelta(days=1)).isoformat() - - window._open_date_in_tab(QDate.fromString(today, "yyyy-MM-dd")) - window._open_date_in_tab(QDate.fromString(tomorrow, "yyyy-MM-dd")) - - initial_count = window.tab_widget.count() - assert initial_count >= 2 - - # Close current tab - window._close_current_tab() - - # Verify tab was closed - assert window.tab_widget.count() == initial_count - 1 - - -def test_parse_today_alarms(qtbot, app, tmp_db_cfg, fresh_db, freeze_qt_time): - """Test parsing inline alarms from markdown (⏰ HH:MM format).""" - from PySide6.QtCore import QTime - - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Open today's date - today_qdate = QDate.currentDate() - window._open_date_in_tab(today_qdate) - - # Set content with a future alarm - future_time = QTime.currentTime().addSecs(3600) - alarm_text = f"Do something ⏰ {future_time.hour():02d}:{future_time.minute():02d}" - - # Set the editor's current_date attribute - window.editor.current_date = today_qdate - window.editor.setPlainText(alarm_text) - - # Clear any existing timers - window._reminder_timers = [] - - # Trigger alarm parsing - window._rebuild_reminders_for_today() - - # Verify timer was created (not DB reminder) - assert len(window._reminder_timers) > 0 - - -def test_parse_today_alarms_invalid_time(qtbot, app, tmp_db_cfg, fresh_db): - """Test that invalid time formats are skipped.""" - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Open today's date - today_qdate = QDate.currentDate() - window._open_date_in_tab(today_qdate) - - # Set content with invalid time - alarm_text = "Do something ⏰ 25:99" # Invalid time - - window.editor.current_date = today_qdate - window.editor.setPlainText(alarm_text) - - # Clear any existing timers - window._reminder_timers = [] - - # Trigger alarm parsing - should not crash - window._rebuild_reminders_for_today() - - # No timer should be created for invalid time - assert len(window._reminder_timers) == 0 - - -def test_parse_today_alarms_past_time(qtbot, app, tmp_db_cfg, fresh_db, freeze_qt_time): - """Test that past alarms are skipped.""" - from PySide6.QtCore import QTime - - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Open today's date - today_qdate = QDate.currentDate() - window._open_date_in_tab(today_qdate) - - # Set content with past time - past_time = QTime.currentTime().addSecs(-3600) # 1 hour ago - alarm_text = f"Do something ⏰ {past_time.hour():02d}:{past_time.minute():02d}" - - window.editor.current_date = today_qdate - window.editor.setPlainText(alarm_text) - - # Clear any existing timers - window._reminder_timers = [] - - # Trigger alarm parsing - window._rebuild_reminders_for_today() - - # Past alarms should not create timers - assert len(window._reminder_timers) == 0 - - -def test_parse_today_alarms_no_text(qtbot, app, tmp_db_cfg, fresh_db, freeze_qt_time): - """Test alarm with no text before emoji uses fallback.""" - from PySide6.QtCore import QTime - - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Open today's date - today_qdate = QDate.currentDate() - window._open_date_in_tab(today_qdate) - - # Set content with alarm but no text - future_time = QTime.currentTime().addSecs(3600) - alarm_text = f"⏰ {future_time.hour():02d}:{future_time.minute():02d}" - - window.editor.current_date = today_qdate - window.editor.setPlainText(alarm_text) - - # Clear any existing timers - window._reminder_timers = [] - - # Trigger alarm parsing - window._rebuild_reminders_for_today() - - # Timer should be created even without text - assert len(window._reminder_timers) > 0 - - -def test_open_history_with_editor(qtbot, app, tmp_db_cfg, fresh_db): - """Test opening history when editor has content.""" - from unittest.mock import patch - - s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) - s.setValue("db/key", tmp_db_cfg.key) - s.setValue("ui/idle_minutes", 0) - s.setValue("ui/theme", "light") - s.setValue("ui/move_todos", True) - s.setValue("ui/tags", True) - s.setValue("ui/time_log", True) - s.setValue("ui/reminders", True) - s.setValue("ui/locale", "en") - s.setValue("ui/font_size", 11) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - window = MainWindow(themes=themes) - qtbot.addWidget(window) - window.show() - - # Create some history - today = date.today().isoformat() - fresh_db.save_new_version(today, "v1", "note1") - fresh_db.save_new_version(today, "v2", "note2") - - # Open today's date - window._open_date_in_tab(QDate.fromString(today, "yyyy-MM-dd")) - - # Open history - with patch("bouquin.history_dialog.HistoryDialog.exec") as mock_exec: - mock_exec.return_value = False # User cancels - window._open_history() - - # HistoryDialog should have been created and shown - mock_exec.assert_called_once() diff --git a/tests/test_markdown_editor.py b/tests/test_markdown_editor.py index dcacbc5..002ab63 100644 --- a/tests/test_markdown_editor.py +++ b/tests/test_markdown_editor.py @@ -1,26 +1,9 @@ -import base64 - import pytest + +from PySide6.QtCore import Qt, QPoint +from PySide6.QtGui import QImage, QColor, QKeyEvent, QTextCursor from bouquin.markdown_editor import MarkdownEditor -from bouquin.markdown_highlighter import MarkdownHighlighter -from bouquin.theme import Theme, ThemeConfig, ThemeManager -from PySide6.QtCore import QMimeData, QPoint, Qt, QUrl -from PySide6.QtGui import ( - QColor, - QFont, - QImage, - QKeyEvent, - QTextCharFormat, - QTextCursor, - QTextDocument, -) -from PySide6.QtWidgets import QApplication, QTextEdit - - -def _today(): - from datetime import date - - return date.today().isoformat() +from bouquin.theme import ThemeManager, ThemeConfig, Theme def text(editor) -> str: @@ -49,15 +32,6 @@ def editor(app, qtbot): return ed -@pytest.fixture -def editor_hello(app): - tm = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - e = MarkdownEditor(tm) - e.setPlainText("hello") - e.moveCursor(QTextCursor.MoveOperation.End) - return e - - def test_from_and_to_markdown_roundtrip(editor): md = "# Title\n\nThis is **bold** and _italic_ and ~~strike~~.\n\n- [ ] task\n- [x] done\n\n```\ncode\n```" editor.from_markdown(md) @@ -95,10 +69,11 @@ def test_insert_image_from_path(editor, tmp_path): editor.insert_image_from_path(img) md = editor.to_markdown() - # Accept either "image/png" or older "image/image/png" prefix - assert "data:image/png;base64" in md or "data:image/image/png;base64" in md + # Images are saved as base64 data URIs in markdown + assert "data:image/image/png;base64" in md +@pytest.mark.gui def test_checkbox_toggle_by_click(editor, qtbot): # Load a markdown checkbox editor.from_markdown("- [ ] task here") @@ -108,10 +83,13 @@ def test_checkbox_toggle_by_click(editor, qtbot): # Click on the first character region to toggle c = editor.textCursor() + from PySide6.QtGui import QTextCursor + c.movePosition(QTextCursor.StartOfBlock) editor.setTextCursor(c) r = editor.cursorRect() center = r.center() + # Send click slightly right to land within checkbox icon region pos = QPoint(r.left() + 2, center.y()) qtbot.mouseClick(editor.viewport(), Qt.LeftButton, pos=pos) @@ -120,6 +98,7 @@ def test_checkbox_toggle_by_click(editor, qtbot): assert "☑" in display2 +@pytest.mark.gui def test_apply_heading_levels(editor, qtbot): editor.setPlainText("hello") editor.selectAll() @@ -136,6 +115,7 @@ def test_apply_heading_levels(editor, qtbot): assert not editor.toPlainText().startswith("#") +@pytest.mark.gui def test_enter_on_nonempty_list_continues(qtbot, editor): qtbot.addWidget(editor) editor.show() @@ -147,9 +127,10 @@ def test_enter_on_nonempty_list_continues(qtbot, editor): ev = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier, "\n") editor.keyPressEvent(ev) txt = editor.toPlainText() - assert "\n\u2022 " in txt + assert "\n- " in txt +@pytest.mark.gui def test_enter_on_empty_list_marks_empty(qtbot, editor): qtbot.addWidget(editor) editor.show() @@ -160,27 +141,92 @@ def test_enter_on_empty_list_marks_empty(qtbot, editor): ev = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier, "\n") editor.keyPressEvent(ev) - assert editor.toPlainText().startswith("\u2022 \n") + assert editor.toPlainText().startswith("- \n") -def test_triple_backtick_triggers_code_dialog_but_no_block_on_empty_code(editor, qtbot): - # Start empty +@pytest.mark.gui +def test_triple_backtick_autoexpands(editor, qtbot): editor.from_markdown("") press_backtick(qtbot, editor, 2) - press_backtick(qtbot, editor, 1) # triggers the 3rd-backtick shortcut + press_backtick(qtbot, editor, 1) # triggers expansion qtbot.wait(0) t = text(editor) - - # The two typed backticks should have been removed - assert "`" not in t - - # With the new dialog-based implementation, and our test stub that accepts - # the dialog with empty code, no fenced code block is inserted. - assert "```" not in t - assert t == "" + assert t.count("```") == 2 + assert t.startswith("```\n\n```") + assert t.endswith("\n") + # caret is on the blank line inside the block + assert editor.textCursor().blockNumber() == 1 + assert lines_keep(editor)[1] == "" +@pytest.mark.gui +def test_toolbar_inserts_block_on_own_lines(editor, qtbot): + editor.from_markdown("hello") + editor.moveCursor(QTextCursor.End) + editor.apply_code() # action + qtbot.wait(0) + + t = text(editor) + assert "hello```" not in t # never inline + assert t.startswith("hello\n```") + assert t.endswith("```\n") + # caret inside block (blank line) + assert editor.textCursor().blockNumber() == 2 + assert lines_keep(editor)[2] == "" + + +@pytest.mark.gui +def test_toolbar_inside_block_does_not_insert_inline_fences(editor, qtbot): + editor.from_markdown("") + editor.apply_code() # create a block (caret now on blank line inside) + qtbot.wait(0) + + pos_before = editor.textCursor().position() + t_before = text(editor) + + editor.apply_code() # pressing inside should be a no-op + qtbot.wait(0) + + assert text(editor) == t_before + assert editor.textCursor().position() == pos_before + + +@pytest.mark.gui +def test_toolbar_on_opening_fence_jumps_inside(editor, qtbot): + editor.from_markdown("") + editor.apply_code() + qtbot.wait(0) + + # Go to opening fence (line 0) + editor.moveCursor(QTextCursor.Start) + editor.apply_code() # should jump inside the block + qtbot.wait(0) + + assert editor.textCursor().blockNumber() == 1 + assert lines_keep(editor)[1] == "" + + +@pytest.mark.gui +def test_toolbar_on_closing_fence_jumps_out(editor, qtbot): + editor.from_markdown("") + editor.apply_code() + qtbot.wait(0) + + # Go to closing fence line (template: 0 fence, 1 blank, 2 fence, 3 blank-after) + editor.moveCursor(QTextCursor.End) # blank-after + editor.moveCursor(QTextCursor.Up) # closing fence + editor.moveCursor(QTextCursor.StartOfLine) + + editor.apply_code() # jump to the line after the fence + qtbot.wait(0) + + # Now on the blank line after the block + assert editor.textCursor().block().text() == "" + assert editor.textCursor().block().previous().text().strip() == "```" + + +@pytest.mark.gui def test_down_escapes_from_last_code_line(editor, qtbot): editor.from_markdown("```\nLINE\n```\n") # Put caret at end of "LINE" @@ -196,6 +242,7 @@ def test_down_escapes_from_last_code_line(editor, qtbot): assert editor.textCursor().block().previous().text().strip() == "```" +@pytest.mark.gui def test_down_on_closing_fence_at_eof_creates_line(editor, qtbot): editor.from_markdown("```\ncode\n```") # no trailing newline # caret on closing fence line @@ -211,6 +258,7 @@ def test_down_on_closing_fence_at_eof_creates_line(editor, qtbot): assert editor.textCursor().block().previous().text().strip() == "```" +@pytest.mark.gui def test_no_orphan_two_backticks_lines_after_edits(editor, qtbot): editor.from_markdown("") # create a block via typing @@ -222,2135 +270,3 @@ def test_no_orphan_two_backticks_lines_after_edits(editor, qtbot): # ensure there are no stray "``" lines assert not any(ln.strip() == "``" for ln in lines_keep(editor)) - - -def _fmt_at(block, pos): - """Return a *copy* of the char format at pos so it doesn't dangle.""" - layout = block.layout() - for fr in list(layout.formats()): - if fr.start <= pos < fr.start + fr.length: - return QTextCharFormat(fr.format) - return None - - -@pytest.fixture -def highlighter(app): - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - hl = MarkdownHighlighter(doc, themes) - return doc, hl - - -def test_headings_and_inline_styles(highlighter): - doc, hl = highlighter - doc.setPlainText("# H1\n## H2\n### H3\n***b+i*** **b** *i* __b__ _i_\n") - hl.rehighlight() - - # H1: '#' markers hidden (very small size), text bold/larger - b0 = doc.findBlockByNumber(0) - fmt_marker = _fmt_at(b0, 0) - assert fmt_marker is not None - assert fmt_marker.fontPointSize() <= 0.2 # marker hidden - - fmt_h1_text = _fmt_at(b0, 2) - assert fmt_h1_text is not None - assert fmt_h1_text.fontWeight() == QFont.Weight.Bold - - # Bold-italic precedence - b3 = doc.findBlockByNumber(3) - line = b3.text() - triple = "***b+i***" - start = line.find(triple) - assert start != -1 - pos_inside = start + 3 # skip the *** markers, land on 'b' - f_bi_inner = _fmt_at(b3, pos_inside) - assert f_bi_inner is not None - assert f_bi_inner.fontWeight() == QFont.Weight.Bold and f_bi_inner.fontItalic() - - # Bold without triples - f_b = _fmt_at(b3, b3.text().find("**b**") + 2) - assert f_b.fontWeight() == QFont.Weight.Bold - - # Italic without bold - f_i = _fmt_at(b3, b3.text().rfind("_i_") + 1) - assert f_i.fontItalic() - - -def test_code_blocks_inline_code_and_strike_overlay(highlighter): - doc, hl = highlighter - doc.setPlainText("```\n**B**\n```\nX ~~**boom**~~ Y `code`\n") - hl.rehighlight() - - # Fence and inner lines use code block format - fence = doc.findBlockByNumber(0) - inner = doc.findBlockByNumber(1) - - fmt_fence = _fmt_at(fence, 0) - fmt_inner = _fmt_at(inner, 0) - assert fmt_fence is not None and fmt_inner is not None - - # check key properties - assert fmt_inner.fontFixedPitch() or fmt_inner.font().styleHint() == QFont.Monospace - assert fmt_inner.background() == hl.code_block_format.background() - - # Inline code uses fixed pitch and hides the backticks - inline = doc.findBlockByNumber(3) - start = inline.text().find("`code`") - - fmt_inline_char = _fmt_at(inline, start + 1) - fmt_inline_tick = _fmt_at(inline, start) - assert fmt_inline_char is not None and fmt_inline_tick is not None - assert fmt_inline_char.fontFixedPitch() - assert fmt_inline_tick.fontPointSize() <= 0.2 # backtick hidden - - boom_pos = inline.text().find("boom") - fmt_boom = _fmt_at(inline, boom_pos) - assert fmt_boom is not None - assert fmt_boom.fontStrikeOut() and fmt_boom.fontWeight() == QFont.Weight.Bold - - -def test_theme_change_rehighlight(highlighter): - doc, hl = highlighter - hl._on_theme_changed() - doc.setPlainText("`x`") - hl.rehighlight() - b = doc.firstBlock() - fmt = _fmt_at(b, 1) - assert fmt is not None and fmt.fontFixedPitch() - - -@pytest.fixture -def hl_light(app): - # Light theme path - tm = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - hl = MarkdownHighlighter(doc, tm) - return doc, hl - - -@pytest.fixture -def hl_light_edit(app, qtbot): - tm = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - edit = QTextEdit() # <-- give the doc a layout - edit.setDocument(doc) - qtbot.addWidget(edit) - edit.show() - qtbot.wait(10) # let Qt build the layouts - hl = MarkdownHighlighter(doc, tm) - return doc, hl, edit - - -def fmt(doc, block_no, pos): - """Return the QTextCharFormat at character position `pos` in the given block.""" - b = doc.findBlockByNumber(block_no) - it = b.begin() - off = 0 - while not it.atEnd(): - frag = it.fragment() - length = frag.length() # includes chars in this fragment - if off + length > pos: - return frag.charFormat() - off += length - it = it.next() - # Fallback (shouldn't happen in our tests) - cf = QTextCharFormat() - return cf - - -def test_light_palette_specific_colors(hl_light_edit, qtbot): - doc, hl, edit = hl_light_edit - doc.setPlainText("```\ncode\n```") - hl.rehighlight() - # the second block ("code") is the one inside the fenced block - b_code = doc.firstBlock().next() - fmt = _fmt_at(b_code, 0) - assert fmt is not None and fmt.background().style() != 0 - - -def test_code_block_light_colors(hl_light): - """Ensure code block colors use the light palette (covers 74-75).""" - doc, hl = hl_light - doc.setPlainText("```\ncode\n```") - hl.rehighlight() - # Background is a light gray and text is dark/black-ish in light theme - bg = hl.code_block_format.background().color() - fg = hl.code_block_format.foreground().color() - assert bg.red() >= 240 and bg.green() >= 240 and bg.blue() >= 240 - assert fg.red() < 40 and fg.green() < 40 and fg.blue() < 40 - - -def test_end_guard_skips_italic_followed_by_marker(hl_light): - """ - Triggers the end-following guard for italic e.g. '*i**'. - """ - doc, hl = hl_light - doc.setPlainText("*i**") - hl.rehighlight() - # The 'i' should not get italic due to the guard (closing '*' followed by '*') - f = fmt(doc, 0, 1) - assert not f.fontItalic() - - -def test_char_rect_at_edges_and_click_checkbox(editor, qtbot): - """ - Exercises char_rect_at()-style logic and checkbox toggle via click - to push coverage on geometry-dependent paths. - """ - editor.from_markdown("- [ ] task") - c = editor.textCursor() - c.movePosition(QTextCursor.StartOfBlock) - editor.setTextCursor(c) - r = editor.cursorRect() - qtbot.mouseClick(editor.viewport(), Qt.LeftButton, pos=r.center()) - assert "☑" in editor.toPlainText() - - -def test_heading_apply_levels_and_inline_styles(editor): - editor.setPlainText("hello") - editor.selectAll() - editor.apply_heading(18) # H2 - assert editor.toPlainText().startswith("## ") - editor.selectAll() - editor.apply_heading(12) # normal - assert not editor.toPlainText().startswith("#") - - # Bold/italic/strike together to nudge style branches - editor.setPlainText("hi") - editor.selectAll() - editor.apply_weight() - editor.apply_italic() - editor.apply_strikethrough() - md = editor.to_markdown() - assert "**" in md and "*" in md and "~~" in md - - -def test_insert_image_and_markdown_roundtrip(editor, tmp_path): - img = tmp_path / "p.png" - qimg = QImage(2, 2, QImage.Format_RGBA8888) - qimg.fill(QColor(255, 0, 0)) - assert qimg.save(str(img)) - editor.insert_image_from_path(img) - # At least a replacement char shows in the plain-text view - assert "\ufffc" in editor.toPlainText() - # And markdown contains a data: URI - assert "data:image" in editor.to_markdown() - - -def test_apply_italic_and_strike(editor): - # Italic: insert markers with no selection and place caret in between - editor.setPlainText("x") - editor.moveCursor(QTextCursor.MoveOperation.End) - editor.apply_italic() - assert editor.toPlainText().endswith("x**") - assert editor.textCursor().position() == len(editor.toPlainText()) - 1 - - # With selection toggling - editor.setPlainText("*y*") - c = editor.textCursor() - c.movePosition(QTextCursor.MoveOperation.End, QTextCursor.MoveMode.MoveAnchor) - c.movePosition(QTextCursor.MoveOperation.Start, QTextCursor.MoveMode.KeepAnchor) - editor.setTextCursor(c) - editor.apply_italic() - assert editor.toPlainText() == "y" - - # Strike: no selection case inserts placeholder and moves caret - editor.setPlainText("z") - editor.moveCursor(QTextCursor.MoveOperation.End) - editor.apply_strikethrough() - assert editor.toPlainText().endswith("z~~~~") - assert editor.textCursor().position() == len(editor.toPlainText()) - 2 - - -def test_insert_image_from_path_invalid_returns(editor_hello, tmp_path): - # Non-existent path should just return (early exit) - bad = tmp_path / "missing.png" - editor_hello.insert_image_from_path(bad) - # Nothing new added - assert editor_hello.toPlainText() == "hello" - - -# ============================================================================ -# setDocument Tests -# ============================================================================ - - -def test_markdown_editor_set_document(app): - """Test setting a new document on the editor""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - # Create a new document - new_doc = QTextDocument() - new_doc.setPlainText("New document content") - - # Set the document - editor.setDocument(new_doc) - - # Verify document was set - assert editor.document() == new_doc - assert "New document content" in editor.toPlainText() - - -def test_markdown_editor_set_document_with_highlighter(app): - """Test setting document preserves highlighter""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - # Ensure highlighter exists - assert hasattr(editor, "highlighter") - - # Create and set new document - new_doc = QTextDocument() - new_doc.setPlainText("# Heading") - editor.setDocument(new_doc) - - # Highlighter should be attached to new document - assert editor.highlighter.document() == new_doc - - -# ============================================================================ -# showEvent Tests -# ============================================================================ - - -def test_markdown_editor_show_event(app, qtbot): - """Test showEvent triggers code block background update""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("```python\ncode\n```") - - # Show the editor - editor.show() - qtbot.waitExposed(editor) - - # Process events to let QTimer.singleShot fire - QApplication.processEvents() - - # Editor should be visible - assert editor.isVisible() - - -# ============================================================================ -# Checkbox Transformation Tests -# ============================================================================ - - -def test_markdown_editor_transform_unchecked_checkbox(app, qtbot): - """Test transforming - [ ] to unchecked checkbox""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - qtbot.waitExposed(editor) - - # Type checkbox markdown - editor.insertPlainText("- [ ] Task") - - # Process events to let transformation happen - QApplication.processEvents() - - # Should contain checkbox character - text = editor.toPlainText() - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_markdown_editor_transform_checked_checkbox(app, qtbot): - """Test transforming - [x] to checked checkbox""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - qtbot.waitExposed(editor) - - # Type checked checkbox markdown - editor.insertPlainText("- [x] Done") - - # Process events - QApplication.processEvents() - - # Should contain checked checkbox character - text = editor.toPlainText() - assert editor._CHECK_CHECKED_DISPLAY in text - - -def test_markdown_editor_transform_todo(app, qtbot): - """Test transforming TODO to unchecked checkbox""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - qtbot.waitExposed(editor) - - # Type TODO - editor.insertPlainText("TODO: Important task") - - # Process events - QApplication.processEvents() - - # Should contain checkbox and no TODO - text = editor.toPlainText() - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_markdown_editor_transform_todo_with_indent(app, qtbot): - """Test transforming indented TODO""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - qtbot.waitExposed(editor) - - # Type indented TODO - editor.insertPlainText(" TODO: Indented task") - - # Process events - QApplication.processEvents() - - # Should handle indented TODO - text = editor.toPlainText() - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_markdown_editor_transform_todo_with_colon(app, qtbot): - """Test transforming TODO: with colon""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - qtbot.waitExposed(editor) - - # Type TODO with colon - editor.insertPlainText("TODO: Task with colon") - - # Process events - QApplication.processEvents() - - text = editor.toPlainText() - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_markdown_editor_transform_todo_with_dash(app, qtbot): - """Test transforming TODO- with dash""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - qtbot.waitExposed(editor) - - # Type TODO with dash - editor.insertPlainText("TODO- Task with dash") - - # Process events - QApplication.processEvents() - - text = editor.toPlainText() - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_markdown_editor_no_transform_when_updating(app): - """Test that transformation doesn't happen when _updating flag is set""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - # Set updating flag - editor._updating = True - - # Try to insert checkbox markdown - editor.insertPlainText("- [ ] Task") - - # Should NOT transform since _updating is True - # This tests the early return in _on_text_changed - assert editor._updating - - -# ============================================================================ -# Code Block Tests -# ============================================================================ - - -def test_markdown_editor_is_inside_code_block(app): - """Test detecting if cursor is inside code block""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("```python\ncode here\n```\noutside") - - # Move cursor to inside code block - cursor = editor.textCursor() - cursor.setPosition(10) # Inside the code block - editor.setTextCursor(cursor) - - block = cursor.block() - # Test the method exists and can be called - result = editor._is_inside_code_block(block) - assert isinstance(result, bool) - - -def test_markdown_editor_code_block_spacing(app): - """Test code block spacing application""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("```python\nline1\nline2\n```") - - # Apply code block spacing - editor._apply_code_block_spacing() - - # Should complete without error - assert True - - -def test_markdown_editor_update_code_block_backgrounds(app): - """Test updating code block backgrounds""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("```python\ncode\n```") - - # Update backgrounds - editor._update_code_block_row_backgrounds() - - # Should complete without error - assert True - - -# ============================================================================ -# Image Insertion Tests -# ============================================================================ - - -def test_markdown_editor_insert_image_from_path(app, tmp_path): - """Test inserting image from file path""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - # Create a real PNG image (1x1 pixel) - # PNG file signature + minimal valid PNG data - png_data = ( - b"\x89PNG\r\n\x1a\n" # PNG signature - b"\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01" - b"\x08\x06\x00\x00\x00\x1f\x15\xc4\x89" # IHDR chunk - b"\x00\x00\x00\nIDATx\x9cc\x00\x01\x00\x00\x05\x00\x01" - b"\r\n-\xb4" # IDAT chunk - b"\x00\x00\x00\x00IEND\xaeB`\x82" # IEND chunk - ) - image_path = tmp_path / "test.png" - image_path.write_bytes(png_data) - - # Insert image - editor.insert_image_from_path(image_path) - - # Check that document has content (image + newline) - # Images don't show in toPlainText() but affect document structure - doc = editor.document() - assert doc.characterCount() > 1 # Should have image char + newline - - -# ============================================================================ -# Formatting Tests -# ============================================================================ - - -def test_markdown_editor_toggle_bold_empty_selection(app): - """Test toggling bold with no selection""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("text") - - # Move cursor to middle of text (no selection) - cursor = editor.textCursor() - cursor.setPosition(2) - editor.setTextCursor(cursor) - - # Toggle bold (inserts ** markers with cursor between them) - editor.apply_weight() - - # Should have inserted bold markers - text = editor.toPlainText() - assert "**" in text - - # Should handle empty selection - assert True - - -def test_markdown_editor_toggle_italic_empty_selection(app): - """Test toggling italic with no selection""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("text") - - # Move cursor to middle (no selection) - cursor = editor.textCursor() - cursor.setPosition(2) - editor.setTextCursor(cursor) - - # Toggle italic - editor.apply_italic() - - # Should handle empty selection - assert True - - -def test_markdown_editor_toggle_strikethrough_empty_selection(app): - """Test toggling strikethrough with no selection""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("text") - - cursor = editor.textCursor() - cursor.setPosition(2) - editor.setTextCursor(cursor) - - editor.apply_strikethrough() - - assert True - - -def test_markdown_editor_toggle_code_empty_selection(app): - """Test toggling code with no selection""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("text") - - cursor = editor.textCursor() - cursor.setPosition(2) - editor.setTextCursor(cursor) - - editor.apply_code() - - assert True - - -# ============================================================================ -# Heading Tests -# ============================================================================ - - -def test_markdown_editor_set_heading_various_levels(app): - """Test setting different heading levels""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - for level in [14, 18, 24]: - editor.clear() - editor.insertPlainText("Heading text") - - # Select all - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # Set heading level - editor.apply_heading(level) - - # Should have heading markdown - text = editor.toPlainText() - assert "#" in text - - -def test_markdown_editor_set_heading_zero_removes_heading(app): - """Test setting heading level 0 removes heading""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("# Heading") - - # Select heading - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # Set to level 0 (remove heading) - editor.apply_heading(0) - - # Should not have heading markers - text = editor.toPlainText() - assert not text.startswith("#") - - -# ============================================================================ -# List Tests -# ============================================================================ - - -def test_markdown_editor_toggle_list_bullet(app): - """Test toggling bullet list""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("Item 1\nItem 2") - - # Select all - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # Toggle bullet list - editor.toggle_bullets() - - # Should have bullet markers - text = editor.toPlainText() - assert "•" in text or "-" in text - - -def test_markdown_editor_toggle_list_ordered(app): - """Test toggling ordered list""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("Item 1\nItem 2") - - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - editor.toggle_numbers() - - text = editor.toPlainText() - assert "1" in text or "2" in text - - -# ============================================================================ -# Code Block Tests -# ============================================================================ - - -def test_markdown_editor_apply_code_selected_text(app): - """Test toggling code block with selected text""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("def hello():\n print('hi')") - - # Select all - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # Toggle code block - editor.apply_code() - - # Should have code fence - text = editor.toPlainText() - assert "```" in text - - -def test_markdown_editor_apply_code_remove(app): - """Test removing code block""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("```python\ncode\n```") - - # Select all - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # Toggle off - editor.apply_code() - - # Code fences should be reduced/removed - editor.toPlainText() - # May still have ``` but different structure - assert True # Just verify no crash - - -# ============================================================================ -# Checkbox Tests -# ============================================================================ - - -def test_markdown_editor_insert_checkbox_unchecked(app): - """Test inserting unchecked checkbox""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - editor.toggle_checkboxes() - - text = editor.toPlainText() - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -# ============================================================================ -# Toggle Checkboxes Tests -# ============================================================================ - - -def test_markdown_editor_toggle_checkboxes_none_selected(app): - """Test toggling checkboxes with no selection""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("☐ Task 1\n☐ Task 2") - - # No selection, just cursor - editor.toggle_checkboxes() - - # Should handle gracefully - assert True - - -def test_markdown_editor_toggle_checkboxes_mixed(app): - """Test toggling mixed checked/unchecked checkboxes""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("☐ Task 1\n☑ Task 2\n☐ Task 3") - - # Select all - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # Toggle - editor.toggle_checkboxes() - - # Should toggle all - text = editor.toPlainText() - assert ( - editor._CHECK_CHECKED_DISPLAY in text or editor._CHECK_UNCHECKED_DISPLAY in text - ) - - -# ============================================================================ -# Markdown Conversion Tests -# ============================================================================ - - -def test_markdown_editor_to_markdown_with_checkboxes(app): - """Test converting to markdown preserves checkboxes""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("- [ ] Task 1\n- [x] Task 2") - - md = editor.to_markdown() - - # Should have checkbox markdown - assert "[ ]" in md or "[x]" in md - - -def test_markdown_editor_from_markdown_with_images(app): - """Test loading markdown with images""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - md_with_image = "# Title\n\n![alt text](image.png)\n\nText" - editor.from_markdown(md_with_image) - - # Should load without error - text = editor.toPlainText() - assert "Title" in text - - -def test_markdown_editor_from_markdown_with_links(app): - """Test loading markdown with links""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - md_with_link = "[Click here](https://example.com)" - editor.from_markdown(md_with_link) - - text = editor.toPlainText() - assert "Click here" in text - - -# ============================================================================ -# Selection and Cursor Tests -# ============================================================================ - - -def test_markdown_editor_select_word_under_cursor(app): - """Test selecting word under cursor""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("Hello world test") - - # Move cursor to middle of word - cursor = editor.textCursor() - cursor.setPosition(7) # Middle of "world" - editor.setTextCursor(cursor) - - # Select word (via double-click or other mechanism) - cursor.select(QTextCursor.WordUnderCursor) - editor.setTextCursor(cursor) - - assert cursor.hasSelection() - - -def test_markdown_editor_get_selected_blocks(app): - """Test getting selected blocks""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.insertPlainText("Line 1\nLine 2\nLine 3") - - # Select multiple lines - cursor = editor.textCursor() - cursor.setPosition(0) - cursor.setPosition(14, QTextCursor.KeepAnchor) - editor.setTextCursor(cursor) - - # Should have selection - assert cursor.hasSelection() - - -# ============================================================================ -# Key Event Tests -# ============================================================================ - - -def test_markdown_editor_key_press_tab(app): - """Test tab key handling""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.show() - - # Create tab key event - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Tab, Qt.NoModifier) - - # Send event - editor.keyPressEvent(event) - - # Should insert tab or spaces - text = editor.toPlainText() - assert len(text) > 0 or text == "" # Tab or spaces inserted - - -def test_markdown_editor_key_press_return_in_list(app): - """Test return key in list""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("- Item 1") - - # Move cursor to end - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press return - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier) - editor.keyPressEvent(event) - - # Should create new list item - text = editor.toPlainText() - assert "Item 1" in text - - -# ============================================================================ -# Link Handling Tests -# ============================================================================ - - -def test_markdown_editor_anchor_at_cursor(app): - """Test getting anchor at cursor position""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("[link](https://example.com)") - - # Move cursor over link - cursor = editor.textCursor() - cursor.setPosition(2) - editor.setTextCursor(cursor) - - # Get anchor (if any) - anchor = cursor.charFormat().anchorHref() - - # May or may not have anchor depending on rendering - assert isinstance(anchor, str) - - -def test_markdown_editor_mouse_move_over_link(app): - """Test mouse movement over link""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - editor.from_markdown("[link](https://example.com)") - editor.show() - - # Simulate mouse move - # This tests viewport event handling - assert True # Just verify no crash - - -# ============================================================================ -# Theme Mode Tests -# ============================================================================ - - -def test_markdown_highlighter_light_mode(app): - """Test highlighter in light mode""" - doc = QTextDocument() - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - - # Check that light mode colors are set - bg = highlighter.code_block_format.background().color() - assert bg.isValid() - # Check it's a light color (high RGB values, close to 245) - assert bg.red() > 240 and bg.green() > 240 and bg.blue() > 240 - - fg = highlighter.code_block_format.foreground().color() - assert fg.isValid() - # Check it's a dark color for text - assert fg.red() < 50 and fg.green() < 50 and fg.blue() < 50 - - -def test_markdown_highlighter_dark_mode(app): - """Test highlighter in dark mode""" - doc = QTextDocument() - themes = ThemeManager(app, ThemeConfig(theme=Theme.DARK)) - highlighter = MarkdownHighlighter(doc, themes) - - # Check that dark mode uses palette colors - bg = highlighter.code_block_format.background().color() - fg = highlighter.code_block_format.foreground().color() - - assert bg.isValid() - assert fg.isValid() - - -# ============================================================================ -# Highlighting Pattern Tests -# ============================================================================ - - -def test_markdown_highlighter_triple_backtick_code(app): - """Test highlighting triple backtick code blocks""" - doc = QTextDocument() - doc.setPlainText("```python\ndef hello():\n pass\n```") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - - # Force rehighlight - highlighter.rehighlight() - - # Should complete without errors - assert True - - -def test_markdown_highlighter_inline_code(app): - """Test highlighting inline code with backticks""" - doc = QTextDocument() - doc.setPlainText("Here is `inline code` in text") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_bold_text(app): - """Test highlighting bold text""" - doc = QTextDocument() - doc.setPlainText("This is **bold** text") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_italic_text(app): - """Test highlighting italic text""" - doc = QTextDocument() - doc.setPlainText("This is *italic* text") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_headings(app): - """Test highlighting various heading levels""" - doc = QTextDocument() - doc.setPlainText("# H1\n## H2\n### H3\n#### H4\n##### H5\n###### H6") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_links(app): - """Test highlighting markdown links""" - doc = QTextDocument() - doc.setPlainText("[link text](https://example.com)") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_images(app): - """Test highlighting markdown images""" - doc = QTextDocument() - doc.setPlainText("![alt text](image.png)") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_blockquotes(app): - """Test highlighting blockquotes""" - doc = QTextDocument() - doc.setPlainText("> This is a quote\n> Second line") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_lists(app): - """Test highlighting lists""" - doc = QTextDocument() - doc.setPlainText("- Item 1\n- Item 2\n- Item 3") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_ordered_lists(app): - """Test highlighting ordered lists""" - doc = QTextDocument() - doc.setPlainText("1. First\n2. Second\n3. Third") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_horizontal_rules(app): - """Test highlighting horizontal rules""" - doc = QTextDocument() - doc.setPlainText("Text above\n\n---\n\nText below") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_strikethrough(app): - """Test highlighting strikethrough text""" - doc = QTextDocument() - doc.setPlainText("This is ~~strikethrough~~ text") - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_mixed_formatting(app): - """Test highlighting mixed markdown formatting""" - doc = QTextDocument() - doc.setPlainText( - "# Title\n\nThis is **bold** and *italic* with `code`.\n\n- List item\n- Another item" - ) - - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter = MarkdownHighlighter(doc, themes) - highlighter.rehighlight() - - assert True - - -def test_markdown_highlighter_switch_dark_mode(app): - """Test that dark mode uses different colors than light mode""" - doc = QTextDocument() - doc.setPlainText("# Test") - - # Create light mode highlighter - themes_light = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - highlighter_light = MarkdownHighlighter(doc, themes_light) - light_bg = highlighter_light.code_block_format.background().color() - - # Create dark mode highlighter with new document (to avoid conflicts) - doc2 = QTextDocument() - doc2.setPlainText("# Test") - themes_dark = ThemeManager(app, ThemeConfig(theme=Theme.DARK)) - highlighter_dark = MarkdownHighlighter(doc2, themes_dark) - dark_bg = highlighter_dark.code_block_format.background().color() - - # In light mode, background should be light (high RGB values) - # In dark mode, background should be darker (lower RGB values) - # Note: actual values depend on system palette and theme settings - assert light_bg.isValid() - assert dark_bg.isValid() - - # At least one of these should be true (depending on system theme): - # - Light is lighter than dark, OR - # - Both are set to valid colors (if system theme overrides) - is_light_lighter = ( - light_bg.red() + light_bg.green() + light_bg.blue() - > dark_bg.red() + dark_bg.green() + dark_bg.blue() - ) - both_valid = light_bg.isValid() and dark_bg.isValid() - - assert is_light_lighter or both_valid # At least colors are being set - - -# ============================================================================ -# MarkdownHighlighter Tests - Missing Coverage -# ============================================================================ - - -def test_markdown_highlighter_code_block_detection(qtbot, app): - """Test code block detection and highlighting.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - # Set text with code block - text = """ -Some text -```python -def hello(): - pass -``` -More text -""" - doc.setPlainText(text) - - # The highlighter should process the text - # Just ensure no crash - assert highlighter is not None - - -def test_markdown_highlighter_headers(qtbot, app): - """Test header highlighting.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = """ -# Header 1 -## Header 2 -### Header 3 -Normal text -""" - doc.setPlainText(text) - - assert highlighter is not None - - -def test_markdown_highlighter_emphasis(qtbot, app): - """Test emphasis highlighting.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = "**bold** and *italic* and ***both***" - doc.setPlainText(text) - - assert highlighter is not None - - -def test_markdown_highlighter_horizontal_rule(qtbot, app): - """Test horizontal rule highlighting.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = """ -Text above ---- -Text below -*** -More text -___ -End -""" - doc.setPlainText(text) - - assert highlighter is not None - - -def test_markdown_highlighter_complex_document(qtbot, app): - """Test highlighting a complex document with mixed elements.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = """ -# Main Title - -This is a paragraph with **bold** and *italic* text. - -## Code Example - -Here's some `inline code` and a block: - -```python -def fibonacci(n): - if n <= 1: - return n - return fibonacci(n-1) + fibonacci(n-2) -``` - -## Lists - -- Item with *emphasis* -- Another item with **bold** -- [A link](https://example.com) - -> A blockquote with **formatted** text -> Second line - ---- - -### Final Section - -~~Strikethrough~~ and normal text. -""" - doc.setPlainText(text) - - # Should handle complex document - assert highlighter is not None - - -def test_markdown_highlighter_empty_document(qtbot, app): - """Test highlighting empty document.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - doc.setPlainText("") - - assert highlighter is not None - - -def test_markdown_highlighter_update_on_text_change(qtbot, app): - """Test that highlighter updates when text changes.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - doc.setPlainText("Initial text") - doc.setPlainText("# Header text") - doc.setPlainText("**Bold text**") - - # Should handle updates - assert highlighter is not None - - -def test_markdown_highlighter_nested_emphasis(qtbot, app): - """Test nested emphasis patterns.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = "This has **bold with *italic* inside** and more" - doc.setPlainText(text) - - assert highlighter is not None - - -def test_markdown_highlighter_unclosed_code_block(qtbot, app): - """Test handling of unclosed code block.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = """ -```python -def hello(): - print("world") -""" - doc.setPlainText(text) - - # Should handle gracefully - assert highlighter is not None - - -def test_markdown_highlighter_special_characters(qtbot, app): - """Test handling special characters in markdown.""" - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, theme_manager) - - text = """ -Special chars: < > & " ' -Escaped: \\* \\_ \\` -Unicode: 你好 café résumé -""" - doc.setPlainText(text) - - assert highlighter is not None - - -@pytest.mark.parametrize( - "markdown_line", - [ - "- [ ] Task", # checkbox - "- Task", # bullet - "1. Task", # numbered - ], -) -def test_home_on_list_line_moves_to_text_start(qtbot, editor, markdown_line): - """Home on a list line should jump to just after the list marker.""" - editor.from_markdown(markdown_line) - - # Put caret at end of the line - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press Home (no modifiers) - qtbot.keyPress(editor, Qt.Key_Home) - qtbot.wait(0) - - c = editor.textCursor() - block = c.block() - line = block.text() - pos_in_block = c.position() - block.position() - - # The first character of the user text is the 'T' in "Task" - logical_start = line.index("Task") - - assert not c.hasSelection() - assert pos_in_block == logical_start - - -@pytest.mark.parametrize( - "markdown_line", - [ - "- [ ] Task", # checkbox - "- Task", # bullet - "1. Task", # numbered - ], -) -def test_shift_home_on_list_line_selects_text_after_marker( - qtbot, editor, markdown_line -): - """ - Shift+Home from the end of a list line should select the text after the marker, - not the marker itself. - """ - editor.from_markdown(markdown_line) - - # Put caret at end of the line - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Shift+Home: extend selection back to "logical home" - qtbot.keyPress(editor, Qt.Key_Home, Qt.ShiftModifier) - qtbot.wait(0) - - c = editor.textCursor() - block = c.block() - line = block.text() - block_start = block.position() - - logical_start = line.index("Task") - expected_start = block_start + logical_start - expected_end = block_start + len(line) - - assert c.hasSelection() - assert c.selectionStart() == expected_start - assert c.selectionEnd() == expected_end - # Selected text is exactly the user-visible text, not the marker - assert c.selectedText() == line[logical_start:] - - -def test_up_from_below_checkbox_moves_to_text_start(qtbot, editor): - """ - Up from the line below a checkbox should land to the right of the checkbox, - where the text starts, not to the left of the marker. - """ - editor.from_markdown("- [ ] Task\nSecond line") - - # Put caret somewhere on the second line (end of document is fine) - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press Up to move to the checkbox line - qtbot.keyPress(editor, Qt.Key_Up) - qtbot.wait(0) - - c = editor.textCursor() - block = c.block() - line = block.text() - pos_in_block = c.position() - block.position() - - logical_start = line.index("Task") - assert pos_in_block >= logical_start - - -def test_backspace_on_empty_checkbox_removes_marker(qtbot, editor): - """ - When a checkbox line has no text after the marker, Backspace at/after the - text position should delete the marker itself, leaving a plain empty line. - """ - editor.from_markdown("- [ ] ") - - # Put caret at end of the checkbox line (after the marker) - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - qtbot.keyPress(editor, Qt.Key_Backspace) - qtbot.wait(0) - - first_block = editor.document().firstBlock() - # Marker should be gone - assert first_block.text() == "" - assert editor._CHECK_UNCHECKED_DISPLAY not in editor.toPlainText() - - -def test_render_images_with_corrupted_data(qtbot, app): - """Test rendering images with corrupted data that creates null QImage""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - # Create some binary data that will decode but not form a valid image - corrupted_data = base64.b64encode(b"not an image file").decode("utf-8") - markdown = f"![corrupted](data:image/png;base64,{corrupted_data})" - - editor.from_markdown(markdown) - qtbot.wait(50) - - # Should still work without crashing - text = editor.to_markdown() - assert len(text) >= 0 - - -def test_editor_with_code_blocks(qtbot, app): - """Test editor with code blocks""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - code_markdown = """ -Some text - -```python -def hello(): - print("world") -``` - -More text -""" - editor.from_markdown(code_markdown) - qtbot.wait(50) - - result = editor.to_markdown() - assert "def hello" in result or "python" in result - - -def test_editor_undo_redo(qtbot, app): - """Test undo/redo functionality""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - # Type some text - editor.from_markdown("Initial text") - qtbot.wait(50) - - # Add more text - editor.insertPlainText(" additional") - qtbot.wait(50) - - # Undo - editor.undo() - qtbot.wait(50) - - # Redo - editor.redo() - qtbot.wait(50) - - assert len(editor.to_markdown()) > 0 - - -def test_editor_cut_copy_paste(qtbot, app): - """Test cut/copy/paste operations""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - editor.from_markdown("Test content for copy") - qtbot.wait(50) - - # Select all - editor.selectAll() - - # Copy - editor.copy() - qtbot.wait(50) - - # Move to end and paste - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - editor.paste() - qtbot.wait(50) - - # Should have content twice (or clipboard might be empty in test env) - assert len(editor.to_markdown()) > 0 - - -def test_editor_with_blockquotes(qtbot, app): - """Test editor with blockquotes""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - quote_markdown = """ -Normal text - -> This is a quote -> With multiple lines - -More normal text -""" - editor.from_markdown(quote_markdown) - qtbot.wait(50) - - result = editor.to_markdown() - assert ">" in result or "quote" in result - - -def test_editor_with_horizontal_rules(qtbot, app): - """Test editor with horizontal rules""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - hr_markdown = """ -Section 1 - ---- - -Section 2 -""" - editor.from_markdown(hr_markdown) - qtbot.wait(50) - - result = editor.to_markdown() - assert "Section" in result - - -def test_editor_with_mixed_content(qtbot, app): - """Test editor with mixed markdown content""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - mixed_markdown = """ -# Heading - -This is **bold** and *italic* text. - -- [ ] Todo item -- [x] Completed item - -```python -code() -``` - -[Link](https://example.com) - -> Quote - -| Table | Header | -|-------|--------| -| A | B | -""" - editor.from_markdown(mixed_markdown) - qtbot.wait(50) - - result = editor.to_markdown() - # Should contain various markdown elements - assert len(result) > 50 - - -def test_editor_insert_text_at_cursor(qtbot, app): - """Test inserting text at cursor position""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - editor.from_markdown("Start Middle End") - qtbot.wait(50) - - # Move cursor to middle - cursor = editor.textCursor() - cursor.setPosition(6) - editor.setTextCursor(cursor) - - # Insert text - editor.insertPlainText("INSERTED ") - qtbot.wait(50) - - result = editor.to_markdown() - assert "INSERTED" in result - - -def test_editor_delete_operations(qtbot, app): - """Test delete operations""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(theme_manager=themes) - qtbot.addWidget(editor) - editor.show() - - editor.from_markdown("Text to delete") - qtbot.wait(50) - - # Select some text and delete - cursor = editor.textCursor() - cursor.setPosition(0) - cursor.setPosition(4, QTextCursor.KeepAnchor) - editor.setTextCursor(cursor) - - cursor.removeSelectedText() - qtbot.wait(50) - - result = editor.to_markdown() - assert "Text" not in result or len(result) < 15 - - -def test_markdown_highlighter_dark_theme(qtbot, app): - """Test markdown highlighter with dark theme""" - # Create theme manager with dark theme - themes = ThemeManager(app, ThemeConfig(theme=Theme.DARK)) - - # Create a text document - doc = QTextDocument() - - # Create highlighter with dark theme - highlighter = MarkdownHighlighter(doc, themes) - - # Set some markdown text - doc.setPlainText("# Heading\n\nSome **bold** text\n\n```python\ncode\n```") - - # The highlighter should work with dark theme - assert highlighter is not None - assert highlighter.code_block_format is not None - - -def test_markdown_highlighter_light_theme(qtbot, app): - """Test markdown highlighter with light theme""" - # Create theme manager with light theme - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - - # Create a text document - doc = QTextDocument() - - # Create highlighter with light theme - highlighter = MarkdownHighlighter(doc, themes) - - # Set some markdown text - doc.setPlainText("# Heading\n\nSome **bold** text") - - # The highlighter should work with light theme - assert highlighter is not None - assert highlighter.code_block_format is not None - - -def test_markdown_highlighter_system_dark_theme(qtbot, app, monkeypatch): - """Test markdown highlighter with system dark theme""" - # Create theme manager with system theme - themes = ThemeManager(app, ThemeConfig(theme=Theme.SYSTEM)) - - # Mock the system to be dark - monkeypatch.setattr(themes, "_is_system_dark", True) - - # Create a text document - doc = QTextDocument() - - # Create highlighter - highlighter = MarkdownHighlighter(doc, themes) - - # Set some markdown text - doc.setPlainText("# Dark Theme Heading\n\n**Bold text**") - - # The highlighter should use dark theme colors - assert highlighter is not None - - -def test_markdown_highlighter_with_headings(qtbot, app): - """Test highlighting various heading levels""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = """ -# H1 Heading -## H2 Heading -### H3 Heading -#### H4 Heading -##### H5 Heading -###### H6 Heading -""" - doc.setPlainText(markdown) - - # Should highlight all headings - assert highlighter.h1_format is not None - assert highlighter.h2_format is not None - - -def test_markdown_highlighter_with_emphasis(qtbot, app): - """Test highlighting bold and italic""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = """ -**Bold text** -*Italic text* -***Bold and italic*** -__Also bold__ -_Also italic_ -""" - doc.setPlainText(markdown) - - # Should have emphasis formats - assert highlighter is not None - - -def test_markdown_highlighter_with_code(qtbot, app): - """Test highlighting inline code and code blocks""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = """ -Inline `code` here. - -```python -def hello(): - print("world") -``` - -More text. -""" - doc.setPlainText(markdown) - - # Should highlight code - assert highlighter.code_block_format is not None - - -def test_markdown_highlighter_with_links(qtbot, app): - """Test highlighting links""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = """ -[Link text](https://example.com) - -""" - doc.setPlainText(markdown) - - # Should have link format - assert highlighter is not None - - -def test_markdown_highlighter_with_lists(qtbot, app): - """Test highlighting lists""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = """ -- Unordered item 1 -- Unordered item 2 - -1. Ordered item 1 -2. Ordered item 2 - -- [ ] Unchecked task -- [x] Checked task -""" - doc.setPlainText(markdown) - - # Should highlight lists - assert highlighter is not None - - -def test_markdown_highlighter_with_blockquotes(qtbot, app): - """Test highlighting blockquotes""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = """ -> This is a quote -> With multiple lines -""" - doc.setPlainText(markdown) - - # Should highlight quotes - assert highlighter is not None - - -def test_markdown_highlighter_theme_change(qtbot, app): - """Test changing theme after creation""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - doc = QTextDocument() - highlighter = MarkdownHighlighter(doc, themes) - - markdown = "# Heading\n\n**Bold**" - doc.setPlainText(markdown) - - # Change to dark theme - themes.apply(Theme.DARK) - qtbot.wait(50) - - # Highlighter should update - # We can't directly test the visual change, but verify it doesn't crash - assert highlighter is not None - - -def test_auto_pair_skip_closing_bracket(editor, qtbot): - """Test skipping over closing brackets when auto-pairing.""" - # Insert opening bracket - editor.insertPlainText("(") - - # Type closing bracket - should skip over the auto-inserted one - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_ParenRight, Qt.NoModifier, ")") - editor.keyPressEvent(event) - - # Should have only one pair of brackets - text = editor.toPlainText() - assert text.count("(") == 1 - assert text.count(")") == 1 - - -def test_apply_heading(editor, qtbot): - """Test applying heading to text.""" - # Insert some text - editor.insertPlainText("Heading Text") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.StartOfLine) - editor.setTextCursor(cursor) - - # Apply heading - size >= 24 creates level 1 heading - editor.apply_heading(24) - - text = editor.toPlainText() - assert text.startswith("#") - - -def test_handle_return_in_code_block(editor, qtbot): - """Test pressing return inside a code block.""" - # Create a code block - editor.insertPlainText("```python\nprint('hello')") - - # Place cursor at end - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press return - should maintain indentation - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier, "\n") - editor.keyPressEvent(event) - - # Should have added a new line - text = editor.toPlainText() - assert text.count("\n") >= 2 - - -def test_handle_return_in_list_empty_item(editor, qtbot): - """Test pressing return in an empty list item.""" - # Create list with empty item - editor.insertPlainText("- item\n- ") - - # Place cursor at end of empty item - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press return - should end the list - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier, "\n") - editor.keyPressEvent(event) - - text = editor.toPlainText() - # Should have processed the empty list marker - lines = text.split("\n") - assert len(lines) >= 2 - - -def test_handle_backspace_in_empty_list_item(editor, qtbot): - """Test pressing backspace in an empty list item.""" - # Create list with cursor after marker - editor.insertPlainText("- ") - - # Place cursor at end - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press backspace - should remove list marker - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Backspace, Qt.NoModifier, "") - editor.keyPressEvent(event) - - text = editor.toPlainText() - # List marker handling - assert len(text) <= 2 - - -def test_tab_key_handling(editor, qtbot): - """Test tab key handling in editor.""" - # Create a list item - editor.insertPlainText("- item") - - # Place cursor in the item - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - # Press tab - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Tab, Qt.NoModifier, "\t") - editor.keyPressEvent(event) - - # Should have processed the tab - text = editor.toPlainText() - assert len(text) >= 6 # At least "- item" plus tab - - -def test_drag_enter_with_urls(editor, qtbot): - """Test drag and drop with URLs.""" - from PySide6.QtGui import QDragEnterEvent - - # Create mime data with URLs - mime_data = QMimeData() - mime_data.setUrls([QUrl("file:///tmp/test.txt")]) - - # Create drag enter event - event = QDragEnterEvent( - editor.rect().center(), Qt.CopyAction, mime_data, Qt.LeftButton, Qt.NoModifier - ) - - # Handle drag enter - editor.dragEnterEvent(event) - - # Should accept the event - assert event.isAccepted() - - -def test_drag_enter_with_text(editor, qtbot): - """Test drag and drop with plain text.""" - from PySide6.QtGui import QDragEnterEvent - - # Create mime data with text - mime_data = QMimeData() - mime_data.setText("dragged text") - - # Create drag enter event - event = QDragEnterEvent( - editor.rect().center(), Qt.CopyAction, mime_data, Qt.LeftButton, Qt.NoModifier - ) - - # Handle drag enter - editor.dragEnterEvent(event) - - # Should accept text drag - assert event.isAccepted() - - -def test_highlighter_dark_mode_code_blocks(app, qtbot, tmp_path): - """Test code block highlighting in dark mode.""" - # Get theme manager and set dark mode - theme_manager = ThemeManager(app, ThemeConfig(theme=Theme.DARK)) - - # Create editor with dark theme - editor = MarkdownEditor(theme_manager) - qtbot.addWidget(editor) - - # Insert code block - editor.setPlainText("```python\nprint('hello')\n```") - - # Force rehighlight - editor.highlighter.rehighlight() - - # Verify no crash - actual color verification is difficult in tests - - -def test_highlighter_code_block_with_language(editor, qtbot): - """Test syntax highlighting inside fenced code blocks with language.""" - # Insert code block with language - editor.setPlainText('```python\ndef hello():\n print("world")\n```') - - # Force rehighlight - editor.highlighter.rehighlight() - - # Verify syntax highlighting was applied - # We can't easily verify the exact formatting, but we ensure no crash - - -def test_highlighter_bold_italic_overlap_detection(editor, qtbot): - """Test that bold/italic formatting detects overlaps correctly.""" - # Insert text with overlapping bold and triple-asterisk - editor.setPlainText("***bold and italic***") - - # Force rehighlight - editor.highlighter.rehighlight() - - -def test_highlighter_italic_edge_cases(editor, qtbot): - """Test italic formatting edge cases.""" - # Test edge case: avoiding stealing markers that are part of double - editor.setPlainText("**not italic* text**") - - # Force rehighlight - editor.highlighter.rehighlight() - - # Test another edge case - editor.setPlainText("*italic but next to double**") - editor.highlighter.rehighlight() - - -def test_highlighter_multiple_markdown_elements(editor, qtbot): - """Test highlighting document with multiple markdown elements.""" - # Complex document with various elements - text = """# Heading 1 -## Heading 2 - -**bold text** and *italic text* - -```python -def test(): - return True -``` - -- list item -- [ ] task item - -[link](http://example.com) -""" - - editor.setPlainText(text) - editor.highlighter.rehighlight() - - # Verify no crashes with complex formatting - - -def test_highlighter_inline_code_vs_fence(editor, qtbot): - """Test that inline code and fenced blocks are distinguished.""" - text = """Inline `code` here - -``` -fenced block -``` -""" - - editor.setPlainText(text) - editor.highlighter.rehighlight() diff --git a/tests/test_markdown_editor_additional.py b/tests/test_markdown_editor_additional.py deleted file mode 100644 index 4037ed1..0000000 --- a/tests/test_markdown_editor_additional.py +++ /dev/null @@ -1,932 +0,0 @@ -""" -Additional tests for markdown_editor.py to improve test coverage. -These tests should be added to test_markdown_editor.py. -""" - -import pytest -from bouquin.markdown_editor import MarkdownEditor -from bouquin.theme import Theme, ThemeConfig, ThemeManager -from PySide6.QtCore import QPoint, Qt -from PySide6.QtGui import ( - QColor, - QImage, - QKeyEvent, - QMouseEvent, - QTextCursor, - QTextDocument, -) - - -def text(editor) -> str: - return editor.toPlainText() - - -def lines_keep(editor): - """Split preserving a trailing empty line if the text ends with '\\n'.""" - return text(editor).split("\n") - - -def press_backtick(qtbot, widget, n=1): - """Send physical backtick key events (avoid IME/dead-key issues).""" - for _ in range(n): - qtbot.keyClick(widget, Qt.Key_QuoteLeft) - - -@pytest.fixture -def editor(app, qtbot): - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - ed = MarkdownEditor(themes) - qtbot.addWidget(ed) - ed.show() - qtbot.waitExposed(ed) - ed.setFocus() - return ed - - -def test_update_code_block_backgrounds_with_no_document(app, qtbot): - """Test _update_code_block_row_backgrounds when document is None.""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - qtbot.addWidget(editor) - - # Create a new empty document to replace the current one - new_doc = QTextDocument() - editor.setDocument(new_doc) - editor.setDocument(None) - - # Should not crash even with no document - editor._update_code_block_row_backgrounds() - - -def test_find_code_block_bounds_invalid_block(editor): - """Test _find_code_block_bounds with invalid block.""" - editor.setPlainText("some text") - - # Create an invalid block - doc = editor.document() - invalid_block = doc.findBlockByNumber(999) # doesn't exist - - result = editor._find_code_block_bounds(invalid_block) - assert result is None - - -def test_find_code_block_bounds_on_closing_fence(editor): - """Test _find_code_block_bounds when on a closing fence.""" - editor.setPlainText("```\ncode\n```") - - doc = editor.document() - closing_fence = doc.findBlockByNumber(2) # the closing ``` - - result = editor._find_code_block_bounds(closing_fence) - assert result is not None - open_block, close_block = result - assert open_block.blockNumber() == 0 - assert close_block.blockNumber() == 2 - - -def test_find_code_block_bounds_on_opening_fence(editor): - """Test _find_code_block_bounds when on an opening fence.""" - editor.setPlainText("```\ncode\n```") - - doc = editor.document() - opening_fence = doc.findBlockByNumber(0) - - result = editor._find_code_block_bounds(opening_fence) - assert result is not None - open_block, close_block = result - assert open_block.blockNumber() == 0 - assert close_block.blockNumber() == 2 - - -def test_find_code_block_bounds_no_closing_fence(editor): - """Test _find_code_block_bounds when closing fence is missing.""" - editor.setPlainText("```\ncode without closing") - - doc = editor.document() - opening_fence = doc.findBlockByNumber(0) - - result = editor._find_code_block_bounds(opening_fence) - assert result is None - - -def test_find_code_block_bounds_no_opening_fence(editor): - """Test _find_code_block_bounds from inside code block with no opening.""" - # Simulate a malformed block (shouldn't happen in practice) - editor.setPlainText("code\n```") - - doc = editor.document() - code_line = doc.findBlockByNumber(0) - - result = editor._find_code_block_bounds(code_line) - assert result is None - - -def test_edit_code_block_checks_document(app, qtbot): - """Test _edit_code_block when editor has no document.""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - qtbot.addWidget(editor) - - # Set up editor with code block - editor.setPlainText("```\ncode\n```") - doc = editor.document() - block = doc.findBlockByNumber(1) - - # Now remove the document - editor.setDocument(None) - - # The method will try to work but should handle gracefully - # It actually returns True because it processes the block from the old doc - # This tests that it doesn't crash - editor._edit_code_block(block) - # Just verify it doesn't crash - return value is implementation dependent - - -def test_edit_code_block_dialog_cancelled(editor, qtbot, monkeypatch): - """Test _edit_code_block when dialog is cancelled.""" - import bouquin.markdown_editor as markdown_editor - from PySide6.QtWidgets import QDialog - - class CancelledDialog: - def __init__(self, code, language, parent=None, allow_delete=False): - self._code = code - self._language = language - - def exec(self): - return QDialog.DialogCode.Rejected - - def code(self): - return self._code - - def language(self): - return self._language - - monkeypatch.setattr(markdown_editor, "CodeBlockEditorDialog", CancelledDialog) - - editor.setPlainText("```python\ncode\n```") - doc = editor.document() - block = doc.findBlockByNumber(1) - - result = editor._edit_code_block(block) - # Should return True (event handled) even though cancelled - assert result is True - - -def test_edit_code_block_with_delete(editor, qtbot, monkeypatch): - """Test _edit_code_block when user deletes the block.""" - import bouquin.markdown_editor as markdown_editor - from PySide6.QtWidgets import QDialog - - class DeleteDialog: - def __init__(self, code, language, parent=None, allow_delete=False): - self._code = code - self._language = language - self._deleted = True - - def exec(self): - return QDialog.DialogCode.Accepted - - def code(self): - return self._code - - def language(self): - return self._language - - def was_deleted(self): - return self._deleted - - monkeypatch.setattr(markdown_editor, "CodeBlockEditorDialog", DeleteDialog) - - editor.setPlainText("```python\noriginal code\n```\nafter") - editor.toPlainText() - - doc = editor.document() - block = doc.findBlockByNumber(1) - - result = editor._edit_code_block(block) - assert result is True - - # Code block should be deleted - new_text = editor.toPlainText() - assert "original code" not in new_text - - -def test_edit_code_block_language_change(editor, qtbot, monkeypatch): - """Test _edit_code_block with language change.""" - import bouquin.markdown_editor as markdown_editor - from PySide6.QtWidgets import QDialog - - class LanguageChangeDialog: - def __init__(self, code, language, parent=None, allow_delete=False): - self._code = code - self._language = "javascript" # Change from python - - def exec(self): - return QDialog.DialogCode.Accepted - - def code(self): - return self._code - - def language(self): - return self._language - - monkeypatch.setattr(markdown_editor, "CodeBlockEditorDialog", LanguageChangeDialog) - - editor.setPlainText("```python\ncode\n```") - doc = editor.document() - block = doc.findBlockByNumber(1) - - result = editor._edit_code_block(block) - assert result is True - - # Verify metadata was updated - assert hasattr(editor, "_code_metadata") - lang = editor._code_metadata.get_language(0) - assert lang == "javascript" - - -def test_delete_code_block_no_bounds(editor): - """Test _delete_code_block when bounds can't be found.""" - editor.setPlainText("not a code block") - doc = editor.document() - block = doc.findBlockByNumber(0) - - result = editor._delete_code_block(block) - assert result is False - - -def test_delete_code_block_checks_document(app, qtbot): - """Test _delete_code_block when editor has no document.""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - qtbot.addWidget(editor) - - # Set up with code block - editor.setPlainText("```\ncode\n```") - doc = editor.document() - block = doc.findBlockByNumber(1) - - # Remove the document - editor.setDocument(None) - - # The method will attempt to work but should handle gracefully - # Just verify it doesn't crash - editor._delete_code_block(block) - - -def test_delete_code_block_at_end_of_document(editor): - """Test _delete_code_block when code block is at end of document.""" - editor.setPlainText("```\ncode\n```") # No trailing newline - doc = editor.document() - block = doc.findBlockByNumber(1) - - result = editor._delete_code_block(block) - assert result is True - - # Should be empty or minimal - assert "code" not in editor.toPlainText() - - -def test_delete_code_block_with_text_after(editor): - """Test _delete_code_block when there's text after the block.""" - editor.setPlainText("```\ncode\n```\ntext after") - doc = editor.document() - block = doc.findBlockByNumber(1) - - result = editor._delete_code_block(block) - assert result is True - - # Code should be gone, text after should remain - new_text = editor.toPlainText() - assert "code" not in new_text - assert "text after" in new_text - - -def test_apply_line_spacing_no_document(app): - """Test _apply_line_spacing when document is None.""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - editor.setDocument(None) - - # Should not crash - editor._apply_line_spacing(125.0) - - -def test_apply_code_block_spacing(editor): - """Test _apply_code_block_spacing applies correct spacing.""" - editor.setPlainText("```\nline1\nline2\n```") - - # Apply spacing - editor._apply_code_block_spacing() - - # Verify blocks have spacing applied - doc = editor.document() - for i in range(doc.blockCount()): - block = doc.findBlockByNumber(i) - assert block.isValid() - - -def test_to_markdown_with_code_metadata(editor): - """Test to_markdown includes code block metadata.""" - editor.setPlainText("```python\ncode\n```") - - # Set some metadata - editor._code_metadata.set_language(0, "python") - - md = editor.to_markdown() - - # Should include metadata comment - assert "code-langs" in md or "code" in md - - -def test_from_markdown_creates_code_metadata(app): - """Test from_markdown creates _code_metadata if missing.""" - themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - editor = MarkdownEditor(themes) - - # Remove the attribute - if hasattr(editor, "_code_metadata"): - delattr(editor, "_code_metadata") - - # Should recreate it - editor.from_markdown("# test") - - assert hasattr(editor, "_code_metadata") - - -def test_embed_images_preserves_original_size(editor, tmp_path): - """Test that embedded images preserve their original dimensions.""" - # Create a test image - img = tmp_path / "test.png" - qimg = QImage(100, 50, QImage.Format_RGBA8888) - qimg.fill(QColor(255, 0, 0)) - qimg.save(str(img)) - - # Create markdown with image - import base64 - - with open(img, "rb") as f: - b64 = base64.b64encode(f.read()).decode() - - md = f"![test](data:image/png;base64,{b64})" - editor.from_markdown(md) - - # Image should be embedded with original size - doc = editor.document() - assert doc is not None - - -def test_trim_list_prefix_no_selection(editor): - """Test _maybe_trim_list_prefix_from_line_selection with no selection.""" - editor.setPlainText("- item") - cursor = editor.textCursor() - cursor.clearSelection() - editor.setTextCursor(cursor) - - # Should not crash - editor._maybe_trim_list_prefix_from_line_selection() - - -def test_trim_list_prefix_multiline_selection(editor): - """Test _maybe_trim_list_prefix_from_line_selection across multiple lines.""" - editor.setPlainText("- item1\n- item2") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.End, QTextCursor.KeepAnchor) - editor.setTextCursor(cursor) - - # Should not trim multi-line selections - editor._maybe_trim_list_prefix_from_line_selection() - - -def test_trim_list_prefix_not_full_line(editor): - """Test _maybe_trim_list_prefix_from_line_selection with partial selection.""" - editor.setPlainText("- item text here") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Right, QTextCursor.KeepAnchor, 5) - editor.setTextCursor(cursor) - - # Partial line selection should not be trimmed - editor._maybe_trim_list_prefix_from_line_selection() - - -def test_trim_list_prefix_already_after_prefix(editor): - """Test _maybe_trim_list_prefix when selection already after prefix.""" - editor.setPlainText("- item text") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Right, QTextCursor.MoveAnchor, 3) # After "- " - cursor.movePosition(QTextCursor.EndOfLine, QTextCursor.KeepAnchor) - editor.setTextCursor(cursor) - - # Should not need adjustment - editor._maybe_trim_list_prefix_from_line_selection() - - -def test_trim_list_prefix_during_adjustment(editor): - """Test _maybe_trim_list_prefix re-entry guard.""" - editor.setPlainText("- item") - editor._adjusting_selection = True - - # Should return early due to guard - editor._maybe_trim_list_prefix_from_line_selection() - - editor._adjusting_selection = False - - -def test_detect_list_type_checkbox_checked(editor): - """Test _detect_list_type with checked checkbox.""" - list_type, prefix = editor._detect_list_type( - f"{editor._CHECK_CHECKED_DISPLAY} done" - ) - assert list_type == "checkbox" - assert editor._CHECK_UNCHECKED_DISPLAY in prefix - - -def test_detect_list_type_numbered(editor): - """Test _detect_list_type with numbered list.""" - list_type, prefix = editor._detect_list_type("1. item") - assert list_type == "number" - # The prefix will be "2. " because it increments for the next item - assert "." in prefix - - -def test_detect_list_type_markdown_bullet(editor): - """Test _detect_list_type with markdown bullet.""" - list_type, prefix = editor._detect_list_type("- item") - assert list_type == "bullet" - - -def test_detect_list_type_not_a_list(editor): - """Test _detect_list_type with regular text.""" - list_type, prefix = editor._detect_list_type("regular text") - assert list_type is None - assert prefix == "" - - -def test_list_prefix_length_numbered(editor): - """Test _list_prefix_length_for_block with numbered list.""" - editor.setPlainText("123. item") - doc = editor.document() - block = doc.findBlockByNumber(0) - - length = editor._list_prefix_length_for_block(block) - assert length > 0 - - -def test_key_press_ctrl_home(editor, qtbot): - """Test Ctrl+Home key combination.""" - editor.setPlainText("line1\nline2\nline3") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Home, Qt.ControlModifier, "") - editor.keyPressEvent(event) - - # Should move to start of document - assert editor.textCursor().position() == 0 - - -def test_key_press_ctrl_left(editor, qtbot): - """Test Ctrl+Left key combination.""" - editor.setPlainText("word1 word2 word3") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Left, Qt.ControlModifier, "") - editor.keyPressEvent(event) - - # Should move left by word - - -def test_key_press_home_in_list(editor, qtbot): - """Test Home key in list item.""" - editor.setPlainText("- item text") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Home, Qt.NoModifier, "") - editor.keyPressEvent(event) - - # Should jump to after "- " - pos = editor.textCursor().position() - assert pos > 0 - - -def test_key_press_left_in_list_prefix(editor, qtbot): - """Test Left key when in list prefix region.""" - editor.setPlainText("- item") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Right) # Inside "- " - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Left, Qt.NoModifier, "") - editor.keyPressEvent(event) - - # Should snap to after prefix - - -def test_key_press_up_in_code_block(editor, qtbot): - """Test Up key inside code block.""" - editor.setPlainText("```\ncode line 1\ncode line 2\n```") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Down) - cursor.movePosition(QTextCursor.Down) # On "code line 2" - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Up, Qt.NoModifier, "") - editor.keyPressEvent(event) - - # Should move up normally in code block - - -def test_key_press_down_in_list_item(editor, qtbot): - """Test Down key in list item.""" - editor.setPlainText("- item1\n- item2") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Right) # In prefix of first item - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Down, Qt.NoModifier, "") - editor.keyPressEvent(event) - - # Should snap to after prefix on next line - - -def test_key_press_enter_after_markers(editor, qtbot): - """Test Enter key after style markers.""" - editor.setPlainText("text **") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier, "\n") - editor.keyPressEvent(event) - - # Should handle markers - - -def test_key_press_enter_on_closing_fence(editor, qtbot): - """Test Enter key on closing fence line.""" - editor.setPlainText("```\ncode\n```") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - cursor.movePosition(QTextCursor.StartOfLine) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier, "\n") - editor.keyPressEvent(event) - - # Should create new line after fence - - -def test_key_press_backspace_empty_checkbox(editor, qtbot): - """Test Backspace in empty checkbox item.""" - editor.setPlainText(f"{editor._CHECK_UNCHECKED_DISPLAY} ") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Backspace, Qt.NoModifier, "") - editor.keyPressEvent(event) - - # Should remove checkbox - - -def test_key_press_backspace_numbered_list(editor, qtbot): - """Test Backspace at start of numbered list item.""" - editor.setPlainText("1. ") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Backspace, Qt.NoModifier, "") - editor.keyPressEvent(event) - - -def test_key_press_tab_in_bullet_list(editor, qtbot): - """Test Tab key in bullet list.""" - editor.setPlainText("- item") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Tab, Qt.NoModifier, "\t") - editor.keyPressEvent(event) - - # Should indent - - -def test_key_press_shift_tab_in_bullet_list(editor, qtbot): - """Test Shift+Tab in indented bullet list.""" - editor.setPlainText(" - item") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Tab, Qt.ShiftModifier, "") - editor.keyPressEvent(event) - - # Should unindent - - -def test_key_press_tab_in_checkbox(editor, qtbot): - """Test Tab in checkbox item.""" - editor.setPlainText(f"{editor._CHECK_UNCHECKED_DISPLAY} task") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.End) - editor.setTextCursor(cursor) - - event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Tab, Qt.NoModifier, "\t") - editor.keyPressEvent(event) - - -def test_apply_weight_to_selection(editor, qtbot): - """Test apply_weight makes text bold.""" - editor.setPlainText("text to bold") - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - editor.apply_weight() - - md = editor.to_markdown() - assert "**" in md - - -def test_apply_italic_to_selection(editor, qtbot): - """Test apply_italic makes text italic.""" - editor.setPlainText("text to italicize") - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - editor.apply_italic() - - md = editor.to_markdown() - assert "*" in md or "_" in md - - -def test_apply_strikethrough_to_selection(editor, qtbot): - """Test apply_strikethrough.""" - editor.setPlainText("text to strike") - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - editor.apply_strikethrough() - - md = editor.to_markdown() - assert "~~" in md - - -def test_apply_code_on_selection(editor, qtbot): - """Test apply_code with selected text.""" - editor.setPlainText("some code") - cursor = editor.textCursor() - cursor.select(QTextCursor.Document) - editor.setTextCursor(cursor) - - # apply_code opens dialog - with test stub it accepts - editor.apply_code() - - # The stub dialog will create a code block - editor.toPlainText() - # May contain code block elements depending on dialog behavior - - -def test_toggle_numbers_on_plain_text(editor, qtbot): - """Test toggle_numbers converts text to numbered list.""" - editor.setPlainText("item 1") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - editor.toggle_numbers() - - text = editor.toPlainText() - assert "1." in text - - -def test_toggle_bullets_on_plain_text(editor, qtbot): - """Test toggle_bullets converts text to bullet list.""" - editor.setPlainText("item 1") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - editor.toggle_bullets() - - text = editor.toPlainText() - # Will have unicode bullet - assert editor._BULLET_DISPLAY in text - - -def test_toggle_bullets_removes_bullets(editor, qtbot): - """Test toggle_bullets removes existing bullets.""" - editor.setPlainText(f"{editor._BULLET_DISPLAY} item 1") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - editor.toggle_bullets() - - text = editor.toPlainText() - # Should have removed bullet - assert text.strip() == "item 1" - - -def test_toggle_checkboxes_on_bullets(editor, qtbot): - """Test toggle_checkboxes converts bullets to checkboxes.""" - editor.setPlainText(f"{editor._BULLET_DISPLAY} item 1") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - editor.toggle_checkboxes() - - text = editor.toPlainText() - # Should have checkbox characters - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_apply_heading_various_levels(editor, qtbot): - """Test apply_heading with different levels.""" - test_cases = [ - (24, "#"), # H1 - (18, "##"), # H2 - (14, "###"), # H3 - (12, ""), # Normal (no heading) - ] - - for size, expected_marker in test_cases: - editor.setPlainText("heading text") - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - editor.apply_heading(size) - - text = editor.toPlainText() - if expected_marker: - assert text.startswith(expected_marker) - - -def test_insert_image_from_path_invalid_extension(editor, tmp_path): - """Test insert_image_from_path with invalid extension.""" - invalid_file = tmp_path / "file.txt" - invalid_file.write_text("not an image") - - # Should not crash - editor.insert_image_from_path(invalid_file) - - -def test_insert_image_from_path_nonexistent(editor, tmp_path): - """Test insert_image_from_path with nonexistent file.""" - nonexistent = tmp_path / "doesnt_exist.png" - - # Should not crash - editor.insert_image_from_path(nonexistent) - - -def test_mouse_press_toggle_unchecked_to_checked(editor, qtbot): - """Test clicking checkbox toggles it from unchecked to checked.""" - editor.setPlainText(f"{editor._CHECK_UNCHECKED_DISPLAY} task") - - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - rect = editor.cursorRect() - pos = QPoint(rect.left() + 2, rect.center().y()) - - event = QMouseEvent( - QMouseEvent.MouseButtonPress, pos, Qt.LeftButton, Qt.LeftButton, Qt.NoModifier - ) - - editor.mousePressEvent(event) - - text = editor.toPlainText() - # Should toggle to checked - assert editor._CHECK_CHECKED_DISPLAY in text - - -def test_mouse_press_toggle_checked_to_unchecked(editor, qtbot): - """Test clicking checked checkbox toggles it to unchecked.""" - editor.setPlainText(f"{editor._CHECK_CHECKED_DISPLAY} completed task") - - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - rect = editor.cursorRect() - pos = QPoint(rect.left() + 2, rect.center().y()) - - event = QMouseEvent( - QMouseEvent.MouseButtonPress, pos, Qt.LeftButton, Qt.LeftButton, Qt.NoModifier - ) - - editor.mousePressEvent(event) - - text = editor.toPlainText() - # Should toggle to unchecked - assert editor._CHECK_UNCHECKED_DISPLAY in text - - -def test_mouse_double_click_suppression(editor, qtbot): - """Test double-click suppression for checkboxes.""" - editor.setPlainText(f"{editor._CHECK_UNCHECKED_DISPLAY} task") - - # Simulate the suppression flag being set - editor._suppress_next_checkbox_double_click = True - - pos = QPoint(10, 10) - event = QMouseEvent( - QMouseEvent.MouseButtonDblClick, - pos, - Qt.LeftButton, - Qt.LeftButton, - Qt.NoModifier, - ) - - editor.mouseDoubleClickEvent(event) - - # Flag should be cleared - assert not editor._suppress_next_checkbox_double_click - - -def test_context_menu_in_code_block(editor, qtbot): - """Test context menu when in code block.""" - editor.setPlainText("```python\ncode\n```") - - from PySide6.QtGui import QContextMenuEvent - - # Position in the code block - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Down) - editor.setTextCursor(cursor) - - rect = editor.cursorRect() - QContextMenuEvent(QContextMenuEvent.Mouse, rect.center()) - - # Should not crash - # Note: actual menu exec is blocked in tests, but we verify it doesn't crash - - -def test_set_code_block_language(editor, qtbot): - """Test _set_code_block_language sets metadata.""" - editor.setPlainText("```\ncode\n```") - doc = editor.document() - block = doc.findBlockByNumber(1) - - editor._set_code_block_language(block, "python") - - # Metadata should be set - lang = editor._code_metadata.get_language(0) - assert lang == "python" - - -def test_get_current_line_task_text_strips_prefixes(editor, qtbot): - """Test get_current_line_task_text removes list/checkbox prefixes.""" - test_cases = [ - (f"{editor._CHECK_UNCHECKED_DISPLAY} task text", "task text"), - (f"{editor._BULLET_DISPLAY} bullet text", "bullet text"), - ("- markdown bullet", "markdown bullet"), - ("1. numbered item", "numbered item"), - ] - - for input_text, expected in test_cases: - editor.setPlainText(input_text) - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - editor.setTextCursor(cursor) - - result = editor.get_current_line_task_text() - assert result == expected - - -# Test for selection changed event -def test_selection_changed_in_list(editor, qtbot): - """Test selectionChanged event in list items.""" - editor.setPlainText("- item one\n- item two") - - # Select text in first item - cursor = editor.textCursor() - cursor.movePosition(QTextCursor.Start) - cursor.movePosition(QTextCursor.Right, QTextCursor.MoveAnchor, 3) - cursor.movePosition(QTextCursor.EndOfLine, QTextCursor.KeepAnchor) - editor.setTextCursor(cursor) - - # Trigger selection changed - editor.selectionChanged.emit() - - # Should handle gracefully diff --git a/tests/test_pomodoro_timer.py b/tests/test_pomodoro_timer.py deleted file mode 100644 index 1c2e450..0000000 --- a/tests/test_pomodoro_timer.py +++ /dev/null @@ -1,408 +0,0 @@ -from unittest.mock import Mock, patch - -from bouquin.pomodoro_timer import PomodoroManager, PomodoroTimer -from bouquin.theme import Theme, ThemeConfig, ThemeManager -from PySide6.QtGui import QAction -from PySide6.QtWidgets import QLabel, QToolBar, QVBoxLayout, QWidget - - -class DummyTimeLogWidget(QWidget): - """Minimal stand-in for the real TimeLogWidget used by PomodoroManager.""" - - def __init__(self, parent=None): - super().__init__(parent) - self.layout = QVBoxLayout(self) - self.summary_label = QLabel(self) - # toggle_btn and _reload_summary are used by PomodoroManager._on_timer_stopped - self.toggle_btn = Mock() - self.toggle_btn.isChecked.return_value = True - - def show_pomodoro_widget(self, widget): - # Manager calls this when embedding the timer - if widget is not None: - self.layout.addWidget(widget) - - def clear_pomodoro_widget(self): - # Manager calls this when removing the embedded timer - while self.layout.count(): - item = self.layout.takeAt(0) - w = item.widget() - if w is not None: - w.setParent(None) - - def _reload_summary(self): - # Called after TimeLogDialog closes; no-op is fine for tests - pass - - -class DummyMainWindow(QWidget): - """Minimal stand-in for MainWindow that PomodoroManager expects.""" - - def __init__(self, app, parent=None): - super().__init__(parent) - # Sidebar time log widget - self.time_log = DummyTimeLogWidget(self) - - # Toolbar with an actTimer QAction so QSignalBlocker works - self.toolBar = QToolBar(self) - self.toolBar.actTimer = QAction(self) - self.toolBar.addAction(self.toolBar.actTimer) - - # Themes attribute used when constructing TimeLogDialog - self.themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - - -def test_pomodoro_timer_init(qtbot, app, fresh_db): - """Test PomodoroTimer initialization.""" - task_text = "Write unit tests" - timer = PomodoroTimer(task_text) - qtbot.addWidget(timer) - - assert timer._task_text == task_text - assert timer._elapsed_seconds == 0 - assert timer._running is False - assert timer.time_label.text() == "00:00:00" - assert timer.stop_btn.isEnabled() is False - - -def test_pomodoro_timer_start(qtbot, app): - """Test starting the timer.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - timer._toggle_timer() - - assert timer._running is True - assert timer.stop_btn.isEnabled() is True - - -def test_pomodoro_timer_pause(qtbot, app): - """Test pausing the timer.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - # Start the timer - timer._toggle_timer() - assert timer._running is True - - # Pause the timer - timer._toggle_timer() - assert timer._running is False - - -def test_pomodoro_timer_resume(qtbot, app): - """Test resuming the timer after pause.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - # Start, pause, then resume - timer._toggle_timer() # Start - timer._toggle_timer() # Pause - timer._toggle_timer() # Resume - - assert timer._running is True - - -def test_pomodoro_timer_tick(qtbot, app): - """Test timer tick increments elapsed time.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - initial_time = timer._elapsed_seconds - timer._tick() - - assert timer._elapsed_seconds == initial_time + 1 - - -def test_pomodoro_timer_display_update(qtbot, app): - """Test display updates with various elapsed times.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - # Test 0 seconds - timer._elapsed_seconds = 0 - timer._update_display() - assert timer.time_label.text() == "00:00:00" - - # Test 65 seconds (1 min 5 sec) - timer._elapsed_seconds = 65 - timer._update_display() - assert timer.time_label.text() == "00:01:05" - - # Test 3665 seconds (1 hour 1 min 5 sec) - timer._elapsed_seconds = 3665 - timer._update_display() - assert timer.time_label.text() == "01:01:05" - - # Test 3600 seconds (1 hour exactly) - timer._elapsed_seconds = 3600 - timer._update_display() - assert timer.time_label.text() == "01:00:00" - - -def test_pomodoro_timer_stop_and_log_running(qtbot, app): - """Test stopping the timer while it's running.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - # Start the timer - timer._toggle_timer() - timer._elapsed_seconds = 100 - - # Connect a mock to the signal - signal_received = [] - timer.timerStopped.connect(lambda s, t: signal_received.append((s, t))) - - timer._stop_and_log() - - assert timer._running is False - assert len(signal_received) == 1 - assert signal_received[0][0] == 100 # elapsed seconds - assert signal_received[0][1] == "Test task" - - -def test_pomodoro_timer_stop_and_log_paused(qtbot, app): - """Test stopping the timer when it's paused.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - timer._elapsed_seconds = 50 - - signal_received = [] - timer.timerStopped.connect(lambda s, t: signal_received.append((s, t))) - - timer._stop_and_log() - - assert len(signal_received) == 1 - assert signal_received[0][0] == 50 - - -def test_pomodoro_timer_multiple_ticks(qtbot, app): - """Test multiple timer ticks.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - for i in range(10): - timer._tick() - - assert timer._elapsed_seconds == 10 - assert "00:00:10" in timer.time_label.text() - - -def test_pomodoro_timer_modal_state(qtbot, app): - """Test that timer is non-modal.""" - timer = PomodoroTimer("Test task") - qtbot.addWidget(timer) - - assert timer.isModal() is False - - -def test_pomodoro_manager_init(app, fresh_db): - """Test PomodoroManager initialization.""" - parent = Mock() - manager = PomodoroManager(fresh_db, parent) - - assert manager._db is fresh_db - assert manager._parent is parent - assert manager._active_timer is None - - -def test_pomodoro_manager_start_timer(qtbot, app, fresh_db): - """Test starting a timer through the manager.""" - parent = DummyMainWindow(app) - qtbot.addWidget(parent) - qtbot.addWidget(parent.time_log) - - manager = PomodoroManager(fresh_db, parent) - - line_text = "Important task" - date_iso = "2024-01-15" - - manager.start_timer_for_line(line_text, date_iso) - - assert manager._active_timer is not None - assert manager._active_timer._task_text == line_text - # Timer should be embedded in the sidebar time log widget - assert manager._active_timer.parent() is parent.time_log - - -def test_pomodoro_manager_replace_active_timer(qtbot, app, fresh_db): - """Test that starting a new timer closes/replaces the previous one.""" - parent = DummyMainWindow(app) - qtbot.addWidget(parent) - qtbot.addWidget(parent.time_log) - - manager = PomodoroManager(fresh_db, parent) - - # Start first timer - manager.start_timer_for_line("Task 1", "2024-01-15") - first_timer = manager._active_timer - qtbot.addWidget(first_timer) - first_timer.show() - - # Start second timer - manager.start_timer_for_line("Task 2", "2024-01-16") - second_timer = manager._active_timer - qtbot.addWidget(second_timer) - - assert first_timer is not second_timer - assert second_timer._task_text == "Task 2" - assert second_timer.parent() is parent.time_log - - -def test_pomodoro_manager_on_timer_stopped_minimum_hours( - qtbot, app, fresh_db, monkeypatch -): - """Timer stopped with very short time logs should enforce minimum hours.""" - parent = DummyMainWindow(app) - qtbot.addWidget(parent) - qtbot.addWidget(parent.time_log) - - manager = PomodoroManager(fresh_db, parent) - - # Mock TimeLogDialog to avoid showing it - mock_dialog = Mock() - mock_dialog.hours_spin = Mock() - mock_dialog.note = Mock() - mock_dialog.exec = Mock() - - with patch("bouquin.pomodoro_timer.TimeLogDialog", return_value=mock_dialog): - manager._on_timer_stopped(10, "Quick task", "2024-01-15") - - # Should set minimum of 0.25 hours - mock_dialog.hours_spin.setValue.assert_called_once() - hours_set = mock_dialog.hours_spin.setValue.call_args[0][0] - assert hours_set >= 0.25 - - -def test_pomodoro_manager_on_timer_stopped_rounding(qtbot, app, fresh_db, monkeypatch): - """Elapsed time should be rounded up to the nearest 0.25 hours.""" - parent = DummyMainWindow(app) - qtbot.addWidget(parent) - qtbot.addWidget(parent.time_log) - - manager = PomodoroManager(fresh_db, parent) - - mock_dialog = Mock() - mock_dialog.hours_spin = Mock() - mock_dialog.note = Mock() - mock_dialog.exec = Mock() - - with patch("bouquin.pomodoro_timer.TimeLogDialog", return_value=mock_dialog): - # 1800 seconds (30 min) should round up to 0.5 - manager._on_timer_stopped(1800, "Task", "2024-01-15") - - mock_dialog.hours_spin.setValue.assert_called_once() - hours_set = mock_dialog.hours_spin.setValue.call_args[0][0] - - assert hours_set > 0 - # Should be a multiple of 0.25 - assert hours_set * 4 == int(hours_set * 4) - - -def test_pomodoro_manager_on_timer_stopped_prefills_note( - qtbot, app, fresh_db, monkeypatch -): - """Timer stopped should pre-fill the note in the time log dialog.""" - parent = DummyMainWindow(app) - qtbot.addWidget(parent) - qtbot.addWidget(parent.time_log) - - manager = PomodoroManager(fresh_db, parent) - - mock_dialog = Mock() - mock_dialog.hours_spin = Mock() - mock_dialog.note = Mock() - mock_dialog.exec = Mock() - - task_text = "Write documentation" - - with patch("bouquin.pomodoro_timer.TimeLogDialog", return_value=mock_dialog): - manager._on_timer_stopped(3600, task_text, "2024-01-15") - - mock_dialog.note.setText.assert_called_once_with(task_text) - - -def test_pomodoro_manager_timer_stopped_signal_connection( - qtbot, app, fresh_db, monkeypatch -): - """Timer's stop button should result in TimeLogDialog being executed.""" - parent = DummyMainWindow(app) - qtbot.addWidget(parent) - qtbot.addWidget(parent.time_log) - - manager = PomodoroManager(fresh_db, parent) - - # Mock TimeLogDialog - mock_dialog = Mock() - mock_dialog.hours_spin = Mock() - mock_dialog.note = Mock() - mock_dialog.exec = Mock() - - with patch("bouquin.pomodoro_timer.TimeLogDialog", return_value=mock_dialog): - manager.start_timer_for_line("Task", "2024-01-15") - timer = manager._active_timer - qtbot.addWidget(timer) - - # Simulate timer having run for a bit - timer._elapsed_seconds = 1000 - - # Clicking "Stop and log" should emit timerStopped and open the dialog - timer._stop_and_log() - - assert mock_dialog.exec.called - - -def test_pomodoro_timer_accepts_parent(qtbot, app): - """Test that timer accepts a parent widget.""" - from PySide6.QtWidgets import QWidget - - parent = QWidget() - qtbot.addWidget(parent) - timer = PomodoroTimer("Task", parent) - qtbot.addWidget(timer) - - assert timer.parent() is parent - - -def test_pomodoro_manager_no_active_timer_initially(app, fresh_db): - """Test that manager starts with no active timer.""" - parent = Mock() - manager = PomodoroManager(fresh_db, parent) - - assert manager._active_timer is None - - -def test_pomodoro_timer_start_stop_cycle(qtbot, app): - """Test a complete start-stop cycle.""" - timer = PomodoroTimer("Complete cycle") - qtbot.addWidget(timer) - - signal_received = [] - timer.timerStopped.connect(lambda s, t: signal_received.append((s, t))) - - # Start - timer._toggle_timer() - assert timer._running is True - - # Simulate some ticks - for _ in range(5): - timer._tick() - - # Stop - timer._stop_and_log() - assert timer._running is False - assert len(signal_received) == 1 - assert signal_received[0][0] == 5 - - -def test_pomodoro_timer_long_elapsed_time(qtbot, app): - """Test display with very long elapsed time.""" - timer = PomodoroTimer("Long task") - qtbot.addWidget(timer) - - # Set to 2 hours, 34 minutes, 56 seconds - timer._elapsed_seconds = 2 * 3600 + 34 * 60 + 56 - timer._update_display() - - assert timer.time_label.text() == "02:34:56" diff --git a/tests/test_reminders.py b/tests/test_reminders.py deleted file mode 100644 index a52c559..0000000 --- a/tests/test_reminders.py +++ /dev/null @@ -1,937 +0,0 @@ -from datetime import date, timedelta -from unittest.mock import MagicMock, patch - -import pytest -from bouquin.reminders import ( - ManageRemindersDialog, - Reminder, - ReminderDialog, - ReminderType, - UpcomingRemindersWidget, -) -from PySide6.QtCore import QDate, QDateTime, QTime -from PySide6.QtWidgets import QDialog, QMessageBox, QWidget - - -@pytest.fixture -def freeze_reminders_time(monkeypatch): - # Freeze 'now' used inside bouquin.reminders to 12:00 today - import bouquin.reminders as rem - - today = QDate.currentDate() - fixed_time = QTime(12, 0) - fixed_dt = QDateTime(today, fixed_time) - monkeypatch.setattr( - rem.QDateTime, "currentDateTime", staticmethod(lambda: QDateTime(fixed_dt)) - ) - yield - - -def _add_daily_reminder(db, text="Standup", time_str="23:59"): - r = Reminder( - id=None, - text=text, - time_str=time_str, - reminder_type=ReminderType.DAILY, - active=True, - ) - r.id = db.save_reminder(r) - return r - - -def test_reminder_type_enum(app): - """Test ReminderType enum values.""" - assert ReminderType.ONCE is not None - assert ReminderType.DAILY is not None - assert ReminderType.WEEKDAYS is not None - assert ReminderType.WEEKLY is not None - - -def test_reminder_dataclass_creation(app): - """Test creating a Reminder instance.""" - reminder = Reminder( - id=1, - text="Test reminder", - time_str="10:30", - reminder_type=ReminderType.DAILY, - weekday=None, - active=True, - date_iso=None, - ) - - assert reminder.id == 1 - assert reminder.text == "Test reminder" - assert reminder.time_str == "10:30" - assert reminder.reminder_type == ReminderType.DAILY - assert reminder.active is True - - -def test_reminder_dialog_init_new(qtbot, app, fresh_db): - """Test ReminderDialog initialization for new reminder.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog._db is fresh_db - assert dialog._reminder is None - assert dialog.text_edit.text() == "" - - -def test_reminder_dialog_init_existing(qtbot, app, fresh_db): - """Test ReminderDialog initialization with existing reminder.""" - reminder = Reminder( - id=1, - text="Existing reminder", - time_str="14:30", - reminder_type=ReminderType.WEEKLY, - weekday=2, - active=True, - ) - - dialog = ReminderDialog(fresh_db, reminder=reminder) - qtbot.addWidget(dialog) - - assert dialog.text_edit.text() == "Existing reminder" - assert dialog.time_edit.time().hour() == 14 - assert dialog.time_edit.time().minute() == 30 - - -def test_reminder_dialog_type_changed(qtbot, app, fresh_db): - """Test that weekday combo visibility changes with type.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() # Show the dialog so child widgets can be visible - - # Find weekly type in combo - for i in range(dialog.type_combo.count()): - if dialog.type_combo.itemData(i) == ReminderType.WEEKLY: - dialog.type_combo.setCurrentIndex(i) - break - - qtbot.wait(10) # Wait for Qt event processing - assert dialog.weekday_combo.isVisible() is True - - # Switch to daily - for i in range(dialog.type_combo.count()): - if dialog.type_combo.itemData(i) == ReminderType.DAILY: - dialog.type_combo.setCurrentIndex(i) - break - - qtbot.wait(10) # Wait for Qt event processing - assert dialog.weekday_combo.isVisible() is False - - -def test_reminder_dialog_get_reminder_once(qtbot, app, fresh_db): - """Test getting reminder with ONCE type.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.text_edit.setText("Test task") - dialog.time_edit.setTime(QTime(10, 30)) - - # Set to ONCE type - for i in range(dialog.type_combo.count()): - if dialog.type_combo.itemData(i) == ReminderType.ONCE: - dialog.type_combo.setCurrentIndex(i) - break - - reminder = dialog.get_reminder() - - assert reminder.text == "Test task" - assert reminder.time_str == "10:30" - assert reminder.reminder_type == ReminderType.ONCE - assert reminder.date_iso is not None - - -def test_reminder_dialog_get_reminder_weekly(qtbot, app, fresh_db): - """Test getting reminder with WEEKLY type.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.text_edit.setText("Weekly meeting") - dialog.time_edit.setTime(QTime(15, 0)) - - # Set to WEEKLY type - for i in range(dialog.type_combo.count()): - if dialog.type_combo.itemData(i) == ReminderType.WEEKLY: - dialog.type_combo.setCurrentIndex(i) - break - - dialog.weekday_combo.setCurrentIndex(1) # Tuesday - - reminder = dialog.get_reminder() - - assert reminder.text == "Weekly meeting" - assert reminder.reminder_type == ReminderType.WEEKLY - assert reminder.weekday == 1 - - -def test_upcoming_reminders_widget_init(qtbot, app, fresh_db): - """Test UpcomingRemindersWidget initialization.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - assert widget._db is fresh_db - assert widget.body.isVisible() is False - - -def test_upcoming_reminders_widget_toggle(qtbot, app, fresh_db): - """Test toggling reminder list visibility.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() # Show the widget so child widgets can be visible - - # Initially hidden - assert widget.body.isVisible() is False - - # Click toggle - widget.toggle_btn.click() - qtbot.wait(10) # Wait for Qt event processing - - assert widget.body.isVisible() is True - - -def test_upcoming_reminders_widget_should_fire_on_date_once(qtbot, app, fresh_db): - """Test should_fire_on_date for ONCE type.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - reminder = Reminder( - id=1, - text="Test", - time_str="10:00", - reminder_type=ReminderType.ONCE, - date_iso="2024-01-15", - ) - - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 15)) is True - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 16)) is False - - -def test_upcoming_reminders_widget_should_fire_on_date_daily(qtbot, app, fresh_db): - """Test should_fire_on_date for DAILY type.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - reminder = Reminder( - id=1, - text="Test", - time_str="10:00", - reminder_type=ReminderType.DAILY, - ) - - # Should fire every day - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 15)) is True - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 16)) is True - - -def test_upcoming_reminders_widget_should_fire_on_date_weekdays(qtbot, app, fresh_db): - """Test should_fire_on_date for WEEKDAYS type.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - reminder = Reminder( - id=1, - text="Test", - time_str="10:00", - reminder_type=ReminderType.WEEKDAYS, - ) - - # Monday (dayOfWeek = 1) - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 15)) is True - # Friday (dayOfWeek = 5) - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 19)) is True - # Saturday (dayOfWeek = 6) - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 20)) is False - # Sunday (dayOfWeek = 7) - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 21)) is False - - -def test_upcoming_reminders_widget_should_fire_on_date_weekly(qtbot, app, fresh_db): - """Test should_fire_on_date for WEEKLY type.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - # Fire on Wednesday (weekday = 2) - reminder = Reminder( - id=1, - text="Test", - time_str="10:00", - reminder_type=ReminderType.WEEKLY, - weekday=2, - ) - - # Wednesday (dayOfWeek = 3, so weekday = 2) - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 17)) is True - # Thursday (dayOfWeek = 4, so weekday = 3) - assert widget._should_fire_on_date(reminder, QDate(2024, 1, 18)) is False - - -def test_upcoming_reminders_widget_refresh_no_db(qtbot, app): - """Test refresh with no database connection.""" - widget = UpcomingRemindersWidget(None) - qtbot.addWidget(widget) - - # Should not crash - widget.refresh() - - -def test_upcoming_reminders_widget_refresh_with_reminders(qtbot, app, fresh_db): - """Test refresh displays reminders.""" - # Add a reminder to the database - reminder = Reminder( - id=None, - text="Test reminder", - time_str="23:59", # Late time so it's in the future - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - widget.refresh() - - # Should have at least one item (or "No upcoming reminders") - assert widget.reminder_list.count() > 0 - - -def test_upcoming_reminders_widget_add_reminder(qtbot, app, fresh_db): - """Test adding a reminder through the widget.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - new_reminder = Reminder( - id=None, - text="New reminder", - time_str="10:00", - reminder_type=ReminderType.DAILY, - ) - - # Mock the entire ReminderDialog class to avoid Qt parent issues - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - mock_dialog.get_reminder.return_value = new_reminder - - with patch("bouquin.reminders.ReminderDialog", return_value=mock_dialog): - widget._add_reminder() - - # Reminder should be saved - reminders = fresh_db.get_all_reminders() - assert len(reminders) > 0 - - -def test_upcoming_reminders_widget_edit_reminder(qtbot, app, fresh_db): - """Test editing a reminder through the widget.""" - # Add a reminder first - reminder = Reminder( - id=None, - text="Original", - time_str="10:00", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - widget.refresh() - - # Get the list item - if widget.reminder_list.count() > 0: - item = widget.reminder_list.item(0) - - updated = Reminder( - id=1, - text="Updated", - time_str="11:00", - reminder_type=ReminderType.DAILY, - ) - - # Mock the entire ReminderDialog class to avoid Qt parent issues - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - mock_dialog.get_reminder.return_value = updated - - with patch("bouquin.reminders.ReminderDialog", return_value=mock_dialog): - widget._edit_reminder(item) - - -def test_upcoming_reminders_widget_delete_selected_single(qtbot, app, fresh_db): - """Test deleting a single selected reminder.""" - # Add a reminder - reminder = Reminder( - id=None, - text="To delete", - time_str="10:00", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - widget.refresh() - - if widget.reminder_list.count() > 0: - widget.reminder_list.setCurrentRow(0) - - with patch.object(QMessageBox, "question", return_value=QMessageBox.Yes): - widget._delete_selected_reminders() - - -def test_upcoming_reminders_widget_delete_selected_multiple(qtbot, app, fresh_db): - """Test deleting multiple selected reminders.""" - # Add multiple reminders - for i in range(3): - reminder = Reminder( - id=None, - text=f"Reminder {i}", - time_str="23:59", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - widget.refresh() - - # Select all items - for i in range(widget.reminder_list.count()): - widget.reminder_list.item(i).setSelected(True) - - with patch.object(QMessageBox, "question", return_value=QMessageBox.Yes): - widget._delete_selected_reminders() - - -def test_upcoming_reminders_widget_check_reminders_no_db(qtbot, app): - """Test check_reminders with no database.""" - widget = UpcomingRemindersWidget(None) - qtbot.addWidget(widget) - - # Should not crash - widget._check_reminders() - - -def test_manage_reminders_dialog_init(qtbot, app, fresh_db): - """Test ManageRemindersDialog initialization.""" - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog._db is fresh_db - assert dialog.table is not None - - -def test_manage_reminders_dialog_load_reminders(qtbot, app, fresh_db): - """Test loading reminders into the table.""" - # Add some reminders - for i in range(3): - reminder = Reminder( - id=None, - text=f"Reminder {i}", - time_str="10:00", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog.table.rowCount() == 3 - - -def test_manage_reminders_dialog_load_reminders_no_db(qtbot, app): - """Test loading reminders with no database.""" - dialog = ManageRemindersDialog(None) - qtbot.addWidget(dialog) - - # Should not crash - dialog._load_reminders() - - -def test_manage_reminders_dialog_add_reminder(qtbot, app, fresh_db): - """Test adding a reminder through the manage dialog.""" - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - initial_count = dialog.table.rowCount() - - new_reminder = Reminder( - id=None, - text="New", - time_str="10:00", - reminder_type=ReminderType.DAILY, - ) - - # Mock the entire ReminderDialog class to avoid Qt parent issues - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - mock_dialog.get_reminder.return_value = new_reminder - - with patch("bouquin.reminders.ReminderDialog", return_value=mock_dialog): - dialog._add_reminder() - - # Table should have one more row - assert dialog.table.rowCount() == initial_count + 1 - - -def test_manage_reminders_dialog_edit_reminder(qtbot, app, fresh_db): - """Test editing a reminder through the manage dialog.""" - reminder = Reminder( - id=None, - text="Original", - time_str="10:00", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - updated = Reminder( - id=1, - text="Updated", - time_str="11:00", - reminder_type=ReminderType.DAILY, - ) - - # Mock the entire ReminderDialog class to avoid Qt parent issues - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - mock_dialog.get_reminder.return_value = updated - - with patch("bouquin.reminders.ReminderDialog", return_value=mock_dialog): - dialog._edit_reminder(reminder) - - -def test_manage_reminders_dialog_delete_reminder(qtbot, app, fresh_db): - """Test deleting a reminder through the manage dialog.""" - reminder = Reminder( - id=None, - text="To delete", - time_str="10:00", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - saved_reminders = fresh_db.get_all_reminders() - reminder_to_delete = saved_reminders[0] - - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - initial_count = dialog.table.rowCount() - - with patch.object(QMessageBox, "question", return_value=QMessageBox.Yes): - dialog._delete_reminder(reminder_to_delete) - - # Table should have one fewer row - assert dialog.table.rowCount() == initial_count - 1 - - -def test_manage_reminders_dialog_delete_reminder_declined(qtbot, app, fresh_db): - """Test declining to delete a reminder.""" - reminder = Reminder( - id=None, - text="Keep me", - time_str="10:00", - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - saved_reminders = fresh_db.get_all_reminders() - reminder_to_keep = saved_reminders[0] - - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - initial_count = dialog.table.rowCount() - - with patch.object(QMessageBox, "question", return_value=QMessageBox.No): - dialog._delete_reminder(reminder_to_keep) - - # Table should have same number of rows - assert dialog.table.rowCount() == initial_count - - -def test_manage_reminders_dialog_weekly_reminder_display(qtbot, app, fresh_db): - """Test that weekly reminders display the day name.""" - reminder = Reminder( - id=None, - text="Weekly", - time_str="10:00", - reminder_type=ReminderType.WEEKLY, - weekday=2, # Wednesday - active=True, - ) - fresh_db.save_reminder(reminder) - - dialog = ManageRemindersDialog(fresh_db) - qtbot.addWidget(dialog) - - # Check that the type column shows the day - type_item = dialog.table.item(0, 3) - assert "Wed" in type_item.text() - - -def test_reminder_dialog_accept(qtbot, app, fresh_db): - """Test accepting the reminder dialog.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.text_edit.setText("Test") - dialog.accept() - - -def test_reminder_dialog_reject(qtbot, app, fresh_db): - """Test rejecting the reminder dialog.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.reject() - - -def test_upcoming_reminders_widget_signal_emitted(qtbot, app, fresh_db): - """Test that reminderTriggered signal is emitted.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - signal_received = [] - widget.reminderTriggered.connect(lambda text: signal_received.append(text)) - - # Manually emit for testing - widget.reminderTriggered.emit("Test reminder") - - assert len(signal_received) == 1 - assert signal_received[0] == "Test reminder" - - -def test_upcoming_reminders_widget_no_upcoming_message(qtbot, app, fresh_db): - """Test that 'No upcoming reminders' message is shown when appropriate.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - widget.refresh() - - # Should show message when no reminders - if widget.reminder_list.count() > 0: - item = widget.reminder_list.item(0) - if "No upcoming" in item.text(): - assert True - - -def test_upcoming_reminders_widget_manage_button(qtbot, app, fresh_db): - """Test clicking the manage button.""" - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - # Mock the entire ManageRemindersDialog class to avoid Qt parent issues - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - - with patch("bouquin.reminders.ManageRemindersDialog", return_value=mock_dialog): - widget._manage_reminders() - - -def test_reminder_dialog_time_format(qtbot, app, fresh_db): - """Test that time is formatted correctly.""" - dialog = ReminderDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.time_edit.setTime(QTime(9, 5)) - reminder = dialog.get_reminder() - - assert reminder.time_str == "09:05" - - -def test_upcoming_reminders_widget_past_reminders_filtered(qtbot, app, fresh_db): - """Test that past reminders are not shown in upcoming list.""" - # Create a reminder that's in the past - reminder = Reminder( - id=None, - text="Past reminder", - time_str="00:01", # Very early morning - reminder_type=ReminderType.DAILY, - active=True, - ) - fresh_db.save_reminder(reminder) - - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - - # Current time should be past 00:01 - from PySide6.QtCore import QTime - - if QTime.currentTime().hour() > 0: - widget.refresh() - # The past reminder for today should be filtered out - # but tomorrow's occurrence should be shown - - -def test_reminder_with_inactive_status(qtbot, app, fresh_db): - """Test that inactive reminders are not displayed.""" - reminder = Reminder( - id=None, - text="Inactive", - time_str="23:59", - reminder_type=ReminderType.DAILY, - active=False, - ) - fresh_db.save_reminder(reminder) - - widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(widget) - widget.refresh() - - # Should not show inactive reminder - for i in range(widget.reminder_list.count()): - item = widget.reminder_list.item(i) - assert "Inactive" not in item.text() or "No upcoming" in item.text() - - -def test_reminder_triggers_and_deactivates(qtbot, fresh_db): - """Test that ONCE reminders deactivate after firing.""" - # Add a ONCE reminder for right now - now = QTime.currentTime() - hour = now.hour() - minute = now.minute() - - reminder = Reminder( - id=None, - text="Test once reminder", - reminder_type=ReminderType.ONCE, - time_str=f"{hour:02d}:{minute:02d}", - date_iso=date.today().isoformat(), - active=True, - ) - reminder_id = fresh_db.save_reminder(reminder) - - reminders_widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(reminders_widget) - - # Set up signal spy - triggered_texts = [] - reminders_widget.reminderTriggered.connect( - lambda text: triggered_texts.append(text) - ) - - # Trigger the check - reminders_widget._check_reminders() - - # Verify reminder was triggered - assert len(triggered_texts) > 0 - assert "Test once reminder" in triggered_texts - - # Verify reminder was deactivated - reminders = fresh_db.get_all_reminders() - deactivated = [r for r in reminders if r.id == reminder_id][0] - assert deactivated.active is False - - -def test_reminder_not_active_skipped(qtbot, fresh_db): - """Test that inactive reminders are not triggered.""" - now = QTime.currentTime() - hour = now.hour() - minute = now.minute() - - reminder = Reminder( - id=None, - text="Inactive reminder", - reminder_type=ReminderType.ONCE, - time_str=f"{hour:02d}:{minute:02d}", - date_iso=date.today().isoformat(), - active=False, # Not active - ) - fresh_db.save_reminder(reminder) - - reminders_widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(reminders_widget) - - # Set up signal spy - triggered_texts = [] - reminders_widget.reminderTriggered.connect( - lambda text: triggered_texts.append(text) - ) - - # Trigger the check - reminders_widget._check_reminders() - - # Should not trigger inactive reminder - assert len(triggered_texts) == 0 - - -def test_reminder_not_today_skipped(qtbot, fresh_db): - """Test that reminders not scheduled for today are skipped.""" - now = QTime.currentTime() - hour = now.hour() - minute = now.minute() - - # Schedule for tomorrow - tomorrow = date.today() + timedelta(days=1) - - reminder = Reminder( - id=None, - text="Tomorrow's reminder", - reminder_type=ReminderType.ONCE, - time_str=f"{hour:02d}:{minute:02d}", - date_iso=tomorrow.isoformat(), - active=True, - ) - fresh_db.save_reminder(reminder) - - reminders_widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(reminders_widget) - - # Set up signal spy - triggered_texts = [] - reminders_widget.reminderTriggered.connect( - lambda text: triggered_texts.append(text) - ) - - # Trigger the check - reminders_widget._check_reminders() - - # Should not trigger tomorrow's reminder - assert len(triggered_texts) == 0 - - -def test_reminder_context_menu_no_selection(qtbot, fresh_db): - """Test context menu with no selection returns early.""" - reminders_widget = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(reminders_widget) - - # Clear selection - reminders_widget.reminder_list.clearSelection() - - # Show context menu - should return early - reminders_widget._show_reminder_context_menu(reminders_widget.reminder_list.pos()) - - -def test_edit_reminder_dialog(qtbot, fresh_db): - """Test editing a reminder through the dialog.""" - reminder = Reminder( - id=None, - text="Original text", - reminder_type=ReminderType.DAILY, - time_str="14:30", - date_iso=None, - active=True, - ) - fresh_db.save_reminder(reminder) - - widget = QWidget() - - # Create edit dialog - reminder_obj = fresh_db.get_all_reminders()[0] - dlg = ReminderDialog(fresh_db, widget, reminder=reminder_obj) - qtbot.addWidget(dlg) - - # Verify fields are populated - assert dlg.text_edit.text() == "Original text" - assert dlg.time_edit.time().toString("HH:mm") == "14:30" - - -def test_upcoming_reminders_context_menu_shows( - qtbot, app, fresh_db, freeze_reminders_time, monkeypatch -): - from bouquin.reminders import Reminder, ReminderType, UpcomingRemindersWidget - from PySide6 import QtGui, QtWidgets - from PySide6.QtCore import QPoint - - # Add a future reminder for today - r = Reminder( - id=None, - text="Ping", - time_str="23:59", - reminder_type=ReminderType.DAILY, - active=True, - ) - r.id = fresh_db.save_reminder(r) - - w = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(w) - w.refresh() - - # Select first upcoming item so context menu code path runs - assert w.reminder_list.count() > 0 - w.reminder_list.setCurrentItem(w.reminder_list.item(0)) - - called = {"exec": False, "actions": []} - - class DummyAction: - def __init__(self, text, parent=None): - self._text = text - - class _Sig: - def connect(self, fn): - pass - - self.triggered = _Sig() - - class DummyMenu: - def __init__(self, parent=None): - pass - - def addAction(self, action): - called["actions"].append(getattr(action, "_text", str(action))) - - def exec(self, *_, **__): - called["exec"] = True - - # Patch the modules that the inline imports will read from - monkeypatch.setattr(QtWidgets, "QMenu", DummyMenu, raising=True) - monkeypatch.setattr(QtGui, "QAction", DummyAction, raising=True) - - # Invoke directly (normally via right-click) - w._show_reminder_context_menu(QPoint(5, 5)) - - assert called["exec"] is True - assert len(called["actions"]) >= 2 # at least Edit/Deactivate/Delete - - -def test_upcoming_reminders_delete_selected_dedupes( - qtbot, app, fresh_db, freeze_reminders_time, monkeypatch -): - from bouquin.reminders import Reminder, ReminderType, UpcomingRemindersWidget - from PySide6.QtCore import QItemSelectionModel - from PySide6.QtWidgets import QMessageBox - - r = Reminder( - id=None, - text="Duplicate target", - time_str="23:59", - reminder_type=ReminderType.DAILY, - active=True, - ) - r.id = fresh_db.save_reminder(r) - - w = UpcomingRemindersWidget(fresh_db) - qtbot.addWidget(w) - w.refresh() - - assert w.reminder_list.count() >= 2 # daily -> multiple upcoming occurrences - - # First selects & clears; second adds to selection - w.reminder_list.setCurrentRow(0, QItemSelectionModel.SelectionFlag.ClearAndSelect) - w.reminder_list.setCurrentRow(1, QItemSelectionModel.SelectionFlag.Select) - - deleted_ids = [] - - def fake_delete(rem_id): - deleted_ids.append(rem_id) - - # Auto-confirm deletion - monkeypatch.setattr( - QMessageBox, "question", staticmethod(lambda *a, **k: QMessageBox.Yes) - ) - monkeypatch.setattr(fresh_db, "delete_reminder", fake_delete) - - w._delete_selected_reminders() - - # Should de-duplicate to a single DB delete call - assert deleted_ids == [r.id] diff --git a/tests/test_search.py b/tests/test_search.py index a333907..d71a785 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -1,3 +1,4 @@ +import pytest from bouquin.search import Search from PySide6.QtWidgets import QListWidgetItem @@ -33,10 +34,7 @@ def test_open_selected_with_data(qtbot, fresh_db): it = QListWidgetItem("dummy") from PySide6.QtCore import Qt - it.setData( - Qt.ItemDataRole.UserRole, - {"kind": "page", "date": "1999-12-31"}, - ) + it.setData(Qt.ItemDataRole.UserRole, "1999-12-31") s.results.addItem(it) s._open_selected(it) assert seen == ["1999-12-31"] @@ -82,6 +80,7 @@ def test_make_html_snippet_variants(qtbot, fresh_db): assert "delta" in frag +@pytest.mark.gui def test_search_error_path_and_empty_snippet(qtbot, fresh_db, monkeypatch): s = Search(fresh_db) qtbot.addWidget(s) @@ -93,11 +92,12 @@ def test_search_error_path_and_empty_snippet(qtbot, fresh_db, monkeypatch): assert frag == "" and not left and not right +@pytest.mark.gui def test_populate_results_shows_both_ellipses(qtbot, fresh_db): s = Search(fresh_db) qtbot.addWidget(s) s.show() long = "X" * 40 + "alpha" + "Y" * 40 - rows = [("page", "2000-01-01", "2000-01-01", long, None)] + rows = [("2000-01-01", long)] s._populate_results("alpha", rows) assert s.results.count() >= 1 diff --git a/tests/test_settings.py b/tests/test_settings.py index 086d590..15b5f85 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -1,27 +1,15 @@ +from bouquin.settings import ( + get_settings, + load_db_config, + save_db_config, +) from bouquin.db import DBConfig -from bouquin.settings import get_settings, load_db_config, save_db_config - - -def _clear_db_settings(): - s = get_settings() - for k in [ - "db/default_db", - "db/path", # legacy key - "db/key", - "ui/idle_minutes", - "ui/theme", - "ui/move_todos", - "ui/tags", - "ui/time_log", - "ui/reminders", - "ui/locale", - "ui/font_size", - ]: - s.remove(k) def test_load_and_save_db_config_roundtrip(app, tmp_path): - _clear_db_settings() + s = get_settings() + for k in ["db/path", "db/key", "ui/idle_minutes", "ui/theme", "ui/move_todos"]: + s.remove(k) cfg = DBConfig( path=tmp_path / "notes.db", @@ -29,11 +17,6 @@ def test_load_and_save_db_config_roundtrip(app, tmp_path): idle_minutes=7, theme="dark", move_todos=True, - tags=True, - time_log=True, - reminders=True, - locale="en", - font_size=11, ) save_db_config(cfg) @@ -43,25 +26,3 @@ def test_load_and_save_db_config_roundtrip(app, tmp_path): assert loaded.idle_minutes == cfg.idle_minutes assert loaded.theme == cfg.theme assert loaded.move_todos == cfg.move_todos - assert loaded.tags == cfg.tags - assert loaded.time_log == cfg.time_log - assert loaded.reminders == cfg.reminders - assert loaded.locale == cfg.locale - assert loaded.font_size == cfg.font_size - - -def test_load_db_config_migrates_legacy_db_path(app, tmp_path): - _clear_db_settings() - s = get_settings() - - legacy_path = tmp_path / "legacy.db" - s.setValue("db/path", str(legacy_path)) - - cfg = load_db_config() - - # Uses the legacy value… - assert cfg.path == legacy_path - - # …but also migrates to the new key and clears the old one. - assert s.value("db/default_db", "", type=str) == str(legacy_path) - assert s.value("db/path", "", type=str) == "" diff --git a/tests/test_settings_dialog.py b/tests/test_settings_dialog.py index 0b1dafd..33980df 100644 --- a/tests/test_settings_dialog.py +++ b/tests/test_settings_dialog.py @@ -1,14 +1,16 @@ +import pytest import bouquin.settings_dialog as sd -from bouquin.db import DBConfig, DBManager + +from bouquin.db import DBManager, DBConfig from bouquin.key_prompt import KeyPrompt -from bouquin.settings import get_settings from bouquin.settings_dialog import SettingsDialog -from bouquin.theme import Theme, ThemeConfig, ThemeManager +from bouquin.theme import ThemeManager, ThemeConfig, Theme from PySide6.QtCore import QTimer -from PySide6.QtWidgets import QApplication, QDialog, QMessageBox, QWidget +from PySide6.QtWidgets import QApplication, QMessageBox, QWidget -def test_settings_dialog_config_roundtrip(qtbot, tmp_db_cfg, fresh_db): +@pytest.mark.gui +def test_settings_dialog_config_roundtrip(qtbot, tmp_db_cfg, fresh_db, tmp_path): # Provide a parent that exposes a real ThemeManager (dialog calls parent().themes.set(...)) app = QApplication.instance() parent = QWidget() @@ -17,12 +19,10 @@ def test_settings_dialog_config_roundtrip(qtbot, tmp_db_cfg, fresh_db): qtbot.addWidget(dlg) dlg.show() + dlg.path_edit.setText(str(tmp_path / "alt.db")) dlg.idle_spin.setValue(3) dlg.theme_light.setChecked(True) dlg.move_todos.setChecked(True) - dlg.tags.setChecked(False) - dlg.time_log.setChecked(False) - dlg.reminders.setChecked(False) # Auto-accept the modal QMessageBox that _compact_btn_clicked() shows def _auto_accept_msgbox(): @@ -36,11 +36,8 @@ def test_settings_dialog_config_roundtrip(qtbot, tmp_db_cfg, fresh_db): dlg._save() cfg = dlg.config + assert cfg.path.name == "alt.db" assert cfg.idle_minutes == 3 - assert cfg.move_todos is True - assert cfg.tags is False - assert cfg.time_log is False - assert cfg.reminders is False assert cfg.theme in ("light", "dark", "system") @@ -60,7 +57,7 @@ def test_save_key_toggle_roundtrip(qtbot, tmp_db_cfg, fresh_db, app): def _pump(): for w in QApplication.topLevelWidgets(): if isinstance(w, KeyPrompt): - w.key_entry.setText("supersecret") + w.edit.setText("supersecret") w.accept() elif isinstance(w, QMessageBox): w.accept() @@ -104,7 +101,7 @@ def test_change_key_mismatch_shows_error(qtbot, tmp_db_cfg, tmp_path, app): def _pump_popups(): for w in QApplication.topLevelWidgets(): if isinstance(w, KeyPrompt): - w.key_entry.setText(keys.pop(0) if keys else "zzz") + w.edit.setText(keys.pop(0) if keys else "zzz") w.accept() elif isinstance(w, QMessageBox): w.accept() @@ -146,7 +143,7 @@ def test_change_key_success(qtbot, tmp_path, app): def _pump(): for w in QApplication.topLevelWidgets(): if isinstance(w, KeyPrompt): - w.key_entry.setText(keys.pop(0) if keys else "newkey") + w.edit.setText(keys.pop(0) if keys else "newkey") w.accept() elif isinstance(w, QMessageBox): w.accept() @@ -208,205 +205,23 @@ def test_settings_compact_error(qtbot, app, monkeypatch, tmp_db_cfg, fresh_db): assert called["text"] -class _Host(QWidget): - def __init__(self, themes): - super().__init__() - self.themes = themes - - -def _make_host_and_dialog(tmp_db_cfg, fresh_db): - # Create a real ThemeManager so we don't have to fake anything here - from PySide6.QtWidgets import QApplication - - themes = ThemeManager(QApplication.instance(), ThemeConfig(theme=Theme.SYSTEM)) - host = _Host(themes) - dlg = SettingsDialog(tmp_db_cfg, fresh_db, parent=host) - return host, dlg - - -def _clear_qsettings_theme_to_system(): - """Make the radio-button default deterministic across the full suite.""" - s = get_settings() - s.clear() - s.setValue("ui/theme", "system") - - -def test_default_theme_radio_is_system_checked(qtbot, tmp_db_cfg, fresh_db): - # Ensure no stray theme value from previous tests - _clear_qsettings_theme_to_system() - - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(host) +@pytest.mark.gui +def test_settings_browse_sets_path(qtbot, app, tmp_path, fresh_db, monkeypatch): + parent = QWidget() + parent.themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) + cfg = DBConfig( + path=tmp_path / "x.db", key="k", idle_minutes=0, theme="light", move_todos=True + ) + dlg = SettingsDialog(cfg, fresh_db, parent=parent) qtbot.addWidget(dlg) - # With fresh settings (system), the 'system' radio should be selected - assert dlg.theme_system.isChecked() + dlg.show() - -def test_save_selects_system_when_no_explicit_choice( - qtbot, tmp_db_cfg, fresh_db, monkeypatch -): - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(dlg) - # Ensure neither dark nor light is checked so SYSTEM path is taken - dlg.theme_dark.setChecked(False) - dlg.theme_light.setChecked(False) - # This should not raise - dlg._save() - - -def test_save_with_dark_selected(qtbot, tmp_db_cfg, fresh_db): - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(dlg) - dlg.theme_dark.setChecked(True) - dlg._save() - - -def test_change_key_cancel_first_prompt(qtbot, tmp_db_cfg, fresh_db, monkeypatch): - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(dlg) - - class P1: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Rejected - - def key(self): - return "" - - monkeypatch.setattr("bouquin.settings_dialog.KeyPrompt", P1) - dlg._change_key() # returns early - - -def test_change_key_cancel_second_prompt(qtbot, tmp_db_cfg, fresh_db, monkeypatch): - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(dlg) - - class P1: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Accepted - - def key(self): - return "abc" - - class P2: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Rejected - - def key(self): - return "abc" - - # First call yields P1, second yields P2 - seq = [P1, P2] - - def _factory(*a, **k): - cls = seq.pop(0) - return cls(*a, **k) - - monkeypatch.setattr("bouquin.settings_dialog.KeyPrompt", _factory) - dlg._change_key() # returns early - - -def test_change_key_empty_and_exception_paths(qtbot, tmp_db_cfg, fresh_db, monkeypatch): - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(dlg) - - # Timer that auto-accepts any modal QMessageBox so we don't hang. - def _pump_boxes(): - # Try both the active modal and the general top-level enumeration - m = QApplication.activeModalWidget() - if isinstance(m, QMessageBox): - m.accept() - for w in QApplication.topLevelWidgets(): - if isinstance(w, QMessageBox): - w.accept() - - timer = QTimer() - timer.setInterval(10) - timer.timeout.connect(_pump_boxes) - timer.start() - - try: - - class P1: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Accepted - - def key(self): - return "" - - class P2: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Accepted - - def key(self): - return "" - - seq = [P1, P2, P1, P2] - - def _factory(*a, **k): - cls = seq.pop(0) - return cls(*a, **k) - - monkeypatch.setattr("bouquin.settings_dialog.KeyPrompt", _factory) - # First run triggers empty-key warning path and return (auto-closed) - dlg._change_key() - - # Now make rekey() raise to hit the except block (critical dialog) - def boom(*a, **k): - raise RuntimeError("nope") - - dlg._db.rekey = boom - - # Return a non-empty matching key twice - class P3: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Accepted - - def key(self): - return "secret" - - monkeypatch.setattr("bouquin.settings_dialog.KeyPrompt", lambda *a, **k: P3()) - dlg._change_key() - finally: - timer.stop() - - -def test_save_key_btn_clicked_cancel_flow(qtbot, tmp_db_cfg, fresh_db, monkeypatch): - host, dlg = _make_host_and_dialog(tmp_db_cfg, fresh_db) - qtbot.addWidget(dlg) - - # Make sure we start with no key saved so it will prompt - dlg.key = "" - - class P1: - def __init__(self, *a, **k): - pass - - def exec(self): - return QDialog.Rejected - - def key(self): - return "" - - monkeypatch.setattr("bouquin.settings_dialog.KeyPrompt", P1) - - dlg.save_key_btn.setChecked(True) # toggles and calls handler - # Handler should have undone the checkbox back to False - assert not dlg.save_key_btn.isChecked() + p = tmp_path / "new_file.db" + monkeypatch.setattr( + sd.QFileDialog, + "getSaveFileName", + staticmethod(lambda *a, **k: (str(p), "DB Files (*.db)")), + raising=False, + ) + dlg._browse() + assert dlg.path_edit.text().endswith("new_file.db") diff --git a/tests/test_statistics_dialog.py b/tests/test_statistics_dialog.py deleted file mode 100644 index e3d2b5f..0000000 --- a/tests/test_statistics_dialog.py +++ /dev/null @@ -1,660 +0,0 @@ -import datetime as _dt -from datetime import date, datetime, timedelta - -from bouquin import strings -from bouquin.statistics_dialog import DateHeatmap, StatisticsDialog -from PySide6.QtCore import QDate, QPoint, Qt -from PySide6.QtTest import QTest -from PySide6.QtWidgets import QLabel, QWidget - - -class FakeStatsDB: - """Minimal stub that returns a fixed stats payload.""" - - def __init__(self): - d1 = _dt.date(2024, 1, 1) - d2 = _dt.date(2024, 1, 2) - - self.stats = ( - 2, # pages_with_content - 5, # total_revisions - "2024-01-02", # page_most_revisions - 3, # page_most_revisions_count - {d1: 10, d2: 20}, # words_by_date - 30, # total_words - 4, # unique_tags - "2024-01-02", # page_most_tags - 2, # page_most_tags_count - {d1: 1, d2: 2}, # revisions_by_date - {d1: 60, d2: 120}, # time_minutes_by_date - 180, # total_time_minutes - "2024-01-02", # day_most_time - 120, # day_most_time_minutes - "Project A", # project_most_minutes_name - 120, # project_most_minutes - "Activity A", # activity_most_minutes_name - 120, # activity_most_minutes - {d1: 1, d2: 3}, # reminders_by_date - 4, # total_reminders - "2024-01-02", # day_most_reminders - 3, # day_most_reminders_count - ) - - self.called = False - - def gather_stats(self): - self.called = True - return self.stats - - -def test_statistics_dialog_populates_fields_and_heatmap(qtbot): - # Make sure we have a known language for label texts - strings.load_strings("en") - - db = FakeStatsDB() - dlg = StatisticsDialog(db) - qtbot.addWidget(dlg) - dlg.show() - - # Stats were actually requested from the DB - assert db.called - - # Window title comes from translations - assert dlg.windowTitle() == strings._("statistics") - - # Grab all label texts for simple content checks - label_texts = {lbl.text() for lbl in dlg.findChildren(QLabel)} - - # Page with most revisions / tags are rendered as "DATE (COUNT)" - assert "2024-01-02 (3)" in label_texts - assert "2024-01-02 (2)" in label_texts - - # Heatmap is created and uses "words" by default - words_by_date = db.stats[4] - revisions_by_date = db.stats[9] - - assert hasattr(dlg, "_heatmap") - assert dlg._heatmap._data == words_by_date - - # Switching the metric to "revisions" should swap the dataset - dlg.metric_combo.setCurrentIndex(1) # 0 = words, 1 = revisions - qtbot.wait(10) - assert dlg._heatmap._data == revisions_by_date - - -class EmptyStatsDB: - """Stub that returns a 'no data yet' stats payload.""" - - def __init__(self): - self.called = False - - def gather_stats(self): - self.called = True - return ( - 0, # pages_with_content - 0, # total_revisions - None, # page_most_revisions - 0, # page_most_revisions_count - {}, # words_by_date - 0, # total_words - 0, # unique_tags - None, # page_most_tags - 0, # page_most_tags_count - {}, # revisions_by_date - {}, # time_minutes_by_date - 0, # total_time_minutes - None, # day_most_time - 0, # day_most_time_minutes - None, # project_most_minutes_name - 0, # project_most_minutes - None, # activity_most_minutes_name - 0, # activity_most_minutes - {}, # reminders_by_date - 0, # total_reminders - None, # day_most_reminders - 0, # day_most_reminders_count - ) - - -def test_statistics_dialog_no_data_shows_placeholder(qtbot): - strings.load_strings("en") - - db = EmptyStatsDB() - dlg = StatisticsDialog(db) - qtbot.addWidget(dlg) - dlg.show() - - assert db.called - - label_texts = [lbl.text() for lbl in dlg.findChildren(QLabel)] - assert strings._("stats_no_data") in label_texts - - # When there's no data, the heatmap and metric combo shouldn't exist - assert not hasattr(dlg, "metric_combo") - assert not hasattr(dlg, "_heatmap") - - -def _date(year, month, day): - return date(year, month, day) - - -# ============================================================================ -# DateHeatmapTests - Missing Coverage -# ============================================================================ - - -def test_activity_heatmap_empty_data(qtbot): - """Test heatmap with empty data dict.""" - strings.load_strings("en") - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Set empty data - heatmap.set_data({}) - - # Should handle empty data gracefully - assert heatmap._start is None - assert heatmap._end is None - assert heatmap._max_value == 0 - - # Size hint should return default dimensions - size = heatmap.sizeHint() - assert size.width() > 0 - assert size.height() > 0 - - # Paint should not crash - heatmap.update() - qtbot.wait(10) - - -def test_activity_heatmap_none_data(qtbot): - """Test heatmap with None data.""" - strings.load_strings("en") - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Set None data - heatmap.set_data(None) - - assert heatmap._start is None - assert heatmap._end is None - - # Paint event should return early - heatmap.update() - qtbot.wait(10) - - -def test_activity_heatmap_click_when_no_data(qtbot): - """Test clicking heatmap when there's no data.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - heatmap.set_data({}) - - # Simulate click - should not crash or emit signal - clicked_dates = [] - heatmap.date_clicked.connect(clicked_dates.append) - - # Click in the middle of widget - pos = QPoint(100, 100) - QTest.mouseClick(heatmap, Qt.LeftButton, pos=pos) - - # Should not have clicked any date - assert len(clicked_dates) == 0 - - -def test_activity_heatmap_click_outside_grid(qtbot): - """Test clicking outside the grid area.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Set some data - data = { - date(2024, 1, 1): 5, - date(2024, 1, 2): 10, - } - heatmap.set_data(data) - - clicked_dates = [] - heatmap.date_clicked.connect(clicked_dates.append) - - # Click in top-left margin (before grid starts) - pos = QPoint(5, 5) - QTest.mouseClick(heatmap, Qt.LeftButton, pos=pos) - - assert len(clicked_dates) == 0 - - -def test_activity_heatmap_click_beyond_end_date(qtbot): - """Test clicking on trailing empty cells beyond the last date.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Set data that doesn't fill a complete week - data = { - date(2024, 1, 1): 5, # Monday - date(2024, 1, 2): 10, # Tuesday - } - heatmap.set_data(data) - - clicked_dates = [] - heatmap.date_clicked.connect(clicked_dates.append) - - # Try clicking far to the right (beyond end date) - # This is tricky to target precisely, but we can simulate - pos = QPoint(1000, 50) # Far right - QTest.mouseClick(heatmap, Qt.LeftButton, pos=pos) - - # Should either not click or only click valid dates - # If it did click, it should be a valid date within range - if clicked_dates: - assert clicked_dates[0] <= date(2024, 1, 2) - - -def test_activity_heatmap_click_invalid_row(qtbot): - """Test clicking below the 7 weekday rows.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - data = { - date(2024, 1, 1): 5, - date(2024, 1, 8): 10, - } - heatmap.set_data(data) - - clicked_dates = [] - heatmap.date_clicked.connect(clicked_dates.append) - - # Click below the grid (row 8 or higher) - pos = QPoint(100, 500) # Very low Y - QTest.mouseClick(heatmap, Qt.LeftButton, pos=pos) - - assert len(clicked_dates) == 0 - - -def test_activity_heatmap_right_click_ignored(qtbot): - """Test that right-click is ignored.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - data = {date(2024, 1, 1): 5} - heatmap.set_data(data) - - clicked_dates = [] - heatmap.date_clicked.connect(clicked_dates.append) - - # Right click should be ignored - pos = QPoint(100, 100) - QTest.mouseClick(heatmap, Qt.RightButton, pos=pos) - - assert len(clicked_dates) == 0 - - -def test_activity_heatmap_month_label_rendering(qtbot): - """Test heatmap spanning multiple months renders month labels.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Data spanning multiple months - data = { - date(2024, 1, 1): 5, - date(2024, 1, 15): 10, - date(2024, 2, 1): 8, - date(2024, 2, 15): 12, - date(2024, 3, 1): 6, - } - heatmap.set_data(data) - - # Should calculate proper size - size = heatmap.sizeHint() - assert size.width() > 0 - assert size.height() > 0 - - # Paint should work without crashing - heatmap.update() - qtbot.wait(10) - - -def test_activity_heatmap_same_month_continues(qtbot): - """Test that month labels skip weeks in the same month.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Multiple dates in same month - data = {} - for day in range(1, 29): # January 1-28 - data[date(2024, 1, day)] = day - - heatmap.set_data(data) - - # Should render without issues - heatmap.update() - qtbot.wait(10) - - -def test_activity_heatmap_data_with_zero_values(qtbot): - """Test heatmap with zero values in data.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - data = { - date(2024, 1, 1): 0, - date(2024, 1, 2): 5, - date(2024, 1, 3): 0, - } - heatmap.set_data(data) - - assert heatmap._max_value == 5 - - heatmap.update() - qtbot.wait(10) - - -def test_activity_heatmap_single_day(qtbot): - """Test heatmap with just one day of data.""" - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - data = {date(2024, 1, 15): 10} - heatmap.set_data(data) - - # Should handle single day - assert heatmap._start is not None - assert heatmap._end is not None - - clicked_dates = [] - heatmap.date_clicked.connect(clicked_dates.append) - - # Click should work - pos = QPoint(100, 100) - QTest.mouseClick(heatmap, Qt.LeftButton, pos=pos) - - -# ============================================================================ -# StatisticsDialog Tests -# ============================================================================ - - -def test_statistics_dialog_with_empty_database(qtbot, fresh_db): - """Test statistics dialog with an empty database.""" - strings.load_strings("en") - - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - # Should handle empty database gracefully - assert dialog.isVisible() - - # Heatmap should be empty - heatmap = dialog.findChild(DateHeatmap) - if heatmap: - # No crash when displaying empty heatmap - qtbot.wait(10) - - -def test_statistics_dialog_with_data(qtbot, fresh_db): - """Test statistics dialog with actual data.""" - strings.load_strings("en") - - # Add some content - fresh_db.save_new_version("2024-01-01", "Hello world", "test") - fresh_db.save_new_version("2024-01-02", "More content here", "test") - fresh_db.save_new_version("2024-01-03", "Even more text", "test") - - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - # Should display statistics - assert dialog.isVisible() - qtbot.wait(10) - - -def test_statistics_dialog_gather_stats_exception_handling( - qtbot, fresh_db, monkeypatch -): - """Test that gather_stats handles exceptions gracefully.""" - strings.load_strings("en") - - # Make dates_with_content raise an exception - def bad_dates_with_content(): - raise RuntimeError("Simulated DB error") - - monkeypatch.setattr(fresh_db, "dates_with_content", bad_dates_with_content) - - # Should still create dialog without crashing - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - # Should handle error gracefully - assert dialog.isVisible() - - -def test_statistics_dialog_with_sparse_data(qtbot, tmp_db_cfg, fresh_db): - """Test statistics dialog with sparse data""" - # Add some entries on non-consecutive days - dates = ["2024-01-01", "2024-01-05", "2024-01-10", "2024-01-20"] - for _date in dates: - content = "Word " * 100 # 100 words - fresh_db.save_new_version(_date, content, "note") - - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Should create without crashing - assert dialog is not None - - -def test_statistics_dialog_with_empty_data(qtbot, tmp_db_cfg, fresh_db): - """Test statistics dialog with no data""" - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Should handle empty data gracefully - assert dialog is not None - - -def test_statistics_dialog_date_range_selection(qtbot, tmp_db_cfg, fresh_db): - """Test changing metric in statistics dialog""" - # Add some test data - for i in range(10): - date = QDate.currentDate().addDays(-i).toString("yyyy-MM-dd") - fresh_db.save_new_version(date, f"Content for day {i}", "note") - - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Change metric to revisions - idx = dialog.metric_combo.findData("revisions") - if idx >= 0: - dialog.metric_combo.setCurrentIndex(idx) - qtbot.wait(50) - - # Change back to words - idx = dialog.metric_combo.findData("words") - if idx >= 0: - dialog.metric_combo.setCurrentIndex(idx) - qtbot.wait(50) - - -def test_heatmap_with_varying_word_counts(qtbot): - """Test heatmap color scaling with varying word counts""" - today = datetime.now().date() - start = today - timedelta(days=30) - - entries = {} - # Create entries with varying word counts - for i in range(31): - date = start + timedelta(days=i) - entries[date] = i * 50 # Increasing word counts - - heatmap = DateHeatmap() - heatmap.set_data(entries) - qtbot.addWidget(heatmap) - heatmap.show() - - # Should paint without errors - assert heatmap.isVisible() - - -def test_heatmap_single_day(qtbot): - """Test heatmap with single day of data""" - today = datetime.now().date() - entries = {today: 500} - - heatmap = DateHeatmap() - heatmap.set_data(entries) - qtbot.addWidget(heatmap) - heatmap.show() - - assert heatmap.isVisible() - - -def test_statistics_dialog_metric_changes(qtbot, tmp_db_cfg, fresh_db): - """Test various metric selections""" - # Add data spanning multiple months - base_date = QDate.currentDate().addDays(-90) - for i in range(90): - date = base_date.addDays(i).toString("yyyy-MM-dd") - fresh_db.save_new_version(date, f"Day {i} content with many words", "note") - - dialog = StatisticsDialog(fresh_db) - qtbot.addWidget(dialog) - - # Test each metric option - for i in range(dialog.metric_combo.count()): - dialog.metric_combo.setCurrentIndex(i) - qtbot.wait(50) - - -def test_heatmap_date_beyond_end(qtbot, fresh_db): - """Test clicking on a date beyond the end date in heatmap.""" - # Create entries spanning a range - today = date.today() - start = today - timedelta(days=30) - - data = {} - for i in range(20): - d = start + timedelta(days=i) - fresh_db.save_new_version(d.isoformat(), f"Entry {i}", f"note {i}") - data[d] = 1 - - w = QWidget() - qtbot.addWidget(w) - - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - - # Set data - heatmap.set_data(data) - - # Try to click beyond the end date - should return early - # Calculate a position that would be beyond the end - if heatmap._start and heatmap._end: - cell_span = heatmap._cell + heatmap._gap - weeks = ((heatmap._end - heatmap._start).days + 6) // 7 - - # Click beyond the last week - x = heatmap._margin_left + (weeks + 1) * cell_span + 5 - y = heatmap._margin_top + 3 * cell_span + 5 - - QTest.mouseClick(heatmap, Qt.LeftButton, Qt.NoModifier, QPoint(int(x), int(y))) - - -def test_heatmap_click_outside_grid(qtbot, fresh_db): - """Test clicking outside the heatmap grid area.""" - today = date.today() - start = today - timedelta(days=7) - - data = {} - for i in range(7): - d = start + timedelta(days=i) - fresh_db.save_new_version(d.isoformat(), f"Entry {i}", f"note {i}") - data[d] = 1 - - w = QWidget() - qtbot.addWidget(w) - - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - heatmap.set_data(data) - - # Click in the margin (outside grid) - x = heatmap._margin_left - 10 # Before the grid - y = heatmap._margin_top - 10 # Above the grid - - QTest.mouseClick(heatmap, Qt.LeftButton, Qt.NoModifier, QPoint(int(x), int(y))) - - # Should not crash, just return early - - -def test_heatmap_click_invalid_row(qtbot, fresh_db): - """Test clicking on an invalid row (>= 7).""" - today = date.today() - start = today - timedelta(days=7) - - data = {} - for i in range(7): - d = start + timedelta(days=i) - fresh_db.save_new_version(d.isoformat(), f"Entry {i}", f"note {i}") - data[d] = 1 - - w = QWidget() - qtbot.addWidget(w) - - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - heatmap.set_data(data) - - # Click below row 6 (day of week > Sunday) - cell_span = heatmap._cell + heatmap._gap - x = heatmap._margin_left + 5 - y = heatmap._margin_top + 7 * cell_span + 5 # Row 7, which is invalid - - QTest.mouseClick(heatmap, Qt.LeftButton, Qt.NoModifier, QPoint(int(x), int(y))) - - # Should return early, not crash - - -def test_heatmap_month_label_continuation(qtbot, fresh_db): - """Test that month labels don't repeat when continuing in same month.""" - # Create a date range that spans multiple weeks within the same month - today = date.today() - # Use a date that's guaranteed to be mid-month - start = date(today.year, today.month, 1) - - data = {} - for i in range(21): - d = start + timedelta(days=i) - fresh_db.save_new_version(d.isoformat(), f"Entry {i}", f"note {i}") - data[d] = 1 - - w = QWidget() - qtbot.addWidget(w) - - heatmap = DateHeatmap() - qtbot.addWidget(heatmap) - heatmap.show() - heatmap.set_data(data) - - # Force a repaint to execute paintEvent - heatmap.repaint() - - # The month continuation logic should prevent duplicate labels - # We can't easily test the visual output, but we ensure no crash diff --git a/tests/test_strings.py b/tests/test_strings.py deleted file mode 100644 index ec2c445..0000000 --- a/tests/test_strings.py +++ /dev/null @@ -1,17 +0,0 @@ -from bouquin import strings - - -def test_load_strings_uses_system_locale_and_fallback(): - # pass a bogus locale to trigger fallback-to-default - strings.load_strings("zz") - assert strings._("next") # key exists in base translations - - -def test_load_strings_french(): - strings.load_strings("fr") - assert strings._("today") == "Aujourd'hui" # translation exists in French - - -def test_load_strings_italian(): - strings.load_strings("it") - assert strings._("today") == "Oggi" # translation exists in Italian diff --git a/tests/test_tabs.py b/tests/test_tabs.py index b495356..5e7a40e 100644 --- a/tests/test_tabs.py +++ b/tests/test_tabs.py @@ -1,17 +1,20 @@ import types - -from bouquin.history_dialog import HistoryDialog -from bouquin.main_window import MainWindow -from bouquin.settings import get_settings -from bouquin.theme import Theme, ThemeConfig, ThemeManager -from PySide6.QtGui import QTextCursor +import pytest from PySide6.QtWidgets import QFileDialog +from PySide6.QtGui import QTextCursor +from bouquin.theme import ThemeManager, ThemeConfig, Theme +from bouquin.settings import get_settings +from bouquin.main_window import MainWindow +from bouquin.history_dialog import HistoryDialog + + +@pytest.mark.gui def test_tabs_open_and_deduplicate(qtbot, app, tmp_db_cfg, fresh_db): # point to the temp encrypted DB s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) @@ -40,11 +43,12 @@ def test_tabs_open_and_deduplicate(qtbot, app, tmp_db_cfg, fresh_db): assert w.tab_widget.currentWidget().current_date == date1 +@pytest.mark.gui def test_toolbar_signals_dispatch_once_per_click( qtbot, app, tmp_db_cfg, fresh_db, monkeypatch ): s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) @@ -111,11 +115,12 @@ def test_toolbar_signals_dispatch_once_per_click( assert calls2["bold"] == 1 +@pytest.mark.gui def test_history_and_insert_image_not_duplicated( qtbot, app, tmp_db_cfg, fresh_db, monkeypatch, tmp_path ): s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) @@ -153,9 +158,10 @@ def test_history_and_insert_image_not_duplicated( assert inserted["count"] == 1 +@pytest.mark.gui def test_highlighter_attached_after_text_load(qtbot, app, tmp_db_cfg, fresh_db): s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) @@ -168,9 +174,10 @@ def test_highlighter_attached_after_text_load(qtbot, app, tmp_db_cfg, fresh_db): assert w.editor.highlighter.document() is w.editor.document() +@pytest.mark.gui def test_findbar_works_for_current_tab(qtbot, app, tmp_db_cfg, fresh_db): s = get_settings() - s.setValue("db/default_db", str(tmp_db_cfg.path)) + s.setValue("db/path", str(tmp_db_cfg.path)) s.setValue("db/key", tmp_db_cfg.key) themes = ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) diff --git a/tests/test_tags.py b/tests/test_tags.py deleted file mode 100644 index 89e5fbd..0000000 --- a/tests/test_tags.py +++ /dev/null @@ -1,2316 +0,0 @@ -import bouquin.strings as strings -import pytest -from bouquin.db import DBManager -from bouquin.flow_layout import FlowLayout -from bouquin.strings import load_strings -from bouquin.tag_browser import TagBrowserDialog -from bouquin.tags_widget import PageTagsWidget, TagChip -from PySide6.QtCore import QDate, QEvent, QPoint, Qt -from PySide6.QtGui import QColor, QMouseEvent -from PySide6.QtWidgets import ( - QApplication, - QColorDialog, - QDialog, - QInputDialog, - QMessageBox, -) -from sqlcipher3.dbapi2 import IntegrityError - -# ============================================================================ -# DB Layer Tag Tests -# ============================================================================ - - -def test_set_tags_for_page_creates_tags(fresh_db): - """Test that setting tags for a page creates the tags in the database""" - date_iso = "2024-01-15" - tags = ["work", "important", "meeting"] - - fresh_db.set_tags_for_page(date_iso, tags) - - # Verify tags were created - all_tags = fresh_db.list_tags() - tag_names = [name for _, name, _ in all_tags] - - assert "work" in tag_names - assert "important" in tag_names - assert "meeting" in tag_names - - -def test_get_tags_for_page(fresh_db): - """Test retrieving tags for a specific page""" - date_iso = "2024-01-15" - tags = ["work", "important"] - - fresh_db.set_tags_for_page(date_iso, tags) - retrieved_tags = fresh_db.get_tags_for_page(date_iso) - - assert len(retrieved_tags) == 2 - tag_names = [name for _, name, _ in retrieved_tags] - assert "work" in tag_names - assert "important" in tag_names - - -def test_tags_have_colors(fresh_db): - """Test that created tags have default colors assigned""" - date_iso = "2024-01-15" - fresh_db.set_tags_for_page(date_iso, ["test"]) - - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 1 - tag_id, name, color = tags[0] - - assert color.startswith("#") - assert len(color) in (4, 7) # #RGB or #RRGGBB - - -def test_set_tags_replaces_existing(fresh_db): - """Test that setting tags replaces the existing tag set""" - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["old1", "old2"]) - fresh_db.set_tags_for_page(date_iso, ["new1", "new2"]) - - tags = fresh_db.get_tags_for_page(date_iso) - tag_names = [name for _, name, _ in tags] - - assert "new1" in tag_names - assert "new2" in tag_names - assert "old1" not in tag_names - assert "old2" not in tag_names - - -def test_set_tags_empty_clears_tags(fresh_db): - """Test that setting empty tag list clears all tags for page""" - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - fresh_db.set_tags_for_page(date_iso, []) - - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 0 - - -def test_tags_case_insensitive_deduplication(fresh_db): - """Test that tags are deduplicated case-insensitively""" - date_iso = "2024-01-15" - - # Try to set tags with different cases - fresh_db.set_tags_for_page(date_iso, ["Work", "work", "WORK"]) - - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 1 - - -def test_tags_case_insensitive_reuse(fresh_db): - """Test that existing tags are reused regardless of case""" - date1 = "2024-01-15" - date2 = "2024-01-16" - - # Create tag with lowercase - fresh_db.set_tags_for_page(date1, ["work"]) - - # Try to add same tag with different case on different page - fresh_db.set_tags_for_page(date2, ["Work"]) - - # Should reuse the existing tag - all_tags = fresh_db.list_tags() - work_tags = [t for t in all_tags if t[1].lower() == "work"] - assert len(work_tags) == 1 # Only one "work" tag should exist - - -def test_tags_whitespace_normalization(fresh_db): - """Test that tags are trimmed and empty strings ignored""" - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, [" work ", "", " ", "meeting"]) - - tags = fresh_db.get_tags_for_page(date_iso) - tag_names = [name for _, name, _ in tags] - - assert "work" in tag_names - assert "meeting" in tag_names - assert len(tags) == 2 # Empty strings should be filtered - - -def test_list_all_tags(fresh_db): - """Test listing all tags in the database""" - fresh_db.set_tags_for_page("2024-01-15", ["tag1", "tag2"]) - fresh_db.set_tags_for_page("2024-01-16", ["tag2", "tag3"]) - - all_tags = fresh_db.list_tags() - tag_names = [name for _, name, _ in all_tags] - - assert len(all_tags) == 3 - assert "tag1" in tag_names - assert "tag2" in tag_names - assert "tag3" in tag_names - - -def test_add_tag_name_and_color(fresh_db): - """Test adding a tag's name and color""" - fresh_db.add_tag("new123", "#FF0000") - - updated_tags = fresh_db.list_tags() - assert len(updated_tags) == 1 - assert updated_tags[0][1] == "new123" - assert updated_tags[0][2] == "#FF0000" - - -def test_update_tag_name_and_color(fresh_db): - """Test updating a tag's name and color""" - date_iso = "2024-01-15" - fresh_db.set_tags_for_page(date_iso, ["oldname"]) - - tags = fresh_db.list_tags() - tag_id = tags[0][0] - - fresh_db.update_tag(tag_id, "newname", "#FF0000") - - updated_tags = fresh_db.list_tags() - assert len(updated_tags) == 1 - assert updated_tags[0][1] == "newname" - assert updated_tags[0][2] == "#FF0000" - - -def test_update_tag_existing_name_fails(fresh_db): - """Test updating a tag's name to an existing tag fails""" - load_strings("en") - date_iso = "2024-01-15" - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - - tags = fresh_db.list_tags() - tag_id = tags[0][0] - - with pytest.raises(IntegrityError) as excinfo: - fresh_db.update_tag(tag_id, "tag2", "#111111") - assert str(excinfo.value) == "A tag already exists with that name" - - -def test_delete_tag(fresh_db): - """Test deleting a tag removes it globally""" - fresh_db.set_tags_for_page("2024-01-15", ["tag1", "tag2"]) - fresh_db.set_tags_for_page("2024-01-16", ["tag1"]) - - tags = fresh_db.list_tags() - tag1_id = [tid for tid, name, _ in tags if name == "tag1"][0] - - fresh_db.delete_tag(tag1_id) - - # Tag should be removed from all pages - tags_page1 = fresh_db.get_tags_for_page("2024-01-15") - tags_page2 = fresh_db.get_tags_for_page("2024-01-16") - - assert len(tags_page1) == 1 - assert tags_page1[0][1] == "tag2" - assert len(tags_page2) == 0 - - -def test_get_pages_for_tag(fresh_db): - """Test retrieving all pages that have a specific tag""" - fresh_db.save_new_version("2024-01-15", "Content 1", "note") - fresh_db.save_new_version("2024-01-16", "Content 2", "note") - fresh_db.save_new_version("2024-01-17", "Content 3", "note") - - fresh_db.set_tags_for_page("2024-01-15", ["work"]) - fresh_db.set_tags_for_page("2024-01-16", ["work", "meeting"]) - fresh_db.set_tags_for_page("2024-01-17", ["personal"]) - - pages = fresh_db.get_pages_for_tag("work") - dates = [date_iso for date_iso, _ in pages] - - assert "2024-01-15" in dates - assert "2024-01-16" in dates - assert "2024-01-17" not in dates - - -def test_tags_persist_across_reconnect(fresh_db, tmp_db_cfg): - """Test that tags persist when database is closed and reopened""" - date_iso = "2024-01-15" - fresh_db.set_tags_for_page(date_iso, ["persistent", "tag"]) - fresh_db.close() - - # Reopen database - db2 = DBManager(tmp_db_cfg) - assert db2.connect() - - tags = db2.get_tags_for_page(date_iso) - tag_names = [name for _, name, _ in tags] - - assert "persistent" in tag_names - assert "tag" in tag_names - db2.close() - - -# ============================================================================ -# PageTagsWidget Tests -# ============================================================================ - - -def test_page_tags_widget_creation(app, fresh_db): - """Test that PageTagsWidget can be created""" - widget = PageTagsWidget(fresh_db) - assert widget is not None - assert widget._db == fresh_db - - -def test_page_tags_widget_set_current_date(app, fresh_db): - """Test setting the current date on the widget""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["test"]) - widget.set_current_date(date_iso) - - assert widget._current_date == date_iso - - -def test_page_tags_widget_hidden_when_collapsed(app, fresh_db): - """Test that tag chips are hidden when widget is collapsed""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - widget.set_current_date(date_iso) - - # Body should be hidden when collapsed - assert not widget.body.isVisible() - assert not widget.toggle_btn.isChecked() - - -def test_page_tags_widget_shows_tags_when_expanded(app, fresh_db): - """Test that tags are shown when widget is expanded""" - widget = PageTagsWidget(fresh_db) - widget.show() # Widget needs to be shown for visibility to work - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - widget.set_current_date(date_iso) - - # Expand the widget - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - assert widget.body.isVisible() - assert widget.chip_layout.count() == 2 - - -def test_page_tags_widget_add_tag(app, fresh_db): - """Test adding a tag through the widget""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Simulate adding a tag - widget.add_edit.setText("newtag") - widget._on_add_tag() - - # Verify tag was added - tags = fresh_db.get_tags_for_page(date_iso) - tag_names = [name for _, name, _ in tags] - assert "newtag" in tag_names - - -def test_page_tags_widget_prevents_duplicates(app, fresh_db): - """Test that duplicate tags are prevented""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["existing"]) - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Try to add the same tag - widget.add_edit.setText("existing") - widget._on_add_tag() - - # Should still only have one tag - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 1 - - -def test_page_tags_widget_case_insensitive_duplicates(app, fresh_db): - """Test that duplicate checking is case-insensitive""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["Test"]) - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Try to add with different case - widget.add_edit.setText("test") - widget._on_add_tag() - - # Should still only have one tag - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 1 - - -def test_page_tags_widget_remove_tag(app, fresh_db): - """Test removing a tag through the widget""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Get the first tag's ID - tags = fresh_db.get_tags_for_page(date_iso) - tag_id = tags[0][0] - - # Remove it - widget._remove_tag(tag_id) - - # Verify tag was removed - remaining_tags = fresh_db.get_tags_for_page(date_iso) - assert len(remaining_tags) == 1 - - -def test_page_tags_widget_empty_input_ignored(app, fresh_db): - """Test that empty tag input is ignored""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Try to add empty tag - widget.add_edit.setText("") - widget._on_add_tag() - - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 0 - - -def test_page_tags_widget_whitespace_trimmed(app, fresh_db): - """Test that whitespace is trimmed from tags""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Add tag with whitespace - widget.add_edit.setText(" spaced ") - widget._on_add_tag() - - tags = fresh_db.get_tags_for_page(date_iso) - assert tags[0][1] == "spaced" - - -def test_page_tags_widget_autocomplete_setup(app, fresh_db): - """Test that autocomplete is set up with existing tags""" - widget = PageTagsWidget(fresh_db) - - # Create some tags - fresh_db.set_tags_for_page("2024-01-15", ["alpha", "beta", "gamma"]) - - # Setup autocomplete - widget._setup_autocomplete() - - completer = widget.add_edit.completer() - assert completer is not None - - # Check that model contains the tags - model = completer.model() - items = [model.index(i, 0).data() for i in range(model.rowCount())] - assert "alpha" in items - assert "beta" in items - assert "gamma" in items - - -def test_page_tags_widget_signal_tag_added(app, fresh_db): - """Test that tagAdded signal is emitted when tag is added""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - widget.set_current_date(date_iso) - - signal_emitted = {"emitted": False} - - def on_tag_added(): - signal_emitted["emitted"] = True - - widget.tagAdded.connect(on_tag_added) - - widget.add_edit.setText("testtag") - widget._on_add_tag() - - assert signal_emitted["emitted"] - - -def test_page_tags_widget_signal_tag_activated(app, fresh_db): - """Test that tagActivated signal is emitted when tag is clicked""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["clickable"]) - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - signal_data = {"tag_name": None} - - def on_tag_activated(name): - signal_data["tag_name"] = name - - widget.tagActivated.connect(on_tag_activated) - widget._on_chip_clicked("clickable") - - assert signal_data["tag_name"] == "clickable" - - -# ============================================================================ -# TagChip Tests -# ============================================================================ - - -def test_tag_chip_creation(app): - """Test that TagChip can be created""" - chip = TagChip(1, "test", "#FF0000") - assert chip is not None - assert chip.tag_id == 1 - - -def test_tag_chip_with_remove_button(app): - """Test TagChip with remove button""" - chip = TagChip(1, "test", "#FF0000", show_remove=True) - - # Find the remove button (should be a QToolButton with text "×") - buttons = chip.findChildren(object) - assert any(hasattr(b, "text") and b.text() == "×" for b in buttons) - - -def test_tag_chip_without_remove_button(app): - """Test TagChip without remove button""" - chip = TagChip(1, "test", "#FF0000", show_remove=False) - - # Should not have remove button - buttons = chip.findChildren(object) - assert not any(hasattr(b, "text") and b.text() == "×" for b in buttons) - - -def test_tag_chip_color_display(app): - """Test that TagChip displays the correct color""" - chip = TagChip(1, "test", "#FF0000") - - # Find the color label - labels = chip.findChildren(object) - color_labels = [ - l - for l in labels - if hasattr(l, "styleSheet") and "background-color" in str(l.styleSheet()) - ] - - assert len(color_labels) > 0 - assert ( - "#FF0000" in color_labels[0].styleSheet() - or "rgb(255, 0, 0)" in color_labels[0].styleSheet() - ) - - -def test_tag_chip_remove_signal(app): - """Test that TagChip emits removeRequested signal""" - chip = TagChip(1, "test", "#FF0000", show_remove=True) - - signal_data = {"tag_id": None} - - def on_remove(tag_id): - signal_data["tag_id"] = tag_id - - chip.removeRequested.connect(on_remove) - chip.removeRequested.emit(1) - - assert signal_data["tag_id"] == 1 - - -def test_tag_chip_clicked_signal(app): - """Test that TagChip emits clicked signal""" - chip = TagChip(1, "test", "#FF0000") - - signal_data = {"tag_name": None} - - def on_clicked(name): - signal_data["tag_name"] = name - - chip.clicked.connect(on_clicked) - chip.clicked.emit("test") - - assert signal_data["tag_name"] == "test" - - -# ============================================================================ -# TagBrowserDialog Tests -# ============================================================================ - - -def test_tag_browser_creation(app, fresh_db): - """Test that TagBrowserDialog can be created""" - dialog = TagBrowserDialog(fresh_db) - assert dialog is not None - - -def test_tag_browser_displays_tags(app, fresh_db): - """Test that TagBrowserDialog displays tags in tree""" - fresh_db.set_tags_for_page("2024-01-15", ["tag1", "tag2"]) - fresh_db.save_new_version("2024-01-15", "Content", "note") - - dialog = TagBrowserDialog(fresh_db) - - # Tree should have top-level items for each tag - assert dialog.tree.topLevelItemCount() == 2 - - -def test_tag_browser_tag_with_pages(app, fresh_db): - """Test that TagBrowserDialog shows pages under tags""" - fresh_db.save_new_version("2024-01-15", "Content 1", "note") - fresh_db.save_new_version("2024-01-16", "Content 2", "note") - fresh_db.set_tags_for_page("2024-01-15", ["work"]) - fresh_db.set_tags_for_page("2024-01-16", ["work"]) - - dialog = TagBrowserDialog(fresh_db) - - # Find the "work" tag item - root = dialog.tree.topLevelItem(0) - - # Should have 2 child items (the dates) - assert root.childCount() == 2 - - -def test_tag_browser_focus_tag(app, fresh_db): - """Test that TagBrowserDialog can focus on a specific tag""" - fresh_db.set_tags_for_page("2024-01-15", ["alpha", "beta"]) - - dialog = TagBrowserDialog(fresh_db, focus_tag="beta") - - # The focused tag should be expanded and selected - current_item = dialog.tree.currentItem() - assert current_item is not None - - -def test_tag_browser_color_display(app, fresh_db): - """Test that tags display their colors in the browser""" - fresh_db.set_tags_for_page("2024-01-15", ["colorful"]) - - dialog = TagBrowserDialog(fresh_db) - - root = dialog.tree.topLevelItem(0) - # Color should be shown in column 1 - color_text = root.text(1) - assert color_text.startswith("#") - - -def test_tag_browser_edit_name_button_disabled(app, fresh_db): - """Test that edit button is disabled when no tag selected""" - dialog = TagBrowserDialog(fresh_db) - - assert not dialog.edit_name_btn.isEnabled() - - -def test_tag_browser_edit_name_button_enabled(app, fresh_db): - """Test that edit button is enabled when tag selected""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - # Select the first item - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - dialog._on_item_clicked(item, 0) - - assert dialog.edit_name_btn.isEnabled() - - -def test_tag_browser_delete_button_state(app, fresh_db): - """Test that delete button state changes with selection""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - # Initially disabled - assert not dialog.delete_btn.isEnabled() - - # Select a tag - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - dialog._on_item_clicked(item, 0) - - # Should be enabled now - assert dialog.delete_btn.isEnabled() - - -def test_tag_browser_change_color_button_state(app, fresh_db): - """Test that change color button state changes with selection""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - # Initially disabled - assert not dialog.change_color_btn.isEnabled() - - # Select a tag - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - dialog._on_item_clicked(item, 0) - - # Should be enabled now - assert dialog.change_color_btn.isEnabled() - - -def test_tag_browser_open_date_signal(app, fresh_db): - """Test that clicking a date emits openDateRequested signal""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - signal_data = {"date": None} - - def on_date_requested(date_iso): - signal_data["date"] = date_iso - - dialog.openDateRequested.connect(on_date_requested) - - # Get the tag item and expand it - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - - # Get the date child item - date_item = root.child(0) - - # Simulate activation - dialog._on_item_activated(date_item, 0) - - assert signal_data["date"] == "2024-01-15" - - -# ============================================================================ -# Integration Tests -# ============================================================================ - - -def test_tag_workflow_end_to_end(app, fresh_db, tmp_path): - """Test complete tag workflow: create, list, update, delete""" - # Create some entries with tags - dates = ["2024-01-15", "2024-01-16", "2024-01-17"] - for date in dates: - fresh_db.save_new_version(date, f"Entry {date}", "note") - - fresh_db.set_tags_for_page(dates[0], ["work", "urgent"]) - fresh_db.set_tags_for_page(dates[1], ["work", "meeting"]) - fresh_db.set_tags_for_page(dates[2], ["personal"]) - - # List all tags - should be 4 unique tags: work, urgent, meeting, personal - all_tags = fresh_db.list_tags() - assert len(all_tags) == 4 - - # Get pages for "work" tag - work_pages = fresh_db.get_pages_for_tag("work") - work_dates = [d for d, _ in work_pages] - assert dates[0] in work_dates - assert dates[1] in work_dates - assert dates[2] not in work_dates - - # Update a tag - work_tag = [t for t in all_tags if t[1] == "work"][0] - fresh_db.update_tag(work_tag[0], "office", "#0000FF") - - # Verify update - updated_tags = fresh_db.list_tags() - office_tag = [t for t in updated_tags if t[1] == "office"][0] - assert office_tag[2] == "#0000FF" - - # Delete a tag - urgent_tag = [t for t in all_tags if t[1] == "urgent"][0] - fresh_db.delete_tag(urgent_tag[0]) - - # Verify deletion - should have 3 tags now (office, meeting, personal) - final_tags = fresh_db.list_tags() - tag_names = [t[1] for t in final_tags] - assert "urgent" not in tag_names - assert len(final_tags) == 3 - - -def test_tags_with_export(fresh_db, tmp_path): - """Test that tags are preserved during export operations""" - date_iso = "2024-01-15" - fresh_db.save_new_version(date_iso, "Content", "note") - fresh_db.set_tags_for_page(date_iso, ["exported", "preserved"]) - - # Export to JSON - entries = fresh_db.get_all_entries() - json_path = tmp_path / "export.json" - fresh_db.export_json(entries, str(json_path)) - - assert json_path.exists() - - # Tags should still be in database - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 2 - - -def test_tags_survive_rekey(fresh_db, tmp_db_cfg): - """Test that tags persist after database rekey""" - date_iso = "2024-01-15" - fresh_db.save_new_version(date_iso, "Content", "note") - fresh_db.set_tags_for_page(date_iso, ["persistent"]) - - # Rekey the database - fresh_db.rekey("new-key-456") - fresh_db.close() - - # Reopen with new key - tmp_db_cfg.key = "new-key-456" - db2 = DBManager(tmp_db_cfg) - assert db2.connect() - - # Tags should still be there - tags = db2.get_tags_for_page(date_iso) - assert len(tags) == 1 - assert tags[0][1] == "persistent" - db2.close() - - -def test_multiple_pages_same_tags(fresh_db): - """Test multiple pages can share the same tags""" - dates = ["2024-01-15", "2024-01-16", "2024-01-17"] - - for date in dates: - fresh_db.save_new_version(date, f"Content {date}", "note") - fresh_db.set_tags_for_page(date, ["shared", "tag"]) - - # All pages should have the tags - for date in dates: - tags = fresh_db.get_tags_for_page(date) - tag_names = [name for _, name, _ in tags] - assert "shared" in tag_names - assert "tag" in tag_names - - # But there should only be 2 unique tags in the database - all_tags = fresh_db.list_tags() - assert len(all_tags) == 2 - - -def test_tag_page_without_content(fresh_db): - """Test that pages can have tags even without content""" - date_iso = "2024-01-15" - - # Set tags without saving any content - fresh_db.set_tags_for_page(date_iso, ["tagonly"]) - - # Tags should be retrievable - tags = fresh_db.get_tags_for_page(date_iso) - assert len(tags) == 1 - assert tags[0][1] == "tagonly" - - # Page should be created but with no content - content = fresh_db.get_entry(date_iso) - assert content is None or content == "" - - -# ============================================================================ -# TagChip Mouse Event Tests -# ============================================================================ - - -def test_tag_chip_mouse_click_emits_signal(app, qtbot): - """Test that clicking a TagChip emits the clicked signal""" - chip = TagChip(1, "clickable", "#FF0000") - chip.show() - qtbot.waitExposed(chip) - - signal_data = {"name": None} - - def on_clicked(name): - signal_data["name"] = name - - chip.clicked.connect(on_clicked) - - # Simulate mouse click - event = QMouseEvent( - QEvent.MouseButtonRelease, - QPoint(5, 5), - Qt.LeftButton, - Qt.LeftButton, - Qt.NoModifier, - ) - chip.mouseReleaseEvent(event) - - assert signal_data["name"] == "clickable" - - -def test_tag_chip_right_click_no_signal(app, qtbot): - """Test that right-clicking a TagChip does not emit clicked signal""" - chip = TagChip(1, "clickable", "#FF0000") - chip.show() - qtbot.waitExposed(chip) - - signal_emitted = {"emitted": False} - - def on_clicked(name): - signal_emitted["emitted"] = True - - chip.clicked.connect(on_clicked) - - # Simulate right click - event = QMouseEvent( - QEvent.MouseButtonRelease, - QPoint(5, 5), - Qt.RightButton, - Qt.RightButton, - Qt.NoModifier, - ) - chip.mouseReleaseEvent(event) - - # Signal should NOT be emitted for right click - assert not signal_emitted["emitted"] - - -# ============================================================================ -# PageTagsWidget Edge Cases -# ============================================================================ - - -def test_page_tags_widget_add_tag_with_completer_popup_visible(app, fresh_db): - """Test adding tag when completer popup is visible""" - widget = PageTagsWidget(fresh_db) - widget.show() - date_iso = "2024-01-15" - - # Create some existing tags for autocomplete - fresh_db.set_tags_for_page("2024-01-14", ["existing", "another"]) - fresh_db.set_tags_for_page(date_iso, []) - - widget.set_current_date(date_iso) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Type partial text to trigger completer - widget.add_edit.setText("exi") - - # Show the completer popup - completer = widget.add_edit.completer() - if completer: - completer.complete() - - # If popup is now visible, pressing enter should return early - if completer.popup().isVisible(): - # Call _on_add_tag while popup is visible - widget._on_add_tag() - - # Tag should NOT be added since completer popup was visible - tags = fresh_db.get_tags_for_page(date_iso) - # "exi" should not be added as a tag - tag_names = [name for _, name, _ in tags] - assert "exi" not in tag_names - - -def test_page_tags_widget_no_current_date_add_tag(app, fresh_db): - """Test adding tag when no current date is set (early return)""" - widget = PageTagsWidget(fresh_db) - - # Don't set current date - widget.add_edit.setText("test") - widget._on_add_tag() - - # Should handle gracefully and not crash - assert widget._current_date is None - - -def test_page_tags_widget_no_current_date_remove_tag(app, fresh_db): - """Test removing tag when no current date is set""" - widget = PageTagsWidget(fresh_db) - - # Try to remove tag without setting date - widget._remove_tag(1) - - # Should handle gracefully - assert widget._current_date is None - - -# ============================================================================ -# TagBrowserDialog Interactive Tests -# ============================================================================ - - -def test_tag_browser_button_states_with_page_item(app, fresh_db): - """Test that buttons are disabled when clicking a page item""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - # Get the tag item and expand it - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - - # Get the date child item - date_item = root.child(0) - - # Click the date item - dialog.tree.setCurrentItem(date_item) - dialog._on_item_clicked(date_item, 0) - - # Buttons should be disabled for page items - assert not dialog.edit_name_btn.isEnabled() - assert not dialog.change_color_btn.isEnabled() - assert not dialog.delete_btn.isEnabled() - - -def test_tag_browser_edit_tag_name_no_item(app, fresh_db): - """Test editing tag name when no item is selected""" - dialog = TagBrowserDialog(fresh_db) - - # Try to edit without selecting anything - dialog._edit_tag_name() - - # Should handle gracefully (no exception) - assert True - - -def test_tag_browser_edit_tag_name_page_item(app, fresh_db): - """Test editing tag name when a page item is selected""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - # Get the tag item and expand it - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - - # Select the date child item (not a tag) - date_item = root.child(0) - dialog.tree.setCurrentItem(date_item) - - # Try to edit - should return early since it's not a tag item - dialog._edit_tag_name() - - # Should handle gracefully - assert True - - -def test_tag_browser_change_color_no_item(app, fresh_db): - """Test changing color when no item is selected""" - dialog = TagBrowserDialog(fresh_db) - - # Try to change color without selecting anything - dialog._change_tag_color() - - # Should handle gracefully - assert True - - -def test_tag_browser_change_color_page_item(app, fresh_db): - """Test changing color when a page item is selected""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - # Get the tag item and expand it - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - - # Select the date child item - date_item = root.child(0) - dialog.tree.setCurrentItem(date_item) - - # Try to change color - should return early - dialog._change_tag_color() - - # Should handle gracefully - assert True - - -def test_tag_browser_delete_tag_no_item(app, fresh_db): - """Test deleting tag when no item is selected""" - dialog = TagBrowserDialog(fresh_db) - - # Try to delete without selecting anything - dialog._delete_tag() - - # Should handle gracefully - assert True - - -def test_tag_browser_delete_tag_page_item(app, fresh_db): - """Test deleting tag when a page item is selected""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - # Get the tag item and expand it - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - - # Select the date child item - date_item = root.child(0) - dialog.tree.setCurrentItem(date_item) - - # Try to delete - should return early - dialog._delete_tag() - - # Tag should still exist - tags = fresh_db.list_tags() - assert len(tags) == 1 - - -# ============================================================================ -# FlowLayout Edge Case -# ============================================================================ - - -def test_flow_layout_take_at_out_of_bounds(app): - """Test FlowLayout.takeAt with invalid index""" - layout = FlowLayout() - - # Try to take item at index that doesn't exist - result = layout.takeAt(999) - - # Should return None - assert result is None - - -def test_flow_layout_take_at_negative(app): - """Test FlowLayout.takeAt with negative index""" - layout = FlowLayout() - - # Try to take item at negative index - result = layout.takeAt(-1) - - # Should return None - assert result is None - - -# ============================================================================ -# DB Edge Case for tags -# ============================================================================ - - -def test_db_default_tag_colour_many_tags(fresh_db): - """Test the _default_tag_colour method with many tags""" - # Create many tags to test color assignment logic - tag_names = [f"tag{i}" for i in range(20)] - - for i, name in enumerate(tag_names): - fresh_db.set_tags_for_page(f"2024-01-{i+1:02d}", [name]) - - # Verify all tags have valid colors - tags = fresh_db.list_tags() - for _, name, color in tags: - assert color.startswith("#") - assert len(color) in (4, 7) - - -# ============================================================================ -# Additional PageTagsWidget Coverage -# ============================================================================ - - -def test_page_tags_widget_set_date_while_collapsed(app, fresh_db): - """Test setting date when widget is collapsed""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - - # Widget is collapsed by default - assert not widget.toggle_btn.isChecked() - - # Set date while collapsed - widget.set_current_date(date_iso) - - # Chips should not be loaded yet (collapsed) - assert widget.chip_layout.count() == 0 - - -def test_page_tags_widget_expand_then_set_date(app, fresh_db): - """Test expanding widget then setting date""" - widget = PageTagsWidget(fresh_db) - widget.show() - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1"]) - - # Expand first - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Then set date - widget.set_current_date(date_iso) - - # Process events - QApplication.processEvents() - - # Chips should be loaded - assert widget.chip_layout.count() == 1 - - -def test_page_tags_widget_remove_tag_no_date(app, fresh_db): - """Test removing tag when current date is None""" - widget = PageTagsWidget(fresh_db) - - # Current date is None - assert widget._current_date is None - - # Try to remove tag - widget._remove_tag(1) - - # Should handle gracefully - assert True - - -# ============================================================================ -# Signal Connection Tests -# ============================================================================ - - -def test_tag_browser_open_date_signal_works(app, fresh_db): - """Test that openDateRequested signal works properly""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - - received_dates = [] - - def date_handler(date_iso): - received_dates.append(date_iso) - - dialog.openDateRequested.connect(date_handler) - - # Get tag item, expand it, and get child date item - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - date_item = root.child(0) - - # Simulate activation (double-click) - dialog._on_item_activated(date_item, 0) - - assert "2024-01-15" in received_dates - - -def test_page_tags_widget_tag_activated_signal_works(app, fresh_db): - """Test tagActivated signal emission""" - widget = PageTagsWidget(fresh_db) - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["clicktag"]) - widget.set_current_date(date_iso) - - received_data = [] - - def tag_handler(data): - received_data.append(data) - - widget.tagActivated.connect(tag_handler) - - # Directly call the method - widget._on_chip_clicked("clicktag") - - assert "clicktag" in received_data - - -# ============================================================================ -# Additional Edge Cases -# ============================================================================ - - -def test_page_tags_widget_clear_chips_when_no_items(app, fresh_db): - """Test clearing chips when layout is empty""" - widget = PageTagsWidget(fresh_db) - - # Clear when empty - widget._clear_chips() - - # Should handle gracefully - assert widget.chip_layout.count() == 0 - - -def test_tag_browser_populate_with_no_focus_tag(app, fresh_db): - """Test populating browser without focus tag""" - fresh_db.set_tags_for_page("2024-01-15", ["tag1", "tag2"]) - - dialog = TagBrowserDialog(fresh_db, focus_tag=None) - - # Should have both tags - assert dialog.tree.topLevelItemCount() == 2 - - -def test_tag_browser_populate_with_nonexistent_focus_tag(app, fresh_db): - """Test populating browser with focus tag that doesn't exist""" - fresh_db.set_tags_for_page("2024-01-15", ["tag1"]) - - dialog = TagBrowserDialog(fresh_db, focus_tag="nonexistent") - - # Should handle gracefully - assert dialog.tree.topLevelItemCount() == 1 - - -# ============================================================================ -# PageTagsWidget Edge Cases -# ============================================================================ - - -def test_page_tags_widget_reload_without_current_date(app, fresh_db): - """Test _reload_tags with no current date set""" - widget = PageTagsWidget(fresh_db) - widget.show() - - # Try to reload without setting a date - widget._reload_tags() - - # Should handle gracefully - assert widget.chip_layout.count() == 0 - - -def test_page_tags_widget_add_tag_without_current_date(app, fresh_db): - """Test trying to add tag without current date set""" - widget = PageTagsWidget(fresh_db) - widget.show() - - widget.add_edit.setText("shouldnotadd") - widget._on_add_tag() - - # Should not crash, and no tags should be in database - all_tags = fresh_db.list_tags() - assert len(all_tags) == 0 - - -def test_page_tags_widget_completer_popup_visible_skip(app, fresh_db): - """Test that _on_add_tag returns early if completer popup is visible""" - widget = PageTagsWidget(fresh_db) - widget.show() - date_iso = "2024-01-15" - - # Create some existing tags for autocomplete - fresh_db.set_tags_for_page(date_iso, ["existing1", "existing2"]) - widget.set_current_date(date_iso) - widget._setup_autocomplete() - - # Make completer popup visible - widget.add_edit.setText("ex") - completer = widget.add_edit.completer() - if completer: - completer.popup().show() - - # Try to add tag while popup is visible - initial_count = len(fresh_db.get_tags_for_page(date_iso)) - widget._on_add_tag() - - # Should return early, not add anything - assert len(fresh_db.get_tags_for_page(date_iso)) == initial_count - - -def test_page_tags_widget_set_date_when_collapsed(app, fresh_db): - """Test setting date when widget is collapsed""" - widget = PageTagsWidget(fresh_db) - widget.show() - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - - # Ensure widget is collapsed - widget.toggle_btn.setChecked(False) - - # Set date - should clear chips since collapsed - widget.set_current_date(date_iso) - - assert widget._current_date == date_iso - # Chips should be cleared when collapsed - assert widget.chip_layout.count() == 0 - - -def test_page_tags_widget_set_date_when_expanded(app, fresh_db): - """Test setting date when widget is expanded""" - widget = PageTagsWidget(fresh_db) - widget.show() - date_iso = "2024-01-15" - - fresh_db.set_tags_for_page(date_iso, ["tag1", "tag2"]) - - # Expand widget - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Set date - should reload tags since expanded - widget.set_current_date(date_iso) - - assert widget.chip_layout.count() == 2 - - -def test_page_tags_widget_toggle_without_date(app, fresh_db): - """Test toggling widget without a current date set""" - widget = PageTagsWidget(fresh_db) - widget.show() - - # Try to expand without setting a date - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Should not crash - assert widget.body.isVisible() - - -# ============================================================================ -# TagBrowserDialog User Interaction Tests -# ============================================================================ - - -def test_tag_browser_click_page_item_disables_buttons(app, fresh_db): - """Test that clicking a page item (not tag) disables edit buttons""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - # Get the tag item and expand it - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - - # Click the page child item - page_item = root.child(0) - dialog.tree.setCurrentItem(page_item) - dialog._on_item_clicked(page_item, 0) - - # Buttons should be disabled for page items - assert not dialog.edit_name_btn.isEnabled() - assert not dialog.change_color_btn.isEnabled() - assert not dialog.delete_btn.isEnabled() - - -def test_tag_browser_edit_name_no_item_selected(app, fresh_db): - """Test _edit_tag_name with no item selected""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - # Clear selection - dialog.tree.setCurrentItem(None) - - # Try to edit - should return early - dialog._edit_tag_name() - - # Tag should be unchanged - tags = fresh_db.list_tags() - assert tags[0][1] == "test" - - -def test_tag_browser_edit_name_page_item_selected(app, fresh_db): - """Test _edit_tag_name with page item selected (should return early)""" - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - # Select a page item - root = dialog.tree.topLevelItem(0) - dialog.tree.expandItem(root) - page_item = root.child(0) - dialog.tree.setCurrentItem(page_item) - - # Try to edit - should return early - dialog._edit_tag_name() - - # Tag should be unchanged - tags = fresh_db.list_tags() - assert tags[0][1] == "test" - - -def test_tag_browser_edit_name_cancelled(app, fresh_db, monkeypatch): - """Test _edit_tag_name when user cancels the dialog""" - fresh_db.set_tags_for_page("2024-01-15", ["oldname"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - # Select the tag - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QInputDialog.getText to return cancelled (ok=False) - def mock_get_text(*args, **kwargs): - return ("newname", False) # User cancelled - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._edit_tag_name() - - # Tag should be unchanged - tags = fresh_db.list_tags() - assert tags[0][1] == "oldname" - - -def test_tag_browser_edit_name_empty_name(app, fresh_db, monkeypatch): - """Test _edit_tag_name with empty name""" - fresh_db.set_tags_for_page("2024-01-15", ["oldname"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QInputDialog.getText to return empty string - def mock_get_text(*args, **kwargs): - return ("", True) - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._edit_tag_name() - - # Tag should be unchanged - tags = fresh_db.list_tags() - assert tags[0][1] == "oldname" - - -def test_tag_browser_edit_name_same_name(app, fresh_db, monkeypatch): - """Test _edit_tag_name with same name (no change)""" - fresh_db.set_tags_for_page("2024-01-15", ["samename"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QInputDialog.getText to return same name - def mock_get_text(*args, **kwargs): - return ("samename", True) - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._edit_tag_name() - - # Tag should be unchanged - tags = fresh_db.list_tags() - assert tags[0][1] == "samename" - - -def test_tag_browser_edit_name_success(app, fresh_db, monkeypatch): - """Test successfully editing a tag name""" - fresh_db.set_tags_for_page("2024-01-15", ["oldname"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QInputDialog.getText to return new name - def mock_get_text(*args, **kwargs): - return ("newname", True) - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._edit_tag_name() - - # Tag should be updated - tags = fresh_db.list_tags() - assert tags[0][1] == "newname" - - -def test_tag_browser_change_color_cancelled(app, fresh_db, monkeypatch): - """Test _change_tag_color when user cancels""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - original_color = fresh_db.list_tags()[0][2] - - # Mock QColorDialog.getColor to return invalid color (cancelled) - from PySide6.QtGui import QColor - - def mock_get_color(*args, **kwargs): - return QColor() # Invalid color - - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - dialog._change_tag_color() - - # Color should be unchanged - assert fresh_db.list_tags()[0][2] == original_color - - -def test_tag_browser_change_color_success(app, fresh_db, monkeypatch): - """Test successfully changing tag color""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QColorDialog.getColor to return blue - from PySide6.QtGui import QColor - - def mock_get_color(*args, **kwargs): - return QColor("#0000FF") - - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - dialog._change_tag_color() - - # Color should be updated - tags = fresh_db.list_tags() - assert tags[0][2] == "#0000ff" # Qt lowercases hex colors - - -def test_tag_browser_delete_tag_cancelled(app, fresh_db, monkeypatch): - """Test _delete_tag when user cancels confirmation""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QMessageBox.question to return No - def mock_question(*args, **kwargs): - return QMessageBox.No - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - dialog._delete_tag() - - # Tag should still exist - assert len(fresh_db.list_tags()) == 1 - - -def test_tag_browser_delete_tag_confirmed(app, fresh_db, monkeypatch): - """Test successfully deleting a tag after confirmation""" - fresh_db.set_tags_for_page("2024-01-15", ["test"]) - - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - # Mock QMessageBox.question to return Yes - def mock_question(*args, **kwargs): - return QMessageBox.Yes - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - dialog._delete_tag() - - # Tag should be deleted - assert len(fresh_db.list_tags()) == 0 - - -# ============================================================================ -# DB Edge Cases -# ============================================================================ - - -def test_default_tag_colour_empty_name(fresh_db): - """Test _default_tag_colour with empty string""" - color = fresh_db._default_tag_colour("") - assert color == "#CCCCCC" - - -def test_default_tag_colour_none(fresh_db): - """Test _default_tag_colour with None (should handle edge case)""" - # This tests the "if not name:" condition - color = fresh_db._default_tag_colour("") - assert color == "#CCCCCC" - - -# ============================================================================ -# FlowLayout Edge Cases -# ============================================================================ - - -def test_flow_layout_take_at_invalid_index(app): - """Test FlowLayout.takeAt with out-of-bounds index""" - from PySide6.QtWidgets import QLabel, QWidget - - widget = QWidget() - layout = FlowLayout(widget) - - # Add some items - layout.addWidget(QLabel("Item 1")) - layout.addWidget(QLabel("Item 2")) - - # Try to take at invalid negative index - result = layout.takeAt(-1) - assert result is None - - # Try to take at index beyond count - result = layout.takeAt(100) - assert result is None - - # Valid index should work - result = layout.takeAt(0) - assert result is not None - - -def test_flow_layout_take_at_boundary(app): - """Test FlowLayout.takeAt at exact boundary""" - from PySide6.QtWidgets import QLabel, QWidget - - widget = QWidget() - layout = FlowLayout(widget) - - # Add items - layout.addWidget(QLabel("Item 1")) - layout.addWidget(QLabel("Item 2")) - - count = layout.count() - - # Try to take at count (should be out of bounds) - result = layout.takeAt(count) - assert result is None - - # Take at count-1 (should work) - result = layout.takeAt(count - 1) - assert result is not None - - -# ============================================================================ -# Integration Tests for Complete Coverage -# ============================================================================ - - -def test_complete_tag_lifecycle_with_browser(app, fresh_db, monkeypatch): - """Test complete tag lifecycle: create, view in browser, edit, delete""" - # Create a tag - fresh_db.save_new_version("2024-01-15", "Content", "note") - fresh_db.set_tags_for_page("2024-01-15", ["lifecycle"]) - - # Open browser - dialog = TagBrowserDialog(fresh_db) - dialog.show() - - # Select the tag - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - dialog._on_item_clicked(item, 0) - - # Edit name - def mock_get_text(*args, **kwargs): - return ("renamed", True) - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - dialog._edit_tag_name() - - # After _edit_tag_name calls _populate(), need to re-select the item - # as the tree was rebuilt - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - dialog._on_item_clicked(item, 0) - - # Change color - from PySide6.QtGui import QColor - - def mock_get_color(*args, **kwargs): - return QColor("#FF0000") - - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - dialog._change_tag_color() - - # Verify changes - tags = fresh_db.list_tags() - assert tags[0][1] == "renamed" - # Qt lowercases hex colors - assert tags[0][2].lower() == "#ff0000" - - # Delete tag - need to re-select after _change_tag_color also calls _populate - item = dialog.tree.topLevelItem(0) - dialog.tree.setCurrentItem(item) - - def mock_question(*args, **kwargs): - return QMessageBox.Yes - - monkeypatch.setattr(QMessageBox, "question", mock_question) - dialog._delete_tag() - - # Tag should be gone - assert len(fresh_db.list_tags()) == 0 - - -def test_tag_widget_with_completer_interaction(app, fresh_db): - """Test tag widget with autocomplete interaction""" - widget = PageTagsWidget(fresh_db) - widget.show() - - # Create some tags - date1 = "2024-01-15" - fresh_db.set_tags_for_page(date1, ["alpha", "beta", "gamma"]) - - # Set up widget with different date - date2 = "2024-01-16" - widget.set_current_date(date2) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Autocomplete should have previous tags - completer = widget.add_edit.completer() - assert completer is not None - - # Add a tag that exists in autocomplete - widget.add_edit.setText("alpha") - widget._on_add_tag() - - # Should be added to current page - tags = fresh_db.get_tags_for_page(date2) - tag_names = [name for _, name, _ in tags] - assert "alpha" in tag_names - - -def test_multiple_widgets_same_database(app, fresh_db): - """Test multiple tag widgets operating on same database""" - widget1 = PageTagsWidget(fresh_db) - widget2 = PageTagsWidget(fresh_db) - - widget1.show() - widget2.show() - - date_iso = "2024-01-15" - - # Widget 1 adds a tag - widget1.set_current_date(date_iso) - widget1.toggle_btn.setChecked(True) - widget1._on_toggle(True) - widget1.add_edit.setText("shared") - widget1._on_add_tag() - - # Widget 2 should see it when set to same date - widget2.set_current_date(date_iso) - widget2.toggle_btn.setChecked(True) - widget2._on_toggle(True) - - assert widget2.chip_layout.count() == 1 - - -def test_tag_browser_add_tag_with_color(qtbot, fresh_db, monkeypatch): - """Test adding a new tag with color selection.""" - strings.load_strings("en") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - # Mock input dialog and color dialog - def mock_get_text(*args, **kwargs): - return "NewTag", True - - def mock_get_color(initial, parent): - return QColor("#ff0000") - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - tags_before = len(fresh_db.list_tags()) - - # Trigger add tag - browser._add_a_tag() - - # Should have added tag - tags_after = len(fresh_db.list_tags()) - assert tags_after == tags_before + 1 - - -def test_tag_browser_add_tag_cancelled_at_name(qtbot, fresh_db, monkeypatch): - """Test cancelling tag addition at name input.""" - strings.load_strings("en") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - # Mock cancelled input - def mock_get_text(*args, **kwargs): - return "", False - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - tags_before = len(fresh_db.list_tags()) - - browser._add_a_tag() - - # Should not have added tag - tags_after = len(fresh_db.list_tags()) - assert tags_after == tags_before - - -def test_tag_browser_add_tag_cancelled_at_color(qtbot, fresh_db, monkeypatch): - """Test cancelling tag addition at color selection.""" - strings.load_strings("en") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - # Name input succeeds, color cancelled - def mock_get_text(*args, **kwargs): - return "NewTag", True - - def mock_get_color(initial, parent): - return QColor() # Invalid color = cancelled - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - tags_before = len(fresh_db.list_tags()) - - browser._add_a_tag() - - # Should not have added tag - tags_after = len(fresh_db.list_tags()) - assert tags_after == tags_before - - -def test_tag_browser_add_duplicate_tag_shows_error(qtbot, fresh_db, monkeypatch): - """Test adding duplicate tag shows error.""" - strings.load_strings("en") - - # Add existing tag - fresh_db.add_tag("Existing", "#ff0000") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - # Try to add same tag - def mock_get_text(*args, **kwargs): - return "Existing", True - - def mock_get_color(initial, parent): - return QColor("#00ff00") - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - critical_shown = {"shown": False} - - def mock_critical(*args): - critical_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "critical", mock_critical) - - browser._add_a_tag() - - # Should show error - assert critical_shown["shown"] - - -def test_tag_browser_edit_tag_integrity_error(qtbot, fresh_db, monkeypatch): - """Test editing tag to duplicate name shows error.""" - strings.load_strings("en") - - # Add two tags - fresh_db.add_tag("Tag1", "#ff0000") - fresh_db.add_tag("Tag2", "#00ff00") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - # Select first tag - browser._populate(None) - tree = browser.tree - if tree.topLevelItemCount() > 0: - tree.setCurrentItem(tree.topLevelItem(0)) - - # Try to rename to Tag2 (duplicate) - def mock_get_text(*args, **kwargs): - return "Tag2", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - critical_shown = {"shown": False} - - def mock_critical(*args): - critical_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "critical", mock_critical) - - browser._edit_tag_name() - - # Should show error - assert critical_shown["shown"] - - -def test_tag_browser_change_tag_color_integrity_error(qtbot, fresh_db, monkeypatch): - """Test changing tag color with integrity error.""" - strings.load_strings("en") - - fresh_db.add_tag("TestTag", "#ff0000") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - browser._populate(None) - tree = browser.tree - if tree.topLevelItemCount() > 0: - tree.setCurrentItem(tree.topLevelItem(0)) - - # Mock color dialog - def mock_get_color(initial, parent): - return QColor("#00ff00") - - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - # Mock update_tag to raise IntegrityError - fresh_db.update_tag - - def bad_update(*args): - raise IntegrityError("Simulated error") - - monkeypatch.setattr(fresh_db, "update_tag", bad_update) - - critical_shown = {"shown": False} - - def mock_critical(*args): - critical_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "critical", mock_critical) - - browser._change_tag_color() - - # Should show error - assert critical_shown["shown"] - - -def test_tag_browser_change_tag_color_cancelled(qtbot, fresh_db, monkeypatch): - """Test cancelling color change.""" - strings.load_strings("en") - - fresh_db.add_tag("TestTag", "#ff0000") - - browser = TagBrowserDialog(fresh_db) - qtbot.addWidget(browser) - browser.show() - - browser._populate(None) - tree = browser.tree - if tree.topLevelItemCount() > 0: - tree.setCurrentItem(tree.topLevelItem(0)) - - # Mock cancelled color dialog - def mock_get_color(initial, parent): - return QColor() # Invalid = cancelled - - monkeypatch.setattr(QColorDialog, "getColor", mock_get_color) - - # Should not crash - browser._change_tag_color() - - -def test_tag_chip_runtime_error_on_mouse_release(qtbot, monkeypatch): - """Test TagChip handles RuntimeError on mouseReleaseEvent.""" - chip = TagChip(1, "test", "#ff0000") - qtbot.addWidget(chip) - chip.show() - - # Mock super().mouseReleaseEvent to raise RuntimeError - from PySide6.QtWidgets import QFrame - - original_mouse_release = QFrame.mouseReleaseEvent - - def bad_mouse_release(self, event): - raise RuntimeError("Widget deleted") - - monkeypatch.setattr(QFrame, "mouseReleaseEvent", bad_mouse_release) - - clicked_names = [] - chip.clicked.connect(clicked_names.append) - - # Simulate left click - from PySide6.QtTest import QTest - - QTest.mouseClick(chip, Qt.LeftButton) - - # Should have emitted signal despite RuntimeError - assert "test" in clicked_names - - # Restore original - monkeypatch.setattr(QFrame, "mouseReleaseEvent", original_mouse_release) - - -def test_page_tags_widget_many_tags(qtbot, fresh_db): - """Test page tags widget with many tags.""" - strings.load_strings("en") - - # Add many tags - for i in range(20): - fresh_db.add_tag(f"Tag{i}", f"#{i:02x}0000") - - fresh_db.save_new_version("2024-01-01", "Content", "test") - - # Add all tags to page - tag_names = [f"Tag{i}" for i in range(20)] - fresh_db.set_tags_for_page("2024-01-01", tag_names) - - widget = PageTagsWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - # Set current date - widget.set_current_date("2024-01-01") - - # Should display all tags - qtbot.wait(50) - - -def test_page_tags_widget_tag_click(qtbot, fresh_db): - """Test clicking on a tag in PageTagsWidget.""" - strings.load_strings("en") - - fresh_db.add_tag("Clickable", "#ff0000") - fresh_db.save_new_version("2024-01-01", "Content", "test") - fresh_db.set_tags_for_page("2024-01-01", ["Clickable"]) - - widget = PageTagsWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - widget.set_current_date("2024-01-01") - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Find the tag chip - chips = widget.findChildren(TagChip) - assert len(chips) > 0 - - # Click it - shouldn't crash - from PySide6.QtTest import QTest - - QTest.mouseClick(chips[0], Qt.LeftButton) - - -def test_page_tags_widget_no_date_set(qtbot, fresh_db): - """Test PageTagsWidget with no date set.""" - strings.load_strings("en") - - widget = PageTagsWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - # Should handle no date gracefully - widget.set_current_date(None) - qtbot.wait(10) - - -def test_page_tags_widget_date_with_no_tags(qtbot, fresh_db): - """Test PageTagsWidget for date with no tags.""" - strings.load_strings("en") - - fresh_db.save_new_version("2024-01-01", "Content", "test") - - widget = PageTagsWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - widget.set_current_date("2024-01-01") - - # Should show no tags - pills = widget.findChildren(TagChip) - assert len(pills) == 0 - - -def test_page_tags_widget_updates_on_tag_change(qtbot, fresh_db): - """Test PageTagsWidget updates when tags change.""" - strings.load_strings("en") - - fresh_db.add_tag("Initial", "#ff0000") - fresh_db.save_new_version("2024-01-01", "Content", "test") - fresh_db.set_tags_for_page("2024-01-01", ["Initial"]) - - widget = PageTagsWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - widget.set_current_date("2024-01-01") - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - assert widget.chip_layout.count() == 1 - - # Add another tag - fresh_db.add_tag("Second", "#00ff00") - fresh_db.set_tags_for_page("2024-01-01", ["Initial", "Second"]) - - # Reload - widget.set_current_date("2024-01-01") - qtbot.wait(100) - - assert widget.chip_layout.count() == 2 - - -def test_tags_widget_open_manager_and_accept(qtbot, tmp_db_cfg, fresh_db, monkeypatch): - """Test opening tag manager dialog and accepting - covers lines 248-256""" - tags_widget = PageTagsWidget(fresh_db) - qtbot.addWidget(tags_widget) - - # Set a current date - date = QDate.currentDate().toString("yyyy-MM-dd") - tags_widget.set_current_date(date) - - # Add some tags first - fresh_db.add_tag("Test Tag", date) - tags_widget._reload_tags() - - # Mock the tag browser dialog - from bouquin.tag_browser import TagBrowserDialog - - dialog_executed = [] - - def fake_exec(self): - dialog_executed.append(True) - # Simulate the dialog being accepted - return QDialog.Accepted - - monkeypatch.setattr(TagBrowserDialog, "exec", fake_exec) - - # Open the manager - tags_widget._open_manager() - qtbot.wait(50) - - # Dialog should have been executed - assert len(dialog_executed) > 0 - - -def test_tags_widget_open_manager_and_reject(qtbot, tmp_db_cfg, fresh_db, monkeypatch): - """Test opening tag manager dialog and rejecting""" - tags_widget = PageTagsWidget(fresh_db) - qtbot.addWidget(tags_widget) - - # Set a current date - date = QDate.currentDate().toString("yyyy-MM-dd") - tags_widget.set_current_date(date) - - # Mock the tag browser dialog - from bouquin.tag_browser import TagBrowserDialog - - dialog_executed = [] - - def fake_exec(self): - dialog_executed.append(True) - # Simulate the dialog being rejected - return QDialog.Rejected - - monkeypatch.setattr(TagBrowserDialog, "exec", fake_exec) - - # Open the manager - tags_widget._open_manager() - qtbot.wait(50) - - # Dialog should have been executed - assert len(dialog_executed) > 0 - - -def test_tags_widget_open_manager_without_current_date( - qtbot, tmp_db_cfg, fresh_db, monkeypatch -): - """Test opening tag manager when no current date is set""" - tags_widget = PageTagsWidget(fresh_db) - qtbot.addWidget(tags_widget) - - # Don't set a current date - tags_widget._current_date = None - - # Mock the tag browser dialog - from bouquin.tag_browser import TagBrowserDialog - - dialog_executed = [] - - def fake_exec(self): - dialog_executed.append(True) - return QDialog.Accepted - - monkeypatch.setattr(TagBrowserDialog, "exec", fake_exec) - - # Open the manager - tags_widget._open_manager() - qtbot.wait(50) - - # Dialog should still execute - assert len(dialog_executed) > 0 - - -def test_tags_widget_manager_with_date_click_signal( - qtbot, tmp_db_cfg, fresh_db, monkeypatch -): - """Test tag manager emitting openDateRequested signal""" - tags_widget = PageTagsWidget(fresh_db) - qtbot.addWidget(tags_widget) - - date = QDate.currentDate().toString("yyyy-MM-dd") - tags_widget.set_current_date(date) - - activated_tags = [] - - def capture_tag(tag): - activated_tags.append(tag) - - tags_widget.tagActivated.connect(capture_tag) - - # Mock the tag browser dialog - from bouquin.tag_browser import TagBrowserDialog - - def fake_exec(self): - # Simulate clicking a date in the browser - self.openDateRequested.emit("2024-01-01") - return QDialog.Accepted - - monkeypatch.setattr(TagBrowserDialog, "exec", fake_exec) - - # Open the manager - tags_widget._open_manager() - qtbot.wait(50) - - # Should have captured the activated tag/date - assert len(activated_tags) > 0 - assert "2024-01-01" in activated_tags - - -def test_tags_widget_chip_click(qtbot, tmp_db_cfg, fresh_db): - """Test clicking on a tag chip""" - tags_widget = PageTagsWidget(fresh_db) - qtbot.addWidget(tags_widget) - - date = QDate.currentDate().toString("yyyy-MM-dd") - tags_widget.set_current_date(date) - - # Add a tag - fresh_db.add_tag("ClickMe", date) - tags_widget._reload_tags() - - activated_tags = [] - - def capture_tag(tag): - activated_tags.append(tag) - - tags_widget.tagActivated.connect(capture_tag) - - # Simulate chip click - tags_widget._on_chip_clicked("ClickMe") - qtbot.wait(50) - - assert "ClickMe" in activated_tags diff --git a/tests/test_theme.py b/tests/test_theme.py index a1dc283..690f439 100644 --- a/tests/test_theme.py +++ b/tests/test_theme.py @@ -1,6 +1,7 @@ -from bouquin.theme import Theme, ThemeConfig, ThemeManager +import pytest from PySide6.QtGui import QPalette -from PySide6.QtWidgets import QApplication, QCalendarWidget, QWidget + +from bouquin.theme import Theme, ThemeConfig, ThemeManager def test_theme_manager_apply_light_and_dark(app): @@ -13,39 +14,8 @@ def test_theme_manager_apply_light_and_dark(app): assert isinstance(app.palette(), QPalette) +@pytest.mark.gui def test_theme_manager_system_roundtrip(app, qtbot): cfg = ThemeConfig(theme=Theme.SYSTEM) mgr = ThemeManager(app, cfg) mgr.apply(cfg.theme) - - -def _make_themes(theme): - app = QApplication.instance() - return ThemeManager(app, ThemeConfig(theme=theme)) - - -def test_register_and_restyle_calendar_and_overlay(qtbot): - themes = _make_themes(Theme.DARK) - cal = QCalendarWidget() - ov = QWidget() - ov.setObjectName("LockOverlay") - qtbot.addWidget(cal) - qtbot.addWidget(ov) - - themes.register_calendar(cal) - themes.register_lock_overlay(ov) - - # Force a restyle pass (covers the "is not None" branches) - themes._restyle_registered() - - -def test_apply_dark_styles_cover_css_paths(qtbot): - themes = _make_themes(Theme.DARK) - cal = QCalendarWidget() - ov = QWidget() - ov.setObjectName("LockOverlay") - qtbot.addWidget(cal) - qtbot.addWidget(ov) - - themes.register_calendar(cal) # drives _apply_calendar_theme (dark path) - themes.register_lock_overlay(ov) # drives _apply_lock_overlay_theme (dark path) diff --git a/tests/test_time_log.py b/tests/test_time_log.py deleted file mode 100644 index ff1d159..0000000 --- a/tests/test_time_log.py +++ /dev/null @@ -1,3012 +0,0 @@ -from datetime import date, timedelta -from unittest.mock import MagicMock, patch - -import bouquin.strings as strings -import pytest -from bouquin.theme import Theme, ThemeConfig, ThemeManager -from bouquin.time_log import ( - TimeCodeManagerDialog, - TimeLogDialog, - TimeLogWidget, - TimeReportDialog, -) -from PySide6.QtCore import QDate, Qt -from PySide6.QtWidgets import QDialog, QFileDialog, QInputDialog, QMessageBox -from sqlcipher3.dbapi2 import IntegrityError - - -@pytest.fixture -def theme_manager(app): - return ThemeManager(app, ThemeConfig(theme=Theme.LIGHT)) - - -def _today(): - return date.today().isoformat() - - -def _yesterday(): - return (date.today() - timedelta(days=1)).isoformat() - - -def _tomorrow(): - return (date.today() + timedelta(days=1)).isoformat() - - -# ============================================================================ -# DB Methods Tests -# ============================================================================ - - -def test_list_projects_empty(fresh_db): - """List projects on empty db returns empty list.""" - projects = fresh_db.list_projects() - assert projects == [] - - -def test_add_project(fresh_db): - """Add a project and verify it's retrievable.""" - proj_id = fresh_db.add_project("Project Alpha") - assert proj_id > 0 - - projects = fresh_db.list_projects() - assert len(projects) == 1 - assert projects[0] == (proj_id, "Project Alpha") - - -def test_add_project_duplicate_name(fresh_db): - """Adding project with duplicate name is idempotent.""" - id1 = fresh_db.add_project("Duplicate") - id2 = fresh_db.add_project("Duplicate") - assert id1 == id2 - - projects = fresh_db.list_projects() - assert len(projects) == 1 - - -def test_add_project_empty_name(fresh_db): - """Adding project with empty name raises ValueError.""" - with pytest.raises(ValueError, match="empty project name"): - fresh_db.add_project("") - - with pytest.raises(ValueError, match="empty project name"): - fresh_db.add_project(" ") - - -def test_add_project_strips_whitespace(fresh_db): - """Project name is trimmed of leading/trailing whitespace.""" - fresh_db.add_project(" Trimmed ") - projects = fresh_db.list_projects() - assert projects[0][1] == "Trimmed" - - -def test_list_projects_sorted(fresh_db): - """Projects are returned sorted case-insensitively by name.""" - fresh_db.add_project("Zebra") - fresh_db.add_project("alpha") - fresh_db.add_project("Beta") - - projects = fresh_db.list_projects() - names = [p[1] for p in projects] - assert names == ["alpha", "Beta", "Zebra"] - - -def test_rename_project(fresh_db): - """Rename a project.""" - proj_id = fresh_db.add_project("Old Name") - fresh_db.rename_project(proj_id, "New Name") - - projects = fresh_db.list_projects() - assert len(projects) == 1 - assert projects[0] == (proj_id, "New Name") - - -def test_rename_project_to_existing_name_raises(fresh_db): - """Renaming to existing name raises IntegrityError.""" - fresh_db.add_project("Project A") - id_b = fresh_db.add_project("Project B") - - with pytest.raises(IntegrityError): - fresh_db.rename_project(id_b, "Project A") - - -def test_rename_project_empty_name_does_nothing(fresh_db): - """Renaming to empty string does nothing.""" - proj_id = fresh_db.add_project("Original") - fresh_db.rename_project(proj_id, "") - - projects = fresh_db.list_projects() - assert projects[0][1] == "Original" - - -def test_delete_project(fresh_db): - """Delete a project.""" - proj_id = fresh_db.add_project("To Delete") - fresh_db.delete_project(proj_id) - - projects = fresh_db.list_projects() - assert len(projects) == 0 - - -def test_delete_project_with_time_entries_raises(fresh_db): - """Deleting project with time entries raises IntegrityError.""" - proj_id = fresh_db.add_project("Active Project") - act_id = fresh_db.add_activity("Coding") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - with pytest.raises(IntegrityError): - fresh_db.delete_project(proj_id) - - -def test_list_activities_empty(fresh_db): - """List activities on empty db returns empty list.""" - activities = fresh_db.list_activities() - assert activities == [] - - -def test_add_activity(fresh_db): - """Add an activity and verify it's retrievable.""" - act_id = fresh_db.add_activity("Coding") - assert act_id > 0 - - activities = fresh_db.list_activities() - assert len(activities) == 1 - assert activities[0] == (act_id, "Coding") - - -def test_add_activity_duplicate_name(fresh_db): - """Adding activity with duplicate name is idempotent.""" - id1 = fresh_db.add_activity("Meeting") - id2 = fresh_db.add_activity("Meeting") - assert id1 == id2 - - activities = fresh_db.list_activities() - assert len(activities) == 1 - - -def test_add_activity_empty_name(fresh_db): - """Adding activity with empty name raises ValueError.""" - with pytest.raises(ValueError, match="empty activity name"): - fresh_db.add_activity("") - - with pytest.raises(ValueError, match="empty activity name"): - fresh_db.add_activity(" ") - - -def test_add_activity_strips_whitespace(fresh_db): - """Activity name is trimmed of leading/trailing whitespace.""" - fresh_db.add_activity(" Planning ") - activities = fresh_db.list_activities() - assert activities[0][1] == "Planning" - - -def test_list_activities_sorted(fresh_db): - """Activities are returned sorted case-insensitively by name.""" - fresh_db.add_activity("Writing") - fresh_db.add_activity("coding") - fresh_db.add_activity("Planning") - - activities = fresh_db.list_activities() - names = [a[1] for a in activities] - assert names == ["coding", "Planning", "Writing"] - - -def test_rename_activity(fresh_db): - """Rename an activity.""" - act_id = fresh_db.add_activity("Old Activity") - fresh_db.rename_activity(act_id, "New Activity") - - activities = fresh_db.list_activities() - assert len(activities) == 1 - assert activities[0] == (act_id, "New Activity") - - -def test_rename_activity_to_existing_name_raises(fresh_db): - """Renaming to existing name raises IntegrityError.""" - fresh_db.add_activity("Activity A") - id_b = fresh_db.add_activity("Activity B") - - with pytest.raises(IntegrityError): - fresh_db.rename_activity(id_b, "Activity A") - - -def test_rename_activity_empty_name_does_nothing(fresh_db): - """Renaming to empty string does nothing.""" - act_id = fresh_db.add_activity("Original") - fresh_db.rename_activity(act_id, "") - - activities = fresh_db.list_activities() - assert activities[0][1] == "Original" - - -def test_delete_activity(fresh_db): - """Delete an activity.""" - act_id = fresh_db.add_activity("To Delete") - fresh_db.delete_activity(act_id) - - activities = fresh_db.list_activities() - assert len(activities) == 0 - - -def test_delete_activity_with_time_entries_raises(fresh_db): - """Deleting activity with time entries raises IntegrityError.""" - proj_id = fresh_db.add_project("Some Project") - act_id = fresh_db.add_activity("Used Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - with pytest.raises(IntegrityError): - fresh_db.delete_activity(act_id) - - -def test_add_time_log(fresh_db): - """Add a time log entry.""" - proj_id = fresh_db.add_project("Research") - act_id = fresh_db.add_activity("Reading") - - entry_id = fresh_db.add_time_log(_today(), proj_id, act_id, 90, "Paper review") - assert entry_id > 0 - - entries = fresh_db.time_log_for_date(_today()) - assert len(entries) == 1 - entry = entries[0] - assert entry[0] == entry_id - assert entry[1] == _today() - assert entry[2] == proj_id - assert entry[3] == "Research" - assert entry[4] == act_id - assert entry[5] == "Reading" - assert entry[6] == 90 - assert entry[7] == "Paper review" - - -def test_add_time_log_creates_page_if_needed(fresh_db): - """Adding time log creates page row if it doesn't exist.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Verify page doesn't exist - dates = fresh_db.dates_with_content() - assert _today() not in dates - - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - # Page should now exist (even with no text content) - entries = fresh_db.time_log_for_date(_today()) - assert len(entries) == 1 - - -def test_add_time_log_without_note(fresh_db): - """Add time log without note (None).""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - fresh_db.add_time_log(_today(), proj_id, act_id, 30) - entries = fresh_db.time_log_for_date(_today()) - assert entries[0][7] is None - - -def test_update_time_log(fresh_db): - """Update an existing time log entry.""" - proj1_id = fresh_db.add_project("Project 1") - proj2_id = fresh_db.add_project("Project 2") - act1_id = fresh_db.add_activity("Activity 1") - act2_id = fresh_db.add_activity("Activity 2") - - entry_id = fresh_db.add_time_log(_today(), proj1_id, act1_id, 60, "Original") - - fresh_db.update_time_log(entry_id, proj2_id, act2_id, 120, "Updated") - - entries = fresh_db.time_log_for_date(_today()) - assert len(entries) == 1 - entry = entries[0] - assert entry[0] == entry_id - assert entry[2] == proj2_id - assert entry[3] == "Project 2" - assert entry[4] == act2_id - assert entry[5] == "Activity 2" - assert entry[6] == 120 - assert entry[7] == "Updated" - - -def test_delete_time_log(fresh_db): - """Delete a time log entry.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - entry_id = fresh_db.add_time_log(_today(), proj_id, act_id, 60) - fresh_db.delete_time_log(entry_id) - - entries = fresh_db.time_log_for_date(_today()) - assert len(entries) == 0 - - -def test_time_log_for_date_empty(fresh_db): - """Query time log for date with no entries.""" - entries = fresh_db.time_log_for_date(_today()) - assert entries == [] - - -def test_time_log_for_date_multiple_entries(fresh_db): - """Query returns multiple entries sorted by project, activity, id.""" - proj_a = fresh_db.add_project("AAA") - proj_b = fresh_db.add_project("BBB") - act_x = fresh_db.add_activity("XXX") - act_y = fresh_db.add_activity("YYY") - - # Add in non-sorted order - fresh_db.add_time_log(_today(), proj_b, act_y, 10) - fresh_db.add_time_log(_today(), proj_a, act_x, 20) - fresh_db.add_time_log(_today(), proj_a, act_y, 30) - fresh_db.add_time_log(_today(), proj_b, act_x, 40) - - entries = fresh_db.time_log_for_date(_today()) - assert len(entries) == 4 - - # Should be sorted by project name, then activity name - assert entries[0][3] == "AAA" and entries[0][5] == "XXX" - assert entries[1][3] == "AAA" and entries[1][5] == "YYY" - assert entries[2][3] == "BBB" and entries[2][5] == "XXX" - assert entries[3][3] == "BBB" and entries[3][5] == "YYY" - - -def test_time_report_by_day(fresh_db): - """Time report grouped by day.""" - proj_id = fresh_db.add_project("Project") - act1_id = fresh_db.add_activity("Activity 1") - act2_id = fresh_db.add_activity("Activity 2") - - # Add entries for multiple days - fresh_db.add_time_log(_yesterday(), proj_id, act1_id, 60) - fresh_db.add_time_log(_yesterday(), proj_id, act2_id, 30) - fresh_db.add_time_log(_today(), proj_id, act1_id, 90) - fresh_db.add_time_log(_today(), proj_id, act2_id, 45) - - report = fresh_db.time_report(proj_id, _yesterday(), _today(), "day") - - assert len(report) == 4 - # Each row is (period, activity_name, total_minutes) - yesterday_act1 = next( - r for r in report if r[0] == _yesterday() and r[1] == "Activity 1" - ) - assert yesterday_act1[3] == 60 - - today_act1 = next(r for r in report if r[0] == _today() and r[1] == "Activity 1") - assert today_act1[3] == 90 - - -def test_time_report_by_week(fresh_db): - """Time report grouped by week.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entries spanning multiple weeks - date1 = "2024-01-01" # Monday, Week 1 - date2 = "2024-01-03" # Same week - date3 = "2024-01-08" # Following Monday, Week 2 - - fresh_db.add_time_log(date1, proj_id, act_id, 60) - fresh_db.add_time_log(date2, proj_id, act_id, 30) - fresh_db.add_time_log(date3, proj_id, act_id, 45) - - report = fresh_db.time_report(proj_id, date1, date3, "week") - - # Should have 2 rows (2 weeks) - assert len(report) == 2 - - # First week total - assert report[0][3] == 90 # 60 + 30 - # Second week total - assert report[1][3] == 45 - - -def test_time_report_by_month(fresh_db): - """Time report grouped by month.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entries spanning multiple months - date1 = "2024-01-15" - date2 = "2024-01-25" - date3 = "2024-02-10" - - fresh_db.add_time_log(date1, proj_id, act_id, 60) - fresh_db.add_time_log(date2, proj_id, act_id, 30) - fresh_db.add_time_log(date3, proj_id, act_id, 45) - - report = fresh_db.time_report(proj_id, date1, date3, "month") - - # Should have 2 rows (2 months) - assert len(report) == 2 - - # January total - jan_row = next(r for r in report if r[0] == "2024-01") - assert jan_row[3] == 90 # 60 + 30 - - # February total - feb_row = next(r for r in report if r[0] == "2024-02") - assert feb_row[3] == 45 - - -def test_time_report_multiple_activities(fresh_db): - """Time report aggregates by activity within period.""" - proj_id = fresh_db.add_project("Project") - act1_id = fresh_db.add_activity("Activity 1") - act2_id = fresh_db.add_activity("Activity 2") - - fresh_db.add_time_log(_today(), proj_id, act1_id, 60) - fresh_db.add_time_log(_today(), proj_id, act1_id, 30) # Same activity - fresh_db.add_time_log(_today(), proj_id, act2_id, 45) - - report = fresh_db.time_report(proj_id, _today(), _today(), "day") - - assert len(report) == 2 - act1_row = next(r for r in report if r[1] == "Activity 1") - assert act1_row[3] == 90 # 60 + 30 aggregated - - act2_row = next(r for r in report if r[1] == "Activity 2") - assert act2_row[3] == 45 - - -def test_time_report_filters_by_project(fresh_db): - """Time report only includes specified project.""" - proj1_id = fresh_db.add_project("Project 1") - proj2_id = fresh_db.add_project("Project 2") - act_id = fresh_db.add_activity("Activity") - - fresh_db.add_time_log(_today(), proj1_id, act_id, 60) - fresh_db.add_time_log(_today(), proj2_id, act_id, 90) - - report = fresh_db.time_report(proj1_id, _today(), _today(), "day") - - assert len(report) == 1 - assert report[0][3] == 60 - - -def test_time_report_empty(fresh_db): - """Time report with no matching entries.""" - proj_id = fresh_db.add_project("Project") - - report = fresh_db.time_report(proj_id, _today(), _today(), "day") - assert report == [] - - -# ============================================================================ -# TimeLogWidget Tests -# ============================================================================ - - -def test_time_log_widget_toggle(qtbot, fresh_db): - """Toggle expands/collapses the widget.""" - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - # Initially collapsed - assert not widget.body.isVisible() - assert widget.toggle_btn.arrowType() == Qt.RightArrow - - # Toggle to expand - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - assert widget.body.isVisible() - assert widget.toggle_btn.arrowType() == Qt.DownArrow - - # Toggle to collapse - widget.toggle_btn.setChecked(False) - widget._on_toggle(False) - assert not widget.body.isVisible() - assert widget.toggle_btn.arrowType() == Qt.RightArrow - - -def test_time_log_widget_set_current_date_no_entries(qtbot, fresh_db): - """Set current date with no entries.""" - strings.load_strings("en") - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - - widget.set_current_date(_today()) - assert widget._current_date == _today() - - # When collapsed, shows hint - assert "Time log" in widget.summary_label.text() - - -def test_time_log_widget_set_current_date_with_entries(qtbot, fresh_db): - """Set current date with entries shows summary.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) # 1.5 hours - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - - # Expand first - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - widget.set_current_date(_today()) - - # Should show total in title - assert "1.5" in widget.toggle_btn.text() or "1.50" in widget.toggle_btn.text() - - # Body should show breakdown - summary = widget.summary_label.text() - assert "Project" in summary - - -def test_time_log_widget_open_dialog(qtbot, fresh_db, monkeypatch): - """Open dialog button opens TimeLogDialog.""" - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.set_current_date(_today()) - - dialog_shown = {"shown": False} - - def mock_exec(self): - dialog_shown["shown"] = True - return 0 - - monkeypatch.setattr(TimeLogDialog, "exec", mock_exec) - - widget.open_btn.click() - assert dialog_shown["shown"] - - -def test_time_log_widget_no_date_open_dialog_does_nothing(qtbot, fresh_db, monkeypatch): - """Open dialog with no date set does nothing.""" - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - - dialog_shown = {"shown": False} - - def mock_exec(self): - dialog_shown["shown"] = True - return 0 - - monkeypatch.setattr(TimeLogDialog, "exec", mock_exec) - - widget.open_btn.click() - assert not dialog_shown["shown"] - - -def test_time_log_widget_updates_after_dialog_close(qtbot, fresh_db, monkeypatch): - """Widget refreshes summary after dialog closes.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - widget.set_current_date(_today()) - - # Add entry via DB (simulating dialog action) - def mock_exec(self): - fresh_db.add_time_log(_today(), proj_id, act_id, 120) - return 0 - - monkeypatch.setattr(TimeLogDialog, "exec", mock_exec) - - widget.open_btn.click() - - # Summary should be updated - assert "2.0" in widget.toggle_btn.text() or "2.00" in widget.toggle_btn.text() - - -# ============================================================================ -# TimeLogDialog Tests -# ============================================================================ - - -def test_time_log_dialog_creation(qtbot, fresh_db): - """TimeLogDialog can be created.""" - strings.load_strings("en") - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - assert _today() in dialog.windowTitle() - assert dialog.project_combo.count() == 0 - assert dialog.table.rowCount() == 0 - - -def test_time_log_dialog_loads_projects(qtbot, fresh_db): - """Dialog loads existing projects into combo.""" - fresh_db.add_project("Project A") - fresh_db.add_project("Project B") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - assert dialog.project_combo.count() == 2 - - -def test_time_log_dialog_loads_activities_for_autocomplete(qtbot, fresh_db): - """Dialog loads activities for autocomplete.""" - fresh_db.add_activity("Coding") - fresh_db.add_activity("Testing") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - completer = dialog.activity_edit.completer() - assert completer is not None - - -def test_time_log_dialog_loads_existing_entries(qtbot, fresh_db): - """Dialog loads existing time log entries.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - assert dialog.table.rowCount() == 1 - assert "Project" in dialog.table.item(0, 0).text() - assert "Activity" in dialog.table.item(0, 1).text() - assert ( - "1.5" in dialog.table.item(0, 3).text() - or "1.50" in dialog.table.item(0, 3).text() - ) - - -def test_time_log_dialog_add_entry_without_project_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Add entry without selecting project shows warning.""" - strings.load_strings("en") - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.activity_edit.setText("Some Activity") - dialog.hours_spin.setValue(1.0) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._on_add_or_update() - assert warning_shown["shown"] - - -def test_time_log_dialog_add_entry_without_activity_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Add entry without activity shows warning.""" - strings.load_strings("en") - fresh_db.add_project("Project") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.hours_spin.setValue(1.0) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._on_add_or_update() - assert warning_shown["shown"] - - -def test_time_log_dialog_add_entry_success(qtbot, fresh_db): - """Successfully add a new time entry.""" - fresh_db.add_project("Project") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.activity_edit.setText("New Activity") - dialog.hours_spin.setValue(2.5) - - dialog._on_add_or_update() - - assert dialog.table.rowCount() == 1 - assert "New Activity" in dialog.table.item(0, 1).text() - assert ( - "2.5" in dialog.table.item(0, 3).text() - or "2.50" in dialog.table.item(0, 3).text() - ) - - -def test_time_log_dialog_select_row_enables_delete(qtbot, fresh_db): - """Selecting a row enables delete button and populates fields.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - # Initially delete is disabled - assert not dialog.delete_btn.isEnabled() - - # Select first row - dialog.table.selectRow(0) - - # Delete should be enabled - assert dialog.delete_btn.isEnabled() - - # Fields should be populated - assert dialog.activity_edit.text() == "Activity" - assert dialog.hours_spin.value() == 1.5 - - -def test_time_log_dialog_update_entry(qtbot, fresh_db): - """Update an existing entry.""" - proj1_id = fresh_db.add_project("Project 1") - fresh_db.add_project("Project 2") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj1_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - # Select and modify - dialog.table.selectRow(0) - dialog.project_combo.setCurrentIndex(1) # Project 2 - dialog.hours_spin.setValue(2.0) - - dialog._on_add_or_update() - - # Should still have 1 row (updated, not added) - assert dialog.table.rowCount() == 1 - assert "Project 2" in dialog.table.item(0, 0).text() - assert ( - "2.0" in dialog.table.item(0, 3).text() - or "2.00" in dialog.table.item(0, 3).text() - ) - - -def test_time_log_dialog_delete_entry(qtbot, fresh_db): - """Delete a time log entry.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - assert dialog.table.rowCount() == 1 - - dialog.table.selectRow(0) - dialog._on_delete_entry() - - assert dialog.table.rowCount() == 0 - - -def test_time_log_dialog_manage_projects_opens_dialog(qtbot, fresh_db, monkeypatch): - """Manage projects button opens TimeCodeManagerDialog.""" - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - manager_shown = {"shown": False} - - def mock_exec(self): - manager_shown["shown"] = True - return 0 - - monkeypatch.setattr(TimeCodeManagerDialog, "exec", mock_exec) - - dialog.manage_projects_btn.click() - assert manager_shown["shown"] - - -def test_time_log_dialog_manage_activities_opens_dialog(qtbot, fresh_db, monkeypatch): - """Manage activities button opens TimeCodeManagerDialog.""" - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - manager_shown = {"shown": False} - - def mock_exec(self): - manager_shown["shown"] = True - return 0 - - monkeypatch.setattr(TimeCodeManagerDialog, "exec", mock_exec) - - dialog.manage_activities_btn.click() - assert manager_shown["shown"] - - -def test_time_log_dialog_run_report_opens_dialog(qtbot, fresh_db, monkeypatch): - """Run report button opens TimeReportDialog.""" - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - report_shown = {"shown": False} - - def mock_exec(self): - report_shown["shown"] = True - return 0 - - monkeypatch.setattr(TimeReportDialog, "exec", mock_exec) - - dialog.report_btn.click() - assert report_shown["shown"] - - -# ============================================================================ -# TimeCodeManagerDialog Tests -# ============================================================================ - - -def test_time_code_manager_dialog_creation(qtbot, fresh_db): - """TimeCodeManagerDialog can be created.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog.tabs.count() == 2 - assert dialog.tabs.currentIndex() == 0 # Projects tab - - -def test_time_code_manager_dialog_focus_activities_tab(qtbot, fresh_db): - """Can focus on activities tab initially.""" - dialog = TimeCodeManagerDialog(fresh_db, focus_tab="activities") - qtbot.addWidget(dialog) - - assert dialog.tabs.currentIndex() == 1 - - -def test_time_code_manager_dialog_loads_projects(qtbot, fresh_db): - """Dialog loads existing projects.""" - fresh_db.add_project("Project A") - fresh_db.add_project("Project B") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog.project_list.count() == 2 - - -def test_time_code_manager_dialog_loads_activities(qtbot, fresh_db): - """Dialog loads existing activities.""" - fresh_db.add_activity("Activity 1") - fresh_db.add_activity("Activity 2") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog.activity_list.count() == 2 - - -def test_time_code_manager_add_project(qtbot, fresh_db, monkeypatch): - """Add a new project.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - def mock_get_text(parent, title, label, mode, default): - return "New Project", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._add_project() - - assert dialog.project_list.count() == 1 - assert dialog.project_list.item(0).text() == "New Project" - - -def test_time_code_manager_add_project_cancelled(qtbot, fresh_db, monkeypatch): - """Cancel adding project.""" - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - def mock_get_text(parent, title, label, mode, default): - return "", False - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._add_project() - - assert dialog.project_list.count() == 0 - - -def test_time_code_manager_add_project_invalid_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Adding invalid project shows warning.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - def mock_get_text(parent, title, label, mode, default): - return "Valid Name", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - # Force add_project to raise ValueError - original_add = fresh_db.add_project - - def bad_add(name): - raise ValueError("empty project name") - - fresh_db.add_project = bad_add - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._add_project() - assert warning_shown["shown"] - - fresh_db.add_project = original_add - - -def test_time_code_manager_rename_project(qtbot, fresh_db, monkeypatch): - """Rename an existing project.""" - strings.load_strings("en") - fresh_db.add_project("Old Name") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "New Name", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._rename_project() - - assert dialog.project_list.item(0).text() == "New Name" - - -def test_time_code_manager_rename_project_no_selection_shows_info( - qtbot, fresh_db, monkeypatch -): - """Rename without selection shows info message.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - info_shown = {"shown": False} - - def mock_info(*args): - info_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "information", mock_info) - - dialog._rename_project() - assert info_shown["shown"] - - -def test_time_code_manager_rename_project_to_duplicate_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Renaming to duplicate name shows warning.""" - strings.load_strings("en") - fresh_db.add_project("Project A") - fresh_db.add_project("Project B") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(1) - - def mock_get_text(parent, title, label, mode, default): - return "Project A", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._rename_project() - assert warning_shown["shown"] - - -def test_time_code_manager_delete_project(qtbot, fresh_db, monkeypatch): - """Delete a project.""" - strings.load_strings("en") - fresh_db.add_project("To Delete") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(0) - - def mock_question(*args, **kwargs): - return QMessageBox.StandardButton.Yes - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - dialog._delete_project() - - assert dialog.project_list.count() == 0 - - -def test_time_code_manager_delete_project_cancelled(qtbot, fresh_db, monkeypatch): - """Cancel delete project.""" - strings.load_strings("en") - fresh_db.add_project("Keep Me") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(0) - - def mock_question(*args, **kwargs): - return QMessageBox.StandardButton.No - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - dialog._delete_project() - - assert dialog.project_list.count() == 1 - - -def test_time_code_manager_delete_project_with_entries_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Deleting project with entries shows warning.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Used Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(0) - - def mock_question(*args, **kwargs): - return QMessageBox.StandardButton.Yes - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._delete_project() - assert warning_shown["shown"] - assert dialog.project_list.count() == 1 # Not deleted - - -def test_time_code_manager_add_activity(qtbot, fresh_db, monkeypatch): - """Add a new activity.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - def mock_get_text(parent, title, label, mode, default): - return "New Activity", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._add_activity() - - assert dialog.activity_list.count() == 1 - assert dialog.activity_list.item(0).text() == "New Activity" - - -def test_time_code_manager_rename_activity(qtbot, fresh_db, monkeypatch): - """Rename an existing activity.""" - strings.load_strings("en") - fresh_db.add_activity("Old Activity") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.activity_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "New Activity", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._rename_activity() - - assert dialog.activity_list.item(0).text() == "New Activity" - - -def test_time_code_manager_delete_activity(qtbot, fresh_db, monkeypatch): - """Delete an activity.""" - strings.load_strings("en") - fresh_db.add_activity("To Delete") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.activity_list.setCurrentRow(0) - - def mock_question(*args, **kwargs): - return QMessageBox.StandardButton.Yes - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - dialog._delete_activity() - - assert dialog.activity_list.count() == 0 - - -def test_time_code_manager_delete_activity_with_entries_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Deleting activity with entries shows warning.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Used Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.activity_list.setCurrentRow(0) - - def mock_question(*args, **kwargs): - return QMessageBox.StandardButton.Yes - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._delete_activity() - assert warning_shown["shown"] - assert dialog.activity_list.count() == 1 # Not deleted - - -# ============================================================================ -# TimeReportDialog Tests -# ============================================================================ - - -def test_time_report_dialog_creation(qtbot, fresh_db): - """TimeReportDialog can be created.""" - strings.load_strings("en") - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog.project_combo.count() == 1 - assert dialog.granularity.count() == 5 - - -def test_time_report_dialog_loads_projects(qtbot, fresh_db): - """Dialog loads projects.""" - fresh_db.add_project("Project A") - fresh_db.add_project("Project B") - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - assert dialog.project_combo.count() == 3 - - -def test_time_report_dialog_default_date_range(qtbot, fresh_db): - """Dialog defaults to start of month.""" - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - today = QDate.currentDate() - start_of_month = QDate(today.year(), today.month(), 1) - - assert dialog.from_date.date() == start_of_month - assert dialog.to_date.date() == today - - -def test_time_report_dialog_run_report(qtbot, fresh_db): - """Run a time report.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - idx_day = dialog.granularity.findData("day") - assert idx_day != -1 - dialog.granularity.setCurrentIndex(idx_day) - - dialog._run_report() - - assert dialog.table.rowCount() == 1 - assert "Activity" in dialog.table.item(0, 2).text() - assert "1.5" in dialog.total_label.text() or "1.50" in dialog.total_label.text() - - -def test_time_report_dialog_run_report_no_project_selected(qtbot, fresh_db): - """Run report with no project selected does nothing.""" - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog._run_report() - - # Should not crash, table remains empty - assert dialog.table.rowCount() == 0 - - -def test_time_report_dialog_export_csv_no_report_shows_info( - qtbot, fresh_db, monkeypatch -): - """Export CSV without running report shows info.""" - strings.load_strings("en") - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - info_shown = {"shown": False} - - def mock_info(*args): - info_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "information", mock_info) - - dialog._export_csv() - assert info_shown["shown"] - - -def test_time_report_dialog_export_csv_success(qtbot, fresh_db, tmp_path, monkeypatch): - """Export report to CSV.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 120) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - csv_file = str(tmp_path / "report.csv") - - def mock_get_save_filename(*args, **kwargs): - return csv_file, "CSV Files (*.csv)" - - monkeypatch.setattr(QFileDialog, "getSaveFileName", mock_get_save_filename) - - dialog._export_csv() - - import os - - assert os.path.exists(csv_file) - - with open(csv_file, "r") as f: - content = f.read() - assert "Activity" in content - assert "2.00" in content - - -def test_time_report_dialog_export_csv_cancelled(qtbot, fresh_db, monkeypatch): - """Cancel CSV export.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog._run_report() - - def mock_get_save_filename(*args, **kwargs): - return "", "" - - monkeypatch.setattr(QFileDialog, "getSaveFileName", mock_get_save_filename) - - # Should not crash - dialog._export_csv() - - -def test_time_report_dialog_export_pdf_no_report_shows_info( - qtbot, fresh_db, monkeypatch -): - """Export PDF without running report shows info.""" - strings.load_strings("en") - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - info_shown = {"shown": False} - - def mock_info(*args): - info_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "information", mock_info) - - dialog._export_pdf() - assert info_shown["shown"] - - -def test_time_report_dialog_export_pdf_success(qtbot, fresh_db, tmp_path, monkeypatch): - """Export report to PDF.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Test Project") - act_id = fresh_db.add_activity("Testing") - fresh_db.add_time_log(_today(), proj_id, act_id, 150) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - pdf_file = str(tmp_path / "report.pdf") - - def mock_get_save_filename(*args, **kwargs): - return pdf_file, "PDF Files (*.pdf)" - - monkeypatch.setattr(QFileDialog, "getSaveFileName", mock_get_save_filename) - - dialog._export_pdf() - - import os - - assert os.path.exists(pdf_file) - # PDF should have content - assert os.path.getsize(pdf_file) > 0 - - -def test_time_report_dialog_export_pdf_cancelled(qtbot, fresh_db, monkeypatch): - """Cancel PDF export.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog._run_report() - - def mock_get_save_filename(*args, **kwargs): - return "", "" - - monkeypatch.setattr(QFileDialog, "getSaveFileName", mock_get_save_filename) - - # Should not crash - dialog._export_pdf() - - -def test_time_report_dialog_granularity_week(qtbot, fresh_db): - """Report with week granularity.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entries on different days of the same week - date1 = "2024-01-01" - date2 = "2024-01-03" - fresh_db.add_time_log(date1, proj_id, act_id, 60) - fresh_db.add_time_log(date2, proj_id, act_id, 90) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(date1, "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(date2, "yyyy-MM-dd")) - - idx_week = dialog.granularity.findData("week") - assert idx_week != -1 - dialog.granularity.setCurrentIndex(idx_week) - - dialog._run_report() - - # Should aggregate to single week - assert dialog.table.rowCount() == 1 - # In grouped modes the Note column is hidden → hours are in column 3 - hours_text = dialog.table.item(0, 3).text() - - assert "2.5" in hours_text or "2.50" in hours_text - - -def test_time_report_dialog_granularity_month(qtbot, fresh_db): - """Report with month granularity.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entries on different days of the same month - date1 = "2024-01-05" - date2 = "2024-01-25" - fresh_db.add_time_log(date1, proj_id, act_id, 60) - fresh_db.add_time_log(date2, proj_id, act_id, 90) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(date1, "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(date2, "yyyy-MM-dd")) - - idx_month = dialog.granularity.findData("month") - assert idx_month != -1 - dialog.granularity.setCurrentIndex(idx_month) - - dialog._run_report() - - # Should aggregate to single month - assert dialog.table.rowCount() == 1 - hours_text = dialog.table.item(0, 3).text() - - assert "2.5" in hours_text or "2.50" in hours_text - - -def test_time_report_dialog_multiple_activities_same_period(qtbot, fresh_db): - """Report shows multiple activities separately.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act1_id = fresh_db.add_activity("Activity 1") - act2_id = fresh_db.add_activity("Activity 2") - - fresh_db.add_time_log(_today(), proj_id, act1_id, 60) - fresh_db.add_time_log(_today(), proj_id, act2_id, 90) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - assert dialog.table.rowCount() == 2 - - -def test_time_log_widget_calculates_per_project_totals(qtbot, fresh_db): - """Widget shows per-project breakdown in summary.""" - strings.load_strings("en") - proj1_id = fresh_db.add_project("Project A") - proj2_id = fresh_db.add_project("Project B") - act_id = fresh_db.add_activity("Activity") - - fresh_db.add_time_log(_today(), proj1_id, act_id, 60) - fresh_db.add_time_log(_today(), proj2_id, act_id, 90) - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - widget.set_current_date(_today()) - - summary = widget.summary_label.text() - assert "Project A" in summary - assert "Project B" in summary - assert "1.00h" in summary - assert "1.50h" in summary - - -# ============================================================================ -# Additional TimeLogWidget Edge Cases -# ============================================================================ - - -def test_time_log_widget_collapsed_shows_hint_after_date_set(qtbot, fresh_db): - """When collapsed, setting date shows hint instead of full summary.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - - # Keep collapsed - assert not widget.toggle_btn.isChecked() - - widget.set_current_date(_today()) - - # Should show hint, not full breakdown - assert ( - "hint" in widget.summary_label.text().lower() - or "time log" in widget.summary_label.text().lower() - ) - - -def test_time_log_widget_no_date_shows_no_date_message(qtbot, fresh_db): - """Widget with no date set shows appropriate message.""" - strings.load_strings("en") - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - - # Expand to see summary - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Don't set a date - widget._reload_summary() - - # Should indicate no date is set - summary = widget.summary_label.text() - assert "no date" in summary.lower() or "time log" in summary.lower() - - -def test_time_log_widget_header_updates_on_toggle(qtbot, fresh_db): - """Header total is visible even when collapsed.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 120) # 2 hours - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.set_current_date(_today()) - - # Expand to trigger reload - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - - # Header should show total - assert "2" in widget.toggle_btn.text() - - # Collapse again - widget.toggle_btn.setChecked(False) - widget._on_toggle(False) - - # Header total should still be visible - assert "2" in widget.toggle_btn.text() - - -def test_time_log_widget_dialog_updates_on_close_when_collapsed( - qtbot, fresh_db, monkeypatch -): - """When dialog closes, widget updates summary even if collapsed.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.set_current_date(_today()) - - # Keep collapsed - assert not widget.toggle_btn.isChecked() - - def mock_exec(self): - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - return 0 - - monkeypatch.setattr(TimeLogDialog, "exec", mock_exec) - - widget.open_btn.click() - - # Should show hint after update when collapsed - assert ( - "hint" in widget.summary_label.text().lower() - or "time log" in widget.summary_label.text().lower() - ) - - -# ============================================================================ -# Additional TimeLogDialog Edge Cases -# ============================================================================ - - -def test_time_log_dialog_deselect_clears_current_entry(qtbot, fresh_db): - """Deselecting row clears current entry and disables delete.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - # Select - dialog.table.selectRow(0) - assert dialog.delete_btn.isEnabled() - - # Clear selection - dialog.table.clearSelection() - - # Trigger selection changed - dialog._on_row_selected() - - assert not dialog.delete_btn.isEnabled() - assert dialog._current_entry_id is None - - -def test_time_log_dialog_delete_without_selection_does_nothing(qtbot, fresh_db): - """Delete button when no entry selected does nothing.""" - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - # No selection - dialog._current_entry_id = None - - # Should not crash - dialog._on_delete_entry() - - -def test_time_log_dialog_creates_activity_if_new(qtbot, fresh_db): - """Dialog creates activity if it doesn't exist.""" - fresh_db.add_project("Project") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.activity_edit.setText("Brand New Activity") - dialog.hours_spin.setValue(1.0) - - dialog._on_add_or_update() - - # Activity should have been created - activities = fresh_db.list_activities() - assert len(activities) == 1 - assert activities[0][1] == "Brand New Activity" - - -def test_time_log_dialog_rounds_hours_to_minutes(qtbot, fresh_db): - """Hours are correctly converted to integer minutes.""" - fresh_db.add_project("Project") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.activity_edit.setText("Activity") - dialog.hours_spin.setValue(1.75) # 1 hour 45 minutes = 105 minutes - - dialog._on_add_or_update() - - entries = fresh_db.time_log_for_date(_today()) - assert entries[0][6] == 105 # minutes - - -def test_time_log_dialog_update_button_text_changes(qtbot, fresh_db): - """Button text changes between Add and Update.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - # Initially "Add" - assert "add" in dialog.add_update_btn.text().lower() - - # Select entry - dialog.table.selectRow(0) - - # Should change to "Update" - assert "update" in dialog.add_update_btn.text().lower() - - # Deselect - dialog.table.clearSelection() - dialog._on_row_selected() - - # Back to "Add" - assert "add" in dialog.add_update_btn.text().lower() - - -def test_time_log_dialog_project_selection_by_name(qtbot, fresh_db): - """Selecting entry sets project combo by name match.""" - fresh_db.add_project("Project A") - proj2_id = fresh_db.add_project("Project B") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj2_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.table.selectRow(0) - - # Should select Project B - assert dialog.project_combo.currentText() == "Project B" - - -def test_time_log_dialog_project_not_found_in_combo(qtbot, fresh_db): - """If project name not found in combo, selection doesn't crash.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - entry_id = fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - # Delete the project from DB manually (shouldn't happen, but defensive) - fresh_db.delete_time_log(entry_id) - fresh_db.delete_project(proj_id) - - # Re-add entry with orphaned project reference (simulated edge case) - # Actually can't easily simulate this due to FK constraints - # So just test normal case - combo should work fine - proj_id = fresh_db.add_project("Project") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - dialog.table.selectRow(0) - # Should not crash - - -# ============================================================================ -# Additional TimeCodeManagerDialog Edge Cases -# ============================================================================ - - -def test_time_code_manager_rename_cancelled_does_nothing(qtbot, fresh_db, monkeypatch): - """Cancelling rename does nothing.""" - strings.load_strings("en") - fresh_db.add_project("Original") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "", False - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._rename_project() - - # Name should remain unchanged - assert dialog.project_list.item(0).text() == "Original" - - -def test_time_code_manager_rename_to_same_name_does_nothing( - qtbot, fresh_db, monkeypatch -): - """Renaming to same name does nothing.""" - strings.load_strings("en") - fresh_db.add_project("Same Name") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "Same Name", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._rename_project() - - # Should still have one project - assert dialog.project_list.count() == 1 - - -def test_time_code_manager_delete_no_selection_shows_info(qtbot, fresh_db, monkeypatch): - """Delete without selection shows info.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - info_shown = {"shown": False} - - def mock_info(*args): - info_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "information", mock_info) - - dialog._delete_project() - assert info_shown["shown"] - - -def test_time_code_manager_add_empty_activity_cancelled(qtbot, fresh_db, monkeypatch): - """Adding empty activity name is cancelled.""" - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - def mock_get_text(parent, title, label, mode, default): - return "", True # Empty but OK clicked - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._add_activity() - - # No activity should be added - assert dialog.activity_list.count() == 0 - - -def test_time_code_manager_rename_activity_no_selection(qtbot, fresh_db, monkeypatch): - """Rename activity without selection shows info.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - info_shown = {"shown": False} - - def mock_info(*args): - info_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "information", mock_info) - - dialog._rename_activity() - assert info_shown["shown"] - - -def test_time_code_manager_delete_activity_no_selection(qtbot, fresh_db, monkeypatch): - """Delete activity without selection shows info.""" - strings.load_strings("en") - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - info_shown = {"shown": False} - - def mock_info(*args): - info_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "information", mock_info) - - dialog._delete_activity() - assert info_shown["shown"] - - -def test_time_code_manager_delete_activity_cancelled(qtbot, fresh_db, monkeypatch): - """Cancelling delete activity keeps it.""" - strings.load_strings("en") - fresh_db.add_activity("Keep Me") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.activity_list.setCurrentRow(0) - - def mock_question(*args, **kwargs): - return QMessageBox.StandardButton.No - - monkeypatch.setattr(QMessageBox, "question", mock_question) - - dialog._delete_activity() - - assert dialog.activity_list.count() == 1 - - -# ============================================================================ -# Additional TimeReportDialog Edge Cases -# ============================================================================ - - -def test_time_report_dialog_empty_report_shows_zero(qtbot, fresh_db): - """Running report with no data shows zero total.""" - strings.load_strings("en") - fresh_db.add_project("Project") - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog._run_report() - - assert dialog.table.rowCount() == 0 - assert "0" in dialog.total_label.text() - - -def test_time_report_dialog_date_range_filters_correctly(qtbot, fresh_db): - """Report only includes entries within date range.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entries on different dates - date1 = "2024-01-01" - date2 = "2024-01-15" - date3 = "2024-01-30" - - fresh_db.add_time_log(date1, proj_id, act_id, 60) - fresh_db.add_time_log(date2, proj_id, act_id, 60) - fresh_db.add_time_log(date3, proj_id, act_id, 60) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - # Set range to only include middle date - dialog.from_date.setDate(QDate.fromString(date2, "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(date2, "yyyy-MM-dd")) - - dialog._run_report() - - # Should only have one entry - assert dialog.table.rowCount() == 1 - - -def test_time_report_dialog_stores_report_state(qtbot, fresh_db): - """Dialog stores last report state for export.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("My Project") - act_id = fresh_db.add_activity("My Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(1) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - idx_week = dialog.granularity.findData("week") - assert idx_week != -1 - dialog.granularity.setCurrentIndex(idx_week) - - dialog._run_report() - - # Check stored state - assert dialog._last_project_name == "My Project" - assert dialog._last_start == _today() - assert dialog._last_end == _today() - assert "week" in dialog._last_gran_label.lower() - assert len(dialog._last_rows) == 1 - assert dialog._last_total_minutes == 90 - - -def test_time_report_dialog_pdf_export_with_multiple_periods( - qtbot, fresh_db, tmp_path, monkeypatch -): - """PDF export handles multiple time periods with chart.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entries on multiple days - date1 = "2024-01-01" - date2 = "2024-01-02" - date3 = "2024-01-03" - - fresh_db.add_time_log(date1, proj_id, act_id, 60) - fresh_db.add_time_log(date2, proj_id, act_id, 90) - fresh_db.add_time_log(date3, proj_id, act_id, 45) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(date1, "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(date3, "yyyy-MM-dd")) - - idx_day = dialog.granularity.findData("day") - assert idx_day != -1 - dialog.granularity.setCurrentIndex(idx_day) - - dialog._run_report() - - pdf_file = str(tmp_path / "chart_test.pdf") - - def mock_get_save_filename(*args, **kwargs): - return pdf_file, "PDF Files (*.pdf)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - dialog._export_pdf() - - import os - - assert os.path.exists(pdf_file) - assert os.path.getsize(pdf_file) > 0 - - -def test_time_report_dialog_pdf_export_with_zero_hours( - qtbot, fresh_db, tmp_path, monkeypatch -): - """PDF export handles entries with zero hours gracefully.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entry with 0 minutes (edge case) - fresh_db.add_time_log(_today(), proj_id, act_id, 0) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - pdf_file = str(tmp_path / "zero_hours.pdf") - - def mock_get_save_filename(*args, **kwargs): - return pdf_file, "PDF Files (*.pdf)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - # Should not crash - dialog._export_pdf() - - -def test_time_report_dialog_csv_includes_total_row( - qtbot, fresh_db, tmp_path, monkeypatch -): - """CSV export includes total row at bottom.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 90) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - csv_file = str(tmp_path / "total_test.csv") - - def mock_get_save_filename(*args, **kwargs): - return csv_file, "CSV Files (*.csv)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - dialog._export_csv() - - with open(csv_file, "r") as f: - lines = f.readlines() - # Should have header, data row, blank, total row - assert len(lines) >= 4 - # Last line should contain total - assert "Total" in lines[-1] or "total" in lines[-1] - - -def test_time_report_dialog_pdf_chart_with_single_period( - qtbot, fresh_db, tmp_path, monkeypatch -): - """PDF chart renders correctly with single period.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 120) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - dialog.project_combo.setCurrentIndex(0) - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - pdf_file = str(tmp_path / "single_period.pdf") - - def mock_get_save_filename(*args, **kwargs): - return pdf_file, "PDF Files (*.pdf)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - dialog._export_pdf() - - import os - - assert os.path.exists(pdf_file) - - -# ============================================================================ -# Integration Tests -# ============================================================================ - - -def test_full_workflow_add_project_activity_log_report( - qtbot, fresh_db, tmp_path, monkeypatch -): - """Test full workflow: create project, activity, log time, run report.""" - strings.load_strings("en") - - # 1. Create project via dialog - manager = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(manager) - - def mock_get_text_project(parent, title, label, mode, default): - return "Test Project", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text_project) - manager._add_project() - - # 2. Create activity via dialog - def mock_get_text_activity(parent, title, label, mode, default): - return "Test Activity", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text_activity) - manager._add_activity() - - manager.accept() - - # 3. Log time via dialog - log_dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(log_dialog) - - log_dialog.project_combo.setCurrentIndex(0) - log_dialog.activity_edit.setText("Test Activity") - log_dialog.hours_spin.setValue(2.5) - - log_dialog._on_add_or_update() - log_dialog.accept() - - # 4. Run report - report_dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(report_dialog) - - report_dialog.project_combo.setCurrentIndex(0) - report_dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - report_dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - report_dialog._run_report() - - # Verify report - assert report_dialog.table.rowCount() == 1 - assert "Test Activity" in report_dialog.table.item(0, 2).text() - assert ( - "2.5" in report_dialog.table.item(0, 4).text() - or "2.50" in report_dialog.table.item(0, 4).text() - ) - - # 5. Export CSV - csv_file = str(tmp_path / "workflow_test.csv") - - def mock_get_save_filename(*args, **kwargs): - return csv_file, "CSV Files (*.csv)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - report_dialog._export_csv() - - import os - - assert os.path.exists(csv_file) - - -def test_time_log_widget_with_multiple_projects_same_day(qtbot, fresh_db): - """Widget correctly aggregates multiple projects on same day.""" - strings.load_strings("en") - proj1_id = fresh_db.add_project("Alpha") - proj2_id = fresh_db.add_project("Beta") - proj3_id = fresh_db.add_project("Gamma") - act_id = fresh_db.add_activity("Work") - - fresh_db.add_time_log(_today(), proj1_id, act_id, 30) - fresh_db.add_time_log(_today(), proj2_id, act_id, 45) - fresh_db.add_time_log(_today(), proj3_id, act_id, 60) - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.toggle_btn.setChecked(True) - widget._on_toggle(True) - widget.set_current_date(_today()) - - # Total should be 2.25 hours - title = widget.toggle_btn.text() - assert "2.25" in title or "2.2" in title - - # Summary should list all three projects - summary = widget.summary_label.text() - assert "Alpha" in summary - assert "Beta" in summary - assert "Gamma" in summary - - -def test_time_log_dialog_preserves_entry_id_through_update(qtbot, fresh_db): - """Updating entry preserves entry ID.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - - # Select and update - dialog.table.selectRow(0) - original_id = dialog._current_entry_id - - dialog.hours_spin.setValue(2.0) - dialog._on_add_or_update() - - # Should still have same number of entries - entries = fresh_db.time_log_for_date(_today()) - assert len(entries) == 1 - assert entries[0][0] == original_id - - -def test_db_time_log_sorting_by_project_activity_id(fresh_db): - """time_log_for_date returns entries sorted correctly.""" - # Create in specific order to test sorting - proj_z = fresh_db.add_project("ZZZ") - proj_a = fresh_db.add_project("AAA") - act_y = fresh_db.add_activity("YYY") - act_x = fresh_db.add_activity("XXX") - - # Add in reverse alphabetical order - fresh_db.add_time_log(_today(), proj_z, act_y, 10) - fresh_db.add_time_log(_today(), proj_z, act_x, 20) - fresh_db.add_time_log(_today(), proj_a, act_y, 30) - fresh_db.add_time_log(_today(), proj_a, act_x, 40) - - entries = fresh_db.time_log_for_date(_today()) - - # Should be sorted: AAA/XXX, AAA/YYY, ZZZ/XXX, ZZZ/YYY - assert entries[0][3] == "AAA" and entries[0][5] == "XXX" - assert entries[1][3] == "AAA" and entries[1][5] == "YYY" - assert entries[2][3] == "ZZZ" and entries[2][5] == "XXX" - assert entries[3][3] == "ZZZ" and entries[3][5] == "YYY" - - -def test_time_code_manager_add_activity_invalid_shows_warning( - qtbot, fresh_db, monkeypatch -): - """Test adding invalid activity shows warning.""" - strings.load_strings("en") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - def mock_get_text(parent, title, label, mode, default): - return "Valid Name", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - # Force add_activity to raise ValueError - original_add = fresh_db.add_activity - - def bad_add(name): - raise ValueError("empty activity name") - - fresh_db.add_activity = bad_add - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._add_activity() - - assert warning_shown["shown"] - - fresh_db.add_activity = original_add - - -def test_time_code_manager_rename_activity_to_duplicate(qtbot, fresh_db, monkeypatch): - """Test renaming activity to existing name shows warning.""" - strings.load_strings("en") - - fresh_db.add_activity("Activity1") - fresh_db.add_activity("Activity2") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - dialog.activity_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "Activity2", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._rename_activity() - - assert warning_shown["shown"] - - -def test_time_code_manager_rename_activity_cancelled(qtbot, fresh_db, monkeypatch): - """Test cancelling activity rename.""" - strings.load_strings("en") - - fresh_db.add_activity("Original") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - dialog.activity_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "", False - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._rename_activity() - - # Should remain unchanged - assert dialog.activity_list.item(0).text() == "Original" - - -def test_time_code_manager_rename_activity_same_name(qtbot, fresh_db, monkeypatch): - """Test renaming activity to same name does nothing.""" - strings.load_strings("en") - - fresh_db.add_activity("SameName") - - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - dialog.activity_list.setCurrentRow(0) - - def mock_get_text(parent, title, label, mode, default): - return "SameName", True - - monkeypatch.setattr(QInputDialog, "getText", mock_get_text) - - dialog._rename_activity() - - # Should still have one activity - assert dialog.activity_list.count() == 1 - - -def test_time_report_dialog_pdf_export_error_handling( - qtbot, fresh_db, tmp_path, monkeypatch -): - """Test PDF export handles exceptions gracefully.""" - strings.load_strings("en") - - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - fresh_db.add_time_log(_today(), proj_id, act_id, 60) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - dialog.project_combo.setCurrentIndex(0) - from PySide6.QtCore import QDate - - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - pdf_file = str(tmp_path / "test.pdf") - - def mock_get_save_filename(*args, **kwargs): - return pdf_file, "PDF Files (*.pdf)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - # Mock QTextDocument.print_ to raise exception - from PySide6.QtGui import QTextDocument - - original_print = QTextDocument.print_ - - def bad_print(self, printer): - raise Exception("Print error") - - monkeypatch.setattr(QTextDocument, "print_", bad_print) - - warning_shown = {"shown": False} - - def mock_warning(*args): - warning_shown["shown"] = True - - monkeypatch.setattr(QMessageBox, "warning", mock_warning) - - dialog._export_pdf() - - # Should show warning - assert warning_shown["shown"] - - monkeypatch.setattr(QTextDocument, "print_", original_print) - - -def test_time_log_dialog_hours_conversion_edge_cases(qtbot, fresh_db): - """Test edge cases in hours to minutes conversion.""" - strings.load_strings("en") - - fresh_db.add_project("Project") - - dialog = TimeLogDialog(fresh_db, _today()) - qtbot.addWidget(dialog) - dialog.show() - - dialog.project_combo.setCurrentIndex(0) - dialog.activity_edit.setText("Activity") - - # Test 0 hours - dialog.hours_spin.setValue(0.0) - dialog._on_add_or_update() - - entries = fresh_db.time_log_for_date(_today()) - assert entries[-1][6] == 0 - - # Test fractional hours that round - dialog.hours_spin.setValue(0.333) # ~20 minutes - dialog._on_add_or_update() - - entries = fresh_db.time_log_for_date(_today()) - # Should round to nearest minute - assert 19 <= entries[-1][6] <= 21 - - -def test_time_report_dialog_pdf_with_no_activity_data( - qtbot, fresh_db, tmp_path, monkeypatch -): - """Test PDF export with report that has no data in bars (0 minutes).""" - strings.load_strings("en") - - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entry with 0 minutes - fresh_db.add_time_log(_today(), proj_id, act_id, 0) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - dialog.project_combo.setCurrentIndex(0) - from PySide6.QtCore import QDate - - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - dialog._run_report() - - pdf_file = str(tmp_path / "zero_data.pdf") - - def mock_get_save_filename(*args, **kwargs): - return pdf_file, "PDF Files (*.pdf)" - - monkeypatch.setattr( - "PySide6.QtWidgets.QFileDialog.getSaveFileName", mock_get_save_filename - ) - - # Should handle zero data without crashing - dialog._export_pdf() - - import os - - assert os.path.exists(pdf_file) - - -def test_time_report_dialog_very_large_hours(qtbot, fresh_db): - """Test handling very large hour values.""" - strings.load_strings("en") - - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - - # Add entry with many hours - large_minutes = 10000 # ~166 hours - fresh_db.add_time_log(_today(), proj_id, act_id, large_minutes) - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - dialog.show() - - dialog.project_combo.setCurrentIndex(0) - from PySide6.QtCore import QDate - - dialog.from_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(_today(), "yyyy-MM-dd")) - - # Should handle large values - dialog._run_report() - - # Check total label - assert "166" in dialog.total_label.text() or "167" in dialog.total_label.text() - - -def test_time_log_widget_creation(qtbot, fresh_db): - """TimeLogWidget can be created.""" - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - assert widget is not None - assert not widget.toggle_btn.isChecked() - assert not widget.body.isVisible() - - -def test_time_log_set_current_date(qtbot, fresh_db): - """Test setting the current date on the time log widget.""" - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - - today = date.today().isoformat() - widget.set_current_date(today) - - # Verify the current date was set - assert widget._current_date == today - - -def test_time_log_with_entry(qtbot, fresh_db): - """Test time log widget with a time entry.""" - # Add a project - proj_id = fresh_db.add_project("Test Project") - # Add activity - act_id = fresh_db.add_activity("Test Activity") - - # Add a time log entry - today = date.today().isoformat() - fresh_db.add_time_log( - date_iso=today, - project_id=proj_id, - activity_id=act_id, - minutes=150, - note="Test note", - ) - - widget = TimeLogWidget(fresh_db) - qtbot.addWidget(widget) - widget.show() - - # Set the date to today - widget.set_current_date(today) - - # Widget should have been created successfully - assert widget is not None - - -def test_time_log_widget_open_dialog_log_only_when_no_date(qtbot, app, fresh_db): - """Test _open_dialog_log_only when _current_date is None.""" - widget = TimeLogWidget(fresh_db, themes=None) - qtbot.addWidget(widget) - - # Set current date to None - widget._current_date = None - - # Click should return early without crashing - widget._open_dialog_log_only() - - # No dialog should be shown - - -def test_time_log_widget_open_dialog_log_only_opens_dialog(qtbot, app, fresh_db): - """Test _open_dialog_log_only opens TimeLogDialog.""" - widget = TimeLogWidget(fresh_db, themes=None) - qtbot.addWidget(widget) - - # Set a valid date - widget._current_date = "2024-01-15" - - # Mock TimeLogDialog - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - - with patch("bouquin.time_log.TimeLogDialog", return_value=mock_dialog): - widget._open_dialog_log_only() - - # Dialog should have been created with correct parameters - assert mock_dialog.exec.called - - -def test_time_log_widget_open_dialog_log_only_refreshes_when_collapsed( - qtbot, app, fresh_db -): - """Test that opening dialog updates summary when widget is collapsed.""" - widget = TimeLogWidget(fresh_db, themes=None) - qtbot.addWidget(widget) - widget._current_date = "2024-01-15" - - # Collapse the widget - widget.toggle_btn.setChecked(False) - - # Mock TimeLogDialog - mock_dialog = MagicMock() - mock_dialog.exec.return_value = QDialog.Accepted - - with patch("bouquin.time_log.TimeLogDialog", return_value=mock_dialog): - widget._open_dialog_log_only() - - # Should show collapsed hint - assert ( - "collapsed" in widget.summary_label.text().lower() - or widget.summary_label.text() != "" - ) - - -def test_time_log_dialog_log_entry_only_mode(qtbot, app, fresh_db): - """Test TimeLogDialog in log_entry_only mode.""" - dialog = TimeLogDialog( - fresh_db, "2024-01-15", log_entry_only=True, themes=None, close_after_add=True - ) - qtbot.addWidget(dialog) - - # In log_entry_only mode, these should be hidden - assert not dialog.delete_btn.isVisible() - assert not dialog.report_btn.isVisible() - assert not dialog.table.isVisible() - - -def test_time_log_dialog_log_entry_only_false(qtbot, app, fresh_db): - """Test TimeLogDialog in normal mode (log_entry_only=False).""" - dialog = TimeLogDialog( - fresh_db, "2024-01-15", log_entry_only=False, themes=None, close_after_add=False - ) - qtbot.addWidget(dialog) - dialog.show() - qtbot.waitExposed(dialog) - - # In normal mode, these should be visible - assert dialog.delete_btn.isVisible() - assert dialog.report_btn.isVisible() - assert dialog.table.isVisible() - - -def test_time_log_dialog_change_date_cancelled(qtbot, app, fresh_db): - """Test _on_change_date_clicked when user cancels.""" - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Mock exec to return rejected - with patch.object(QDialog, "exec", return_value=QDialog.DialogCode.Rejected): - original_date = dialog._date_iso - dialog._on_change_date_clicked() - - # Date should not change when cancelled - assert dialog._date_iso == original_date - - -def test_time_log_dialog_change_date_accepted(qtbot, app, fresh_db): - """Test _on_change_date_clicked when user accepts (covers lines 410-450).""" - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Mock exec to return accepted - the dialog will use whatever date is in the calendar - with patch.object(QDialog, "exec", return_value=QDialog.DialogCode.Accepted): - # Just verify it doesn't crash - actual date may or may not change - # depending on what the real QCalendarWidget selects - dialog._on_change_date_clicked() - - # Dialog should still be functional - assert dialog._date_iso is not None - - -def test_time_log_dialog_change_date_with_invalid_current_date(qtbot, app, fresh_db): - """Test _on_change_date_clicked when current date is invalid (covers lines 410-412).""" - dialog = TimeLogDialog(fresh_db, "invalid-date", themes=None) - qtbot.addWidget(dialog) - - # Should fall back to current date without crashing - with patch.object(QDialog, "exec", return_value=QDialog.DialogCode.Rejected): - dialog._on_change_date_clicked() - - -def test_time_log_dialog_change_date_with_themes(qtbot, app, fresh_db): - """Test _on_change_date_clicked with theme manager (covers line 423-424).""" - themes_mock = MagicMock() - themes_mock.register_calendar = MagicMock() - - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=themes_mock) - qtbot.addWidget(dialog) - - # Mock exec to return rejected - with patch.object(QDialog, "exec", return_value=QDialog.DialogCode.Rejected): - dialog._on_change_date_clicked() - - # Theme should have been applied to calendar - assert themes_mock.register_calendar.called - - -def test_time_log_dialog_table_item_changed_incomplete_row(qtbot, app, fresh_db): - """Test _on_table_item_changed with incomplete row.""" - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Block signals to prevent Qt cleanup - dialog.table.blockSignals(True) - - # Add incomplete row - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - # Only add project item, missing others - proj_item = QTableWidgetItem("Project") - dialog.table.setItem(0, 0, proj_item) - - # Call _on_table_item_changed - dialog._on_table_item_changed(proj_item) - - dialog.table.blockSignals(False) - - # Should return early without crashing (covers lines 556-558) - - -def test_time_log_dialog_table_item_changed_creates_new_project(qtbot, app, fresh_db): - """Test _on_table_item_changed creating a new project on the fly.""" - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Block signals to prevent Qt cleanup - dialog.table.blockSignals(True) - - # Add a complete row with new project name - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - proj_item = QTableWidgetItem("Brand New Project") - proj_item.setData(Qt.ItemDataRole.UserRole, None) # No entry ID - act_item = QTableWidgetItem("Activity") - note_item = QTableWidgetItem("Note") - hours_item = QTableWidgetItem("2.5") - - dialog.table.setItem(0, 0, proj_item) - dialog.table.setItem(0, 1, act_item) - dialog.table.setItem(0, 2, note_item) - dialog.table.setItem(0, 3, hours_item) - - # Call _on_table_item_changed - with patch.object(dialog, "_on_add_or_update"): - dialog._on_table_item_changed(proj_item) - - # Should have created project and called add/update - projects = fresh_db.list_projects() - project_names = [name for _, name in projects] - assert "Brand New Project" in project_names - - dialog.table.blockSignals(False) - - -def test_time_log_dialog_table_item_changed_without_note(qtbot, app, fresh_db): - """Test _on_table_item_changed when note_item is None.""" - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Block signals to prevent Qt cleanup - dialog.table.blockSignals(True) - - # Add row without note - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - proj_item = QTableWidgetItem("Project") - proj_item.setData(Qt.ItemDataRole.UserRole, None) - act_item = QTableWidgetItem("Activity") - hours_item = QTableWidgetItem("1.0") - - dialog.table.setItem(0, 0, proj_item) - dialog.table.setItem(0, 1, act_item) - # Note: Don't set note_item (leave as None) - dialog.table.setItem(0, 3, hours_item) - - # Call _on_table_item_changed - with patch.object(dialog, "_on_add_or_update"): - dialog._on_table_item_changed(proj_item) - - # Should handle None note gracefully (covers line 567) - assert dialog.note.text() == "" - - dialog.table.blockSignals(False) - - -def test_time_log_dialog_table_item_changed_sets_button_state_for_new_entry( - qtbot, app, fresh_db -): - """Test that _on_table_item_changed sets correct button state for new entry.""" - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Block signals to prevent Qt cleanup - dialog.table.blockSignals(True) - - # Add row without entry ID (new entry) - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - proj_item = QTableWidgetItem("Project") - proj_item.setData(Qt.ItemDataRole.UserRole, None) # No entry ID - act_item = QTableWidgetItem("Activity") - hours_item = QTableWidgetItem("1.0") - - dialog.table.setItem(0, 0, proj_item) - dialog.table.setItem(0, 1, act_item) - dialog.table.setItem(0, 3, hours_item) - - with patch.object(dialog, "_on_add_or_update"): - dialog._on_table_item_changed(proj_item) - - # Delete button should be disabled for new entry (covers lines 601-603) - assert not dialog.delete_btn.isEnabled() - - dialog.table.blockSignals(False) - - -def test_time_log_dialog_table_item_changed_sets_button_state_for_existing_entry( - qtbot, app, fresh_db -): - """Test that _on_table_item_changed sets correct button state for existing entry.""" - # Add a time log entry first - proj_id = fresh_db.add_project("Test Project") - act_id = fresh_db.add_activity("Activity") - entry_id = fresh_db.add_time_log( - "2024-01-15", proj_id, act_id, 120, "Note" - ) # 120 minutes = 2 hours - - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Block signals to prevent Qt cleanup - dialog.table.blockSignals(True) - - # Add row with entry ID - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - proj_item = QTableWidgetItem("Test Project") - proj_item.setData(Qt.ItemDataRole.UserRole, entry_id) - act_item = QTableWidgetItem("Activity") - hours_item = QTableWidgetItem("2.0") - - dialog.table.setItem(0, 0, proj_item) - dialog.table.setItem(0, 1, act_item) - dialog.table.setItem(0, 3, hours_item) - - with patch.object(dialog, "_on_add_or_update"): - dialog._on_table_item_changed(proj_item) - - # Delete button should be enabled for existing entry (covers lines 604-606) - assert dialog.delete_btn.isEnabled() - - dialog.table.blockSignals(False) - - -def test_time_log_dialog_table_item_changed_finds_existing_project_by_name( - qtbot, app, fresh_db -): - """Test _on_table_item_changed finding existing project by name.""" - proj_id = fresh_db.add_project("Existing Project") - - dialog = TimeLogDialog(fresh_db, "2024-01-15", themes=None) - qtbot.addWidget(dialog) - - # Block signals to prevent Qt cleanup - dialog.table.blockSignals(True) - - # Add row with existing project name - dialog.table.setRowCount(1) - from PySide6.QtWidgets import QTableWidgetItem - - proj_item = QTableWidgetItem("Existing Project") - proj_item.setData(Qt.ItemDataRole.UserRole, None) - act_item = QTableWidgetItem("Activity") - hours_item = QTableWidgetItem("1.0") - - dialog.table.setItem(0, 0, proj_item) - dialog.table.setItem(0, 1, act_item) - dialog.table.setItem(0, 3, hours_item) - - with patch.object(dialog, "_on_add_or_update"): - dialog._on_table_item_changed(proj_item) - - # Should find and select existing project (covers lines 571-580) - assert dialog.project_combo.currentData() == proj_id - - dialog.table.blockSignals(False) - - -def test_time_report_dialog_initialization(qtbot, app, fresh_db): - """Test TimeReportDialog initialization.""" - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - # Should initialize without crashing - assert dialog is not None - - -def test_time_code_manager_dialog_initialization(qtbot, app, fresh_db): - """Test TimeCodeManagerDialog initialization.""" - dialog = TimeCodeManagerDialog(fresh_db) - qtbot.addWidget(dialog) - - # Should initialize without crashing - assert dialog is not None - - -def test_time_code_manager_dialog_with_focus_tab(qtbot, app, fresh_db): - """Test TimeCodeManagerDialog with initial tab focus.""" - # Test with projects tab - dialog = TimeCodeManagerDialog(fresh_db, focus_tab="projects") - qtbot.addWidget(dialog) - assert dialog.tabs.currentIndex() == 0 - - # Test with activities tab - dialog2 = TimeCodeManagerDialog(fresh_db, focus_tab="activities") - qtbot.addWidget(dialog2) - assert dialog2.tabs.currentIndex() == 1 - - -def test_time_report_no_grouping_returns_each_entry_and_note(fresh_db): - """Granularity 'none' returns one row per entry and includes notes.""" - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - date = _today() - - fresh_db.add_time_log(date, proj_id, act_id, 60, note="First") - fresh_db.add_time_log(date, proj_id, act_id, 30, note="Second") - - report = fresh_db.time_report(proj_id, date, date, "none") - - # Two separate rows, not aggregated. - assert len(report) == 2 - - # Each row is (period, activity_name, note, total_minutes) - periods = {r[0] for r in report} - activities = {r[1] for r in report} - notes = {r[2] for r in report} - minutes = sorted(r[3] for r in report) - - assert periods == {date} - assert activities == {"Activity"} - assert notes == {"First", "Second"} - assert minutes == [30, 60] - - -def test_time_report_dialog_granularity_none_shows_each_entry_and_notes( - qtbot, fresh_db -): - """'Don't group' granularity shows one row per log entry and includes notes.""" - strings.load_strings("en") - proj_id = fresh_db.add_project("Project") - act_id = fresh_db.add_activity("Activity") - date = _today() - - fresh_db.add_time_log(date, proj_id, act_id, 60, note="First") - fresh_db.add_time_log(date, proj_id, act_id, 30, note="Second") - - dialog = TimeReportDialog(fresh_db) - qtbot.addWidget(dialog) - - # Select the concrete project (index 0 is "All projects") - dialog.project_combo.setCurrentIndex(1) - dialog.from_date.setDate(QDate.fromString(date, "yyyy-MM-dd")) - dialog.to_date.setDate(QDate.fromString(date, "yyyy-MM-dd")) - - idx_none = dialog.granularity.findData("none") - assert idx_none != -1 - dialog.granularity.setCurrentIndex(idx_none) - - dialog._run_report() - - # Two rows, not aggregated - assert dialog.table.rowCount() == 2 - - # Notes in column 3 - notes = {dialog.table.item(row, 3).text() for row in range(dialog.table.rowCount())} - assert "First" in notes - assert "Second" in notes - - # Hours in last column (index 4) when not grouped - hours = [dialog.table.item(row, 4).text() for row in range(dialog.table.rowCount())] - assert any("1.00" in h or "1.0" in h for h in hours) - assert any("0.50" in h or "0.5" in h for h in hours) diff --git a/tests/test_toolbar.py b/tests/test_toolbar.py index fdc8829..0353d91 100644 --- a/tests/test_toolbar.py +++ b/tests/test_toolbar.py @@ -1,8 +1,8 @@ import pytest -from bouquin.markdown_editor import MarkdownEditor -from bouquin.theme import Theme, ThemeConfig, ThemeManager -from bouquin.toolbar import ToolBar from PySide6.QtWidgets import QWidget +from bouquin.markdown_editor import MarkdownEditor +from bouquin.theme import ThemeManager, ThemeConfig, Theme +from bouquin.toolbar import ToolBar @pytest.fixture @@ -14,6 +14,7 @@ def editor(app, qtbot): return ed +@pytest.mark.gui def test_toolbar_signals_and_styling(qtbot, editor): host = QWidget() qtbot.addWidget(host) diff --git a/tests/test_version_check.py b/tests/test_version_check.py deleted file mode 100644 index 01fac35..0000000 --- a/tests/test_version_check.py +++ /dev/null @@ -1,535 +0,0 @@ -import subprocess -from unittest.mock import Mock, patch - -import pytest -from bouquin.version_check import VersionChecker -from PySide6.QtGui import QPixmap -from PySide6.QtWidgets import QMessageBox, QWidget - - -def test_version_checker_init(app): - """Test VersionChecker initialization.""" - parent = QWidget() - checker = VersionChecker(parent) - - assert checker._parent is parent - - -def test_version_checker_init_no_parent(app): - """Test VersionChecker initialization without parent.""" - checker = VersionChecker() - - assert checker._parent is None - - -def test_current_version_returns_version(app): - """Test getting current version.""" - checker = VersionChecker() - - with patch("importlib.metadata.version", return_value="1.2.3"): - version = checker.current_version() - assert version == "1.2.3" - - -def test_current_version_fallback_on_error(app): - """Test current version fallback when package not found.""" - checker = VersionChecker() - - import importlib.metadata - - with patch( - "importlib.metadata.version", - side_effect=importlib.metadata.PackageNotFoundError("Not found"), - ): - version = checker.current_version() - assert version == "0.0.0" - - -def test_parse_version_simple(app): - """Test parsing simple version string.""" - result = VersionChecker._parse_version("1.2.3") - assert result == (1, 2, 3) - - -def test_parse_version_complex(app): - """Test parsing complex version string with extra text.""" - result = VersionChecker._parse_version("v1.2.3-beta") - assert result == (1, 2, 3) - - -def test_parse_version_no_numbers(app): - """Test parsing version string with no numbers.""" - result = VersionChecker._parse_version("invalid") - assert result == (0,) - - -def test_parse_version_single_number(app): - """Test parsing version with single number.""" - result = VersionChecker._parse_version("5") - assert result == (5,) - - -def test_is_newer_version_true(app): - """Test detecting newer version.""" - checker = VersionChecker() - - assert checker._is_newer_version("1.2.3", "1.2.2") is True - assert checker._is_newer_version("2.0.0", "1.9.9") is True - assert checker._is_newer_version("1.3.0", "1.2.9") is True - - -def test_is_newer_version_false(app): - """Test detecting same or older version.""" - checker = VersionChecker() - - assert checker._is_newer_version("1.2.3", "1.2.3") is False - assert checker._is_newer_version("1.2.2", "1.2.3") is False - assert checker._is_newer_version("0.9.9", "1.0.0") is False - - -def test_logo_pixmap(app): - """Test generating logo pixmap.""" - checker = VersionChecker() - - pixmap = checker._logo_pixmap(96) - - assert isinstance(pixmap, QPixmap) - assert not pixmap.isNull() - - -def test_logo_pixmap_different_sizes(app): - """Test generating logo pixmap with different sizes.""" - checker = VersionChecker() - - pixmap_small = checker._logo_pixmap(48) - pixmap_large = checker._logo_pixmap(128) - - assert not pixmap_small.isNull() - assert not pixmap_large.isNull() - - -def test_show_version_dialog(qtbot, app): - """Test showing version dialog.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - with patch.object(QMessageBox, "exec") as mock_exec: - with patch("importlib.metadata.version", return_value="1.0.0"): - checker.show_version_dialog() - - # Dialog should have been shown - assert mock_exec.called - - -def test_check_for_updates_network_error(qtbot, app): - """Test check for updates when network request fails.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - with patch("requests.get", side_effect=Exception("Network error")): - with patch.object(QMessageBox, "warning") as mock_warning: - checker.check_for_updates() - - # Should show warning - assert mock_warning.called - - -def test_check_for_updates_empty_response(qtbot, app): - """Test check for updates with empty version string.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_response = Mock() - mock_response.text = " " - mock_response.raise_for_status = Mock() - - with patch("requests.get", return_value=mock_response): - with patch.object(QMessageBox, "warning") as mock_warning: - checker.check_for_updates() - - # Should show warning about empty version - assert mock_warning.called - - -def test_check_for_updates_already_latest(qtbot, app): - """Test check for updates when already on latest version.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_response = Mock() - mock_response.text = "1.0.0" - mock_response.raise_for_status = Mock() - - with patch("requests.get", return_value=mock_response): - with patch("importlib.metadata.version", return_value="1.0.0"): - with patch.object(QMessageBox, "information") as mock_info: - checker.check_for_updates() - - # Should show info that we're on latest - assert mock_info.called - - -def test_check_for_updates_new_version_available_declined(qtbot, app): - """Test check for updates when new version is available but user declines.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_response = Mock() - mock_response.text = "2.0.0" - mock_response.raise_for_status = Mock() - - with patch("requests.get", return_value=mock_response): - with patch("importlib.metadata.version", return_value="1.0.0"): - with patch.object(QMessageBox, "question", return_value=QMessageBox.No): - # Should not proceed to download - checker.check_for_updates() - - -def test_check_for_updates_new_version_available_accepted(qtbot, app): - """Test check for updates when new version is available and user accepts.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_response = Mock() - mock_response.text = "2.0.0" - mock_response.raise_for_status = Mock() - - with patch("requests.get", return_value=mock_response): - with patch("importlib.metadata.version", return_value="1.0.0"): - with patch.object(QMessageBox, "question", return_value=QMessageBox.Yes): - with patch.object( - checker, "_download_and_verify_appimage" - ) as mock_download: - checker.check_for_updates() - - # Should call download - mock_download.assert_called_once_with("2.0.0") - - -def test_download_file_success(qtbot, app, tmp_path): - """Test downloading a file successfully.""" - checker = VersionChecker() - - mock_response = Mock() - mock_response.headers = {"Content-Length": "1000"} - mock_response.iter_content = Mock(return_value=[b"data" * 25]) # 100 bytes - mock_response.raise_for_status = Mock() - - dest_path = tmp_path / "test_file.bin" - - with patch("requests.get", return_value=mock_response): - checker._download_file("http://example.com/file", dest_path) - - assert dest_path.exists() - - -def test_download_file_with_progress(qtbot, app, tmp_path): - """Test downloading a file with progress dialog.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_response = Mock() - mock_response.headers = {"Content-Length": "1000"} - mock_response.iter_content = Mock(return_value=[b"x" * 100, b"y" * 100]) - mock_response.raise_for_status = Mock() - - dest_path = tmp_path / "test_file.bin" - - from PySide6.QtWidgets import QProgressDialog - - mock_progress = Mock(spec=QProgressDialog) - mock_progress.wasCanceled = Mock(return_value=False) - mock_progress.value = Mock(return_value=0) - - with patch("requests.get", return_value=mock_response): - checker._download_file( - "http://example.com/file", dest_path, progress=mock_progress - ) - - # Progress should have been updated - assert mock_progress.setValue.called - - -def test_download_file_cancelled(qtbot, app, tmp_path): - """Test cancelling a file download.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_response = Mock() - mock_response.headers = {"Content-Length": "1000"} - mock_response.iter_content = Mock(return_value=[b"x" * 100]) - mock_response.raise_for_status = Mock() - - dest_path = tmp_path / "test_file.bin" - - from PySide6.QtWidgets import QProgressDialog - - mock_progress = Mock(spec=QProgressDialog) - mock_progress.wasCanceled = Mock(return_value=True) - mock_progress.value = Mock(return_value=0) - - with patch("requests.get", return_value=mock_response): - with pytest.raises(RuntimeError): - checker._download_file( - "http://example.com/file", dest_path, progress=mock_progress - ) - - -def test_download_file_no_content_length(qtbot, app, tmp_path): - """Test downloading file without Content-Length header.""" - checker = VersionChecker() - - mock_response = Mock() - mock_response.headers = {} - mock_response.iter_content = Mock(return_value=[b"data"]) - mock_response.raise_for_status = Mock() - - dest_path = tmp_path / "test_file.bin" - - with patch("requests.get", return_value=mock_response): - checker._download_file("http://example.com/file", dest_path) - - assert dest_path.exists() - - -def test_download_and_verify_appimage_download_cancelled(qtbot, app, tmp_path): - """Test AppImage download when user cancels.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - with patch( - "bouquin.version_check.QStandardPaths.writableLocation", - return_value=str(tmp_path), - ): - with patch.object( - checker, "_download_file", side_effect=RuntimeError("Download cancelled") - ): - with patch.object(QMessageBox, "information") as mock_info: - checker._download_and_verify_appimage("2.0.0") - - # Should show cancellation message - assert mock_info.called - - -def test_download_and_verify_appimage_download_error(qtbot, app, tmp_path): - """Test AppImage download when download fails.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - with patch( - "bouquin.version_check.QStandardPaths.writableLocation", - return_value=str(tmp_path), - ): - with patch.object( - checker, "_download_file", side_effect=Exception("Network error") - ): - with patch.object(QMessageBox, "critical") as mock_critical: - checker._download_and_verify_appimage("2.0.0") - - # Should show error message - assert mock_critical.called - - -def test_download_and_verify_appimage_gpg_key_error(qtbot, app, tmp_path): - """Test AppImage verification when GPG key cannot be read.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - with patch( - "bouquin.version_check.QStandardPaths.writableLocation", - return_value=str(tmp_path), - ): - with patch.object(checker, "_download_file"): - with patch( - "importlib.resources.files", side_effect=Exception("Key not found") - ): - with patch.object(QMessageBox, "critical") as mock_critical: - checker._download_and_verify_appimage("2.0.0") - - # Should show error about GPG key - assert mock_critical.called - - -def test_download_and_verify_appimage_gpg_not_found(qtbot, app, tmp_path): - """Test AppImage verification when GPG is not installed.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_files = Mock() - mock_files.read_bytes = Mock(return_value=b"fake key data") - - with patch( - "bouquin.version_check.QStandardPaths.writableLocation", - return_value=str(tmp_path), - ): - with patch.object(checker, "_download_file"): - with patch("importlib.resources.files", return_value=mock_files): - with patch( - "subprocess.run", side_effect=FileNotFoundError("gpg not found") - ): - with patch.object(QMessageBox, "critical") as mock_critical: - checker._download_and_verify_appimage("2.0.0") - - # Should show error about GPG not found - assert mock_critical.called - - -def test_download_and_verify_appimage_verification_failed(qtbot, app, tmp_path): - """Test AppImage verification when signature verification fails.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_files = Mock() - mock_files.read_bytes = Mock(return_value=b"fake key data") - - with patch( - "bouquin.version_check.QStandardPaths.writableLocation", - return_value=str(tmp_path), - ): - with patch.object(checker, "_download_file"): - with patch("importlib.resources.files", return_value=mock_files): - # First subprocess call (import) succeeds, second (verify) fails - mock_error = subprocess.CalledProcessError(1, "gpg") - mock_error.stderr = b"Verification failed" - with patch("subprocess.run", side_effect=[None, mock_error]): - with patch.object(QMessageBox, "critical") as mock_critical: - checker._download_and_verify_appimage("2.0.0") - - # Should show error about verification - assert mock_critical.called - - -def test_download_and_verify_appimage_success(qtbot, app, tmp_path): - """Test successful AppImage download and verification.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_files = Mock() - mock_files.read_bytes = Mock(return_value=b"fake key data") - - with patch( - "bouquin.version_check.QStandardPaths.writableLocation", - return_value=str(tmp_path), - ): - with patch.object(checker, "_download_file"): - with patch("importlib.resources.files", return_value=mock_files): - with patch("subprocess.run"): # Both calls succeed - with patch.object(QMessageBox, "information") as mock_info: - checker._download_and_verify_appimage("2.0.0") - - # Should show success message - assert mock_info.called - - -def test_version_comparison_edge_cases(app): - """Test version comparison with edge cases.""" - checker = VersionChecker() - - # Different lengths - assert checker._is_newer_version("1.0.0.1", "1.0.0") is True - assert checker._is_newer_version("1.0", "1.0.0") is False - - # Large numbers - assert checker._is_newer_version("10.0.0", "9.9.9") is True - assert checker._is_newer_version("1.100.0", "1.99.0") is True - - -def test_download_file_creates_parent_directory(qtbot, app, tmp_path): - """Test that download creates parent directory if needed.""" - checker = VersionChecker() - - mock_response = Mock() - mock_response.headers = {} - mock_response.iter_content = Mock(return_value=[b"data"]) - mock_response.raise_for_status = Mock() - - dest_path = tmp_path / "subdir" / "nested" / "test_file.bin" - - with patch("requests.get", return_value=mock_response): - checker._download_file("http://example.com/file", dest_path) - - assert dest_path.exists() - assert dest_path.parent.exists() - - -def test_show_version_dialog_check_button_clicked(qtbot, app): - """Test clicking 'Check for updates' button in version dialog.""" - parent = QWidget() - qtbot.addWidget(parent) - checker = VersionChecker(parent) - - mock_box = Mock(spec=QMessageBox) - check_button = Mock() - mock_box.clickedButton = Mock(return_value=check_button) - mock_box.addButton = Mock(return_value=check_button) - - with patch("importlib.metadata.version", return_value="1.0.0"): - with patch("bouquin.version_check.QMessageBox", return_value=mock_box): - with patch.object(checker, "check_for_updates") as mock_check: - checker.show_version_dialog() - - # check_for_updates should be called when button is clicked - if mock_box.clickedButton() is check_button: - assert mock_check.called - - -def test_parse_version_with_letters(app): - """Test parsing version strings with letters.""" - result = VersionChecker._parse_version("1.2.3rc1") - assert 1 in result - assert 2 in result - assert 3 in result - - -def test_download_file_invalid_content_length(qtbot, app, tmp_path): - """Test downloading file with invalid Content-Length header.""" - checker = VersionChecker() - - mock_response = Mock() - mock_response.headers = {"Content-Length": "invalid"} - mock_response.iter_content = Mock(return_value=[b"data"]) - mock_response.raise_for_status = Mock() - - dest_path = tmp_path / "test_file.bin" - - with patch("requests.get", return_value=mock_response): - # Should handle gracefully - checker._download_file("http://example.com/file", dest_path) - - assert dest_path.exists() - - -def test_version_checker_creation(qtbot): - """Test creating a VersionChecker instance.""" - widget = QWidget() - qtbot.addWidget(widget) - - checker = VersionChecker(widget) - assert checker is not None - - -def test_current_version(qtbot): - """Test getting the current version.""" - widget = QWidget() - qtbot.addWidget(widget) - - checker = VersionChecker(widget) - version = checker.current_version() - - # Version should be a string - assert isinstance(version, str) - assert len(version) > 0 diff --git a/vulture_ignorelist.py b/vulture_ignorelist.py deleted file mode 100644 index 2addc55..0000000 --- a/vulture_ignorelist.py +++ /dev/null @@ -1,26 +0,0 @@ -from bouquin.db import DBManager -from bouquin.flow_layout import FlowLayout -from bouquin.markdown_editor import MarkdownEditor -from bouquin.markdown_highlighter import MarkdownHighlighter -from bouquin.statistics_dialog import DateHeatMap - -DBManager.row_factory - -DateHeatMap.minimumSizeHint - -FlowLayout.itemAt -FlowLayout.expandingDirections -FlowLayout.hasHeightForWidth -FlowLayout.heightForWidth - -MarkdownEditor.apply_weight -MarkdownEditor.apply_italic -MarkdownEditor.apply_strikethrough -MarkdownEditor.apply_code -MarkdownEditor.apply_heading -MarkdownEditor.contextMenuEvent -MarkdownEditor.toggle_bullets -MarkdownEditor.toggle_numbers -MarkdownEditor.toggle_checkboxes - -MarkdownHighlighter.highlightBlock