marvi 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38191038ed0255015b0184643cc52e36bc35b8973803c75f3f5636e227fddba6
-  data.tar.gz: 83a3fe56615300c99bcc9858750926d5afab8a4e7a78c279e7b74ceef81ff074
+  metadata.gz: 5131e252ac808321286aa802bdd386e5b3bb9b494dda00df1761ef9700088a4e
+  data.tar.gz: 2e9bccb531018e22014e43053b6a05d081e60a422c9107966c54739829cf528d
 SHA512:
-  metadata.gz: 0dce42f6d88ceac30fa7cd2a75ad9318ab383f71164ad383ea1a95835601129ac8df125c403e634b5882a68802d24e05b4db9dd57496b4b91ab3a9a3bc176cca
-  data.tar.gz: 4f41145dc7639d8034cdff69b750dd0c92856b23b830b3e25542de48685e11f70a610cca7130a4ca54b04e829d5bd79bdcc5322f94fea939c6e6c64db81bbb08
+  metadata.gz: d87aa8d7de7acd2414e5301416fd09b09d1f33e48f64c93c86b5d0b7fc833e20102c297e89a77396cdcb4176269493459e835a6ab9df2a677d6d112ad9bbb3ed
+  data.tar.gz: 673ca0703a768010c6116fa4cae6b29c723b439a50e7591c3a7ac7f9928e614eda42f2ef2fda7f377ef7453babd37b729786579ef20479b24107f800be453c59

data/lib/marvi/renderer/curses.rb

@@ -18,23 +18,27 @@ module Marvi
 
       ITALIC_ATTR = (defined?(::Curses::A_ITALIC) ? ::Curses::A_ITALIC : 0)
 
+      FILE_POLL_INTERVAL_MS = 500
+
       def render(markdown, file: nil)
         @file     = file
         @markdown = markdown
         @lines    = ASTWalker.new.walk(markdown)
         @scroll   = 0
+        mark_reloaded
 
-        with_safe_term { ::Curses.init_screen }
-        ::Curses.start_color
-        ::Curses.use_default_colors
-        ::Curses.noecho
-        ::Curses.cbreak
-        ::Curses.stdscr.keypad(true)
-        setup_colors
+        init_curses_state
         draw
 
         catch(:quit) do
-          loop { handle_key(::Curses.getch) }
+          loop do
+            key = ::Curses.getch
+            if key.nil? || key == -1
+              check_file_updated
+            else
+              handle_key(key)
+            end
+          end
         end
       ensure
         ::Curses.close_screen
@@ -106,9 +110,41 @@ module Marvi
         when "g"                            then @scroll = 0; draw
         when "G"                            then @scroll = max_scroll; draw
         when "e"                            then launch_editor if @file
+        when "r", "R"                       then reload_from_key if @file
         end
       end
 
+      def reload_from_key
+        reload
+        mark_reloaded
+        draw
+      end
+
+      def check_file_updated
+        return unless @file
+        mtime = current_mtime
+        return if mtime.nil? || mtime == @last_mtime
+
+        @last_mtime = mtime
+        return if @file_updated
+
+        @file_updated = true
+        draw_status_bar
+        ::Curses.refresh
+      end
+
+      def mark_reloaded
+        @last_mtime   = current_mtime
+        @file_updated = false
+      end
+
+      def current_mtime
+        return nil unless @file
+        File.mtime(@file)
+      rescue SystemCallError
+        nil
+      end
+
       def launch_editor
         editor = ENV["EDITOR"] || ENV["VISUAL"] || "vi"
         line   = current_source_line
@@ -117,7 +153,8 @@ module Marvi
         ::Curses.close_screen
         system(cmd)
         reload
-        reinit_curses
+        mark_reloaded
+        init_curses_state
         draw
       end
 
@@ -127,13 +164,14 @@ module Marvi
         @scroll   = [@scroll, max_scroll].min
       end
 
-      def reinit_curses
+      def init_curses_state
         with_safe_term { ::Curses.init_screen }
         ::Curses.start_color
         ::Curses.use_default_colors
         ::Curses.noecho
         ::Curses.cbreak
         ::Curses.stdscr.keypad(true)
+        ::Curses.stdscr.timeout = FILE_POLL_INTERVAL_MS
         setup_colors
       end
 
@@ -170,12 +208,20 @@ module Marvi
 
       def draw_status_bar
         ::Curses.setpos(::Curses.lines - 1, 0)
+        top    = @scroll + 1
+        bottom = [@scroll + page_size, @lines.size].min
+        edit_hint = @file ? "  e edit" : ""
+        status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
+        updated_hint = @file_updated ? "  ● updated (r to reload) " : ""
+        available = [::Curses.cols - updated_hint.length, 0].max
+
         ::Curses.attron(::Curses.color_pair(COLOR_PAIRS[:cyan])) do
-          top    = @scroll + 1
-          bottom = [@scroll + page_size, @lines.size].min
-          edit_hint = @file ? "  e edit" : ""
-          status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
-          ::Curses.addstr(status.ljust(::Curses.cols)[0, ::Curses.cols])
+          ::Curses.addstr(status.ljust(available)[0, available])
+        end
+        unless updated_hint.empty?
+          ::Curses.attron(::Curses.color_pair(COLOR_PAIRS[:yellow]) | ::Curses::A_BOLD) do
+            ::Curses.addstr(updated_hint)
+          end
         end
       end
 

data/lib/marvi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marvi
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Mitsutaka Mimura