[tutorial] tweaks to get the tutorial working on the latest version

Author: tstack

.dockerignore

@@ -0,0 +1,3 @@
+build
+.git
+test

demo/Dockerfile

@@ -10,8 +10,8 @@ RUN set -eux; \
 	rm -rf /var/lib/{apt,dpkg,cache,log}/; \
 	echo "Installed base utils!"
 
-ADD https://github.com/tstack/lnav/releases/download/v0.11.2/lnav-0.11.2-x86_64-linux-musl.zip /
-RUN unzip lnav-0.11.2-x86_64-linux-musl.zip
+ADD https://github.com/tstack/lnav/releases/download/v0.13.0-rc1/lnav-0.13.0-rc1-linux-musl-x86_64.zip /
+RUN unzip lnav-0.13.0-rc1-linux-musl-x86_64.zip
 
 COPY docs/tutorials tutorials
 RUN gunzip /tutorials/playground/logs/*.gz
@@ -25,18 +25,18 @@ RUN echo 'tutorial1:tutorial1' | chpasswd
 RUN passwd -d tutorial1
 
 USER playground
-RUN /lnav-0.11.2/lnav -nN -c ":config /ui/theme monocai"
+RUN /lnav-0.13.0-rc1/lnav -nN -c ":config /ui/theme monocai" -c ":config /ui/mouse/mode enabled"
 
 USER tutorial1
-RUN /lnav-0.11.2/lnav -nN -c ":config /ui/theme monocai"
+RUN /lnav-0.13.0-rc1/lnav -nN -c ":config /ui/theme monocai" -c ":config /ui/mouse/mode enabled"
 
 USER root
 
 RUN echo 'Match User playground' >> /etc/ssh/sshd_config
-RUN echo 'ForceCommand env PATH=/lnav-0.11.2:$PATH /tutorials/playground/run.sh' >> /etc/ssh/sshd_config
+RUN echo 'ForceCommand env PATH=/lnav-0.13.0-rc1:$PATH /tutorials/playground/run.sh' >> /etc/ssh/sshd_config
 RUN echo 'PermitEmptyPasswords yes' >> /etc/ssh/sshd_config
 RUN echo 'Match User tutorial1' >> /etc/ssh/sshd_config
-RUN echo 'ForceCommand env PATH=/lnav-0.11.2:$PATH /tutorials/tutorial1/run.sh' >> /etc/ssh/sshd_config
+RUN echo 'ForceCommand env PATH=/lnav-0.13.0-rc1:$PATH /tutorials/tutorial1/run.sh' >> /etc/ssh/sshd_config
 RUN echo 'PermitEmptyPasswords yes' >> /etc/ssh/sshd_config
 RUN service ssh start
 EXPOSE 22

docs/tutorials/tutorial-lib/formats/tutorial-lib/tutorial.sql

@@ -76,10 +76,10 @@ CREATE TRIGGER IF NOT EXISTS tutorial_move_log_after_load
     ON lnav_events
     WHEN jget(new.content, '/$schema') = 'https://lnav.org/event-session-loaded-v1.schema.json'
 BEGIN
-    UPDATE lnav_views SET top = 0 WHERE name = 'log';
+    UPDATE lnav_views SET selection = 0 WHERE name = 'log';
 END;
 
-CREATE TRIGGER IF NOT EXISTS lnav_tutorial_view_listener UPDATE OF top
+CREATE TRIGGER IF NOT EXISTS lnav_tutorial_view_listener UPDATE OF selection
     ON lnav_views_echo
     WHEN new.name = 'log'
 BEGIN
@@ -90,7 +90,7 @@ BEGIN
         FROM lnav_tutorial_step,
              lnav_tutorial_lines
         WHERE lnav_tutorial_step.step = lnav_tutorial_lines.step
-          AND jget(json_object('top', new.top,
+          AND jget(json_object('selection', new.selection,
                                'left', new.left,
                                'search', new.search),
                    view_ptr) = view_value;
@@ -100,10 +100,10 @@ BEGIN
                                 lnav_tutorial_lines
                            WHERE lnav_tutorial_step.step = lnav_tutorial_lines.step
                              AND lnav_tutorial_lines.log_comment IS NOT NULL
-                             AND jget(json_object('top', new.top,
+                             AND jget(json_object('selection', new.selection,
                                                   'left', new.left,
                                                   'search', new.search), view_ptr) = view_value)
-        WHERE log_line = new.top
+        WHERE log_line = new.selection
           AND log_comment IS NULL;
 END;
 

docs/tutorials/tutorial1/index.md

@@ -3,7 +3,7 @@ name: tutorial1
 steps:
   - move-to-error:
       description: "Move to an error"
-      view_ptr: /top
+      view_ptr: /selection
       view_value: 6
       notification: |
         Press `e`/`Shift+E` to move through the
@@ -19,7 +19,7 @@ steps:
       notification: |
         Press `w`/`Shift+W` to move through the
         <span class="-lnav_log-level-styles_warning">warnings</span>
-      view_ptr: /top
+      view_ptr: /selection
       view_value: 3
       comment: |
         You found the warning! The scrollbar on the right is highlighted
@@ -35,7 +35,7 @@ steps:
     move-to-next-hit:
       description: "Move to the next hit"
       notification: "Press `n`/`Shift+N` to move through the search hits"
-      view_ptr: /top
+      view_ptr: /selection
       view_value: 53
       comment: |
         The matching text in a search is highlighted in
@@ -53,7 +53,7 @@ steps:
   - move-to-half-hour:
       description: "Move to the next half-hour"
       notification: "Press `3`/`Shift+3` to move through the half-hour marks"
-      view_ptr: /top
+      view_ptr: /selection
       view_value: 34
       comment: |
         This file is in the _glog_ format and timestamps consist of the
@@ -65,7 +65,7 @@ steps:
     move-to-timestamp:
       description: "Move to a given timestamp"
       notification: "Move to '**March 23**' using `:goto` or the breadcrumb bar"
-      view_ptr: /top
+      view_ptr: /selection
       view_value: 79
       comment: |
         Many different timestamp formats are recognized as well as

src/init.sql

@@ -188,7 +188,7 @@ VALUES ('org.lnav.breadcrumb.focus', -1, DATETIME('now', '+2 minute'),
         'Press <span class="-lnav_status-styles_hotkey">${org.lnav.key.breadcrumb.focus}</span> to focus on the breadcrumb bar');
 
 CREATE TABLE lnav_views_echo AS
-SELECT name, top, "left", height, inner_height, top_time, search
+SELECT name, top, "left", height, inner_height, top_time, search, selection
 FROM lnav_views;
 
 CREATE UNIQUE INDEX lnav_views_echo_index ON lnav_views_echo (name);

src/lnav.cc

@@ -1180,15 +1180,17 @@ looper()
               height = (SELECT height FROM lnav_views WHERE lnav_views.name = lnav_views_echo.name),
               inner_height = (SELECT inner_height FROM lnav_views WHERE lnav_views.name = lnav_views_echo.name),
               top_time = (SELECT top_time FROM lnav_views WHERE lnav_views.name = lnav_views_echo.name),
-              search = (SELECT search FROM lnav_views WHERE lnav_views.name = lnav_views_echo.name)
+              search = (SELECT search FROM lnav_views WHERE lnav_views.name = lnav_views_echo.name),
+              selection = (SELECT selection FROM lnav_views WHERE lnav_views.name = lnav_views_echo.name)
           WHERE EXISTS (SELECT * FROM lnav_views WHERE name = lnav_views_echo.name AND
                     (
                         lnav_views.top != lnav_views_echo.top OR
                         lnav_views.left != lnav_views_echo.left OR
                         lnav_views.height != lnav_views_echo.height OR
                         lnav_views.inner_height != lnav_views_echo.inner_height OR
                         lnav_views.top_time != lnav_views_echo.top_time OR
-                        lnav_views.search != lnav_views_echo.search
+                        lnav_views.search != lnav_views_echo.search OR
+                        lnav_views.selection != lnav_views_echo.selection
                     ))
         )"
 #else
@@ -1199,7 +1201,8 @@ looper()
               height = orig.height,
               inner_height = orig.inner_height,
               top_time = orig.top_time,
-              search = orig.search
+              search = orig.search,
+              selection = orig.selection
           FROM (SELECT * FROM lnav_views) AS orig
           WHERE orig.name = lnav_views_echo.name AND
                 (
@@ -1208,7 +1211,8 @@ looper()
                     orig.height != lnav_views_echo.height OR
                     orig.inner_height != lnav_views_echo.inner_height OR
                     orig.top_time != lnav_views_echo.top_time OR
-                    orig.search != lnav_views_echo.search
+                    orig.search != lnav_views_echo.search OR
+                    orig.selection != lnav_views_echo.selection
                 )
         )"
 #endif