Merge branch 'issue_530_add_peek_page' into develop

lute/read/routes.py

@@ -16,7 +16,7 @@
 bp = Blueprint("read", __name__, url_prefix="/read")
 
 
-def _render_book_page(book, pagenum):
+def _render_book_page(book, pagenum, track_page_open=True):
     """
     Render a particular book page.
     """
@@ -36,6 +36,7 @@ def _render_book_page(book, pagenum):
         page_count=book.page_count,
         show_highlights=show_highlights,
         lang_id=lang.id,
+        track_page_open=track_page_open,
         term_dicts=term_dicts,
     )
 
@@ -81,6 +82,20 @@ def read_page(bookid, pagenum):
     return _render_book_page(book, pagenum)
 
 
+@bp.route("/<int:bookid>/peek/<int:pagenum>", methods=["GET"])
+def peek_page(bookid, pagenum):
+    """
+    Peek at a page; i.e. render it, but don't set the current text or start date.
+    """
+    book = _find_book(bookid)
+    if book is None:
+        flash(f"No book matching id {bookid}")
+        return redirect("/", 302)
+
+    pagenum = book.page_in_range(pagenum)
+    return _render_book_page(book, pagenum, track_page_open=False)
+
+
 @bp.route("/page_done", methods=["post"])
 def page_done():
     "Handle POST when page is done."

lute/read/service.py

@@ -150,16 +150,17 @@ def _save_new_status_0_terms(self, paragraphs):
             self.session.add(ti.term)
         self.session.commit()
 
-    def _get_reading_data(self, dbbook, pagenum, set_text_start_date=False):
+    def _get_reading_data(self, dbbook, pagenum, track_page_open=False):
         "Get paragraphs, set text.start_date if needed."
         text = dbbook.text_at_page(pagenum)
-        if set_text_start_date:
-            text.start_date = datetime.now()
         text.load_sentences()
-
         svc = StatsService(self.session)
         svc.mark_stale(dbbook)
-        dbbook.current_tx_id = text.id
+
+        if track_page_open:
+            text.start_date = datetime.now()
+            dbbook.current_tx_id = text.id
+
         self.session.add(dbbook)
         self.session.add(text)
         self.session.commit()

lute/templates/read/index.html

@@ -19,6 +19,7 @@
     page_num: <input id="page_num" value="{{ page_num }}">
     page_count: <input id="page_count" value="{{ page_count }}">
     highlights: <span id="show_highlights">{{ show_highlights|lower }}</span>
+    track_page_open: <input id="track_page_open" value="{{ track_page_open|lower }}">
   </pre>
 </div>
 
@@ -458,7 +459,12 @@ <h2>&#127881;</h2>
 
     updateReadSlider(actualPage);
 
-    const url = `/read/start_reading/${bookid}/${actualPage}`;
+    let read_action = 'start_reading';
+    if ($("#track_page_open").val() == "false")
+      read_action = 'refresh_page';
+    const url = `/read/${read_action}/${bookid}/${actualPage}`;
+    // console.log(`go to page ${url}`);
+
     $.get(
       url,
       function(data, status) {

lute/templates/term/sentences.html

@@ -42,7 +42,7 @@
       <li style="margin-top: 4px;">
         {{ dto.sentence | safe }}
         <br/>
-        <a href="/read/{{ dto.book_id }}/page/{{ dto.page_number }}"
+        <a href="/read/{{ dto.book_id }}/peek/{{ dto.page_number }}"
            target="_blank"
            style="cursor: pointer; font-size: 0.9em; font-style: italic;">
           {{ dto.title }}

tests/acceptance/conftest.py

@@ -396,6 +396,14 @@ def when_go_to_page(luteclient, position):
     # b.reload()
 
 
+@given(parsers.parse("I peek at page {pagenum}"))
+def given_peek_at_page(luteclient, pagenum):
+    "Peek at a page of the current book."
+    currurl = luteclient.browser.url
+    peekurl = re.sub(r"/page/.*", f"/peek/{pagenum}", currurl)
+    luteclient.browser.visit(peekurl)
+
+
 @when(parsers.parse("I delete the current page"))
 def when_delete_current_page(luteclient):
     "Delete the current page."

tests/acceptance/reading.feature

@@ -480,3 +480,26 @@ Feature: User can actually read and stuff.
             three/.
         And book pages with start dates are:
             Hola; 3
+
+
+    # Issue 530: "peeking" at page doesn't set page data.
+    Scenario: Peeking at page does not set current page or start date.
+        Given a Spanish book "Hola" with content:
+            Uno.
+            ---
+            Dos.
+        Then the reading pane shows:
+            Uno/.
+        And book pages with start dates are:
+            Hola; 1
+
+        Given I peek at page 2
+        Then the reading pane shows:
+            Dos/.
+        And book pages with start dates are:
+            Hola; 1
+
+        Given I visit "/"
+        When I set the book table filter to "Hola"
+        Then the book table contains:
+            Hola; Spanish; ; 2;