heathrow 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbe8be982ab3300b591a24bdba7bb67c9feff58167a7785fb288a4b62d558f46
-  data.tar.gz: 513f905dff1e8a9e74b87488a1fa5b007d3a76e26287d7643961ea2b1b0b2268
+  metadata.gz: 123f2c7c6134d4ea1add0517f649b94353918d1e76583a9f714a1e49d7879f96
+  data.tar.gz: 26e26497ec050fc246cb2ee1eff2389ceb3088dccb8c83d09257425dd152888a
 SHA512:
-  metadata.gz: 29e42a3922e7dfb70188c3bc03345812ccb1a7a21c992384e1b50938a00418ecb6bdba009ba30d0020960b354f144b0ac1a9cc18910b2c2e775c0137a7f68c61
-  data.tar.gz: 3a7a0e541c490c8d783f679d6be4bcab6dabe703041ea2620d95b7756ec74cc53d9bfee851e15f3863685168f8c33f1c1b227ecf5e1aea784681d4b12cfb6f16
+  metadata.gz: 2130ee038cbc2d9bc8ee4b7855809afaa1c171aba9b8b0967a85d71c9397b39b2ef86afcef58b3301d15556dfc3d07ab8d91d8d12ed77d4a90879904562829a5
+  data.tar.gz: 3557ffc9cf7af99441c6c4062e63d7bc9c18145b1f537d10607d420f059221f36c33d1f1a86cad76036a69d003eedb39f26c471013c2dba839187350a10c6aff

data/lib/heathrow/ui/application.rb

@@ -725,6 +725,8 @@ module Heathrow
         page_down
       when 'PgUP'
         page_up
+      when 'L'
+        load_more_messages
       when 'w'
         change_width
       when 'Y'
@@ -1498,28 +1500,32 @@ module Heathrow
       available_width -= 2 if @panes[:left].border  # Extra space for border chars
       available_width -= 3  # Space for N flag + replied flag + indicator column (tag/star/attachment/D)
       
-      # Truncate sender to fit
+      # Truncate sender to fit (use display_width for CJK characters)
       sender_max = 15
-      sender_display = sender.length > sender_max ? sender[0..sender_max-2] + '…' : sender.ljust(sender_max)
-      
+      dw = Rcurses.display_width(sender)
+      sender_display = if dw > sender_max
+        truncate_to_width(sender, sender_max - 1) + '…'
+      else
+        sender + ' ' * [sender_max - dw, 0].max
+      end
+
       # Build the line with timestamp, icon and sender
       icon = respond_to?(:get_source_icon) ? get_source_icon(msg['source_type']) : '•'
       line_prefix = "#{timestamp} #{icon} #{sender_display} "
-      
-      # Calculate remaining space for subject
-      subject_width = available_width - line_prefix.length - 1  # -1 for safety
-      if subject_width > 0 && subject.length > subject_width
-        subject = subject[0..subject_width-2] + '…'
+
+      # Calculate remaining space for subject (use display_width for CJK)
+      prefix_dw = Rcurses.display_width(line_prefix)
+      subject_width = available_width - prefix_dw - 1  # -1 for safety
+      subject_dw = Rcurses.display_width(subject)
+      if subject_width > 0 && subject_dw > subject_width
+        subject = truncate_to_width(subject, subject_width - 1) + '…'
+        subject_dw = Rcurses.display_width(subject)
       end
-      
-      # Format the complete line and pad to full width
-      line = line_prefix + subject
-      # Pad line to full available width so background color spans entire width
-      line = line.ljust(available_width)
-      
-      prefix_part = "#{timestamp} #{icon} #{sender_display} "
+
+      prefix_part = line_prefix
       subject_part = subject.strip
-      padding = " " * [available_width - prefix_part.length - subject_part.length, 0].max
+      total_dw = Rcurses.display_width(prefix_part) + Rcurses.display_width(subject_part)
+      padding = " " * [available_width - total_dw, 0].max
       finalize_line(msg, selected, prefix_part, subject_part, source_color, padding)
     end
     
@@ -1885,7 +1891,7 @@ module Heathrow
       # Show view name instantly
       render_top_bar
 
-      @load_limit = 1000
+      @load_limit = 200
       @filtered_messages = @db.get_messages({}, @load_limit, 0, light: true)
       sort_messages
       @index = 0
@@ -1911,7 +1917,11 @@ module Heathrow
         clear_inline_image
       end
 
-      return unless current_msg
+      unless current_msg
+        @panes[:right].text = ""
+        @panes[:right].refresh
+        return
+      end
 
       msg = current_msg
 
@@ -2314,18 +2324,22 @@ module Heathrow
 
     def check_load_more
       return unless @load_limit && @filtered_messages
-      n = @filtered_messages.size
-      return if n < @load_limit  # Haven't hit the limit yet
-      threshold = (@load_limit * 0.95).to_i
-      if @index >= threshold
-        load_more_messages
-      end
+      return if @filtered_messages.size < @load_limit  # Haven't hit the limit yet
+      display_size = message_count
+      return if display_size == 0
+      return unless @index >= display_size - 10
+      return if @last_autoload_index == @index
+      @last_autoload_index = @index
+      load_more_messages
     end
 
     def load_more_messages
       return unless @load_limit
+      # Remember current message so we can restore position after reload
+      cur = current_message
+      cur_id = cur['id'] if cur
       old_count = @filtered_messages.size
-      @load_limit += 1000
+      @load_limit += 200
 
       if @current_folder
         light_cols = "id, source_id, external_id, thread_id, parent_id, sender, sender_name, recipients, subject, substr(content, 1, 200) as content, timestamp, received_at, read AS is_read, starred AS is_starred, archived, labels, metadata, attachments, folder, replied"
@@ -2345,7 +2359,21 @@ module Heathrow
 
       sort_messages
       new_count = @filtered_messages.size
-      set_feedback("Loaded #{new_count} messages (+#{new_count - old_count})", 156, 2) if new_count > old_count
+      return if new_count <= old_count
+
+      # In threaded mode, set pending restore so the threaded rebuild finds our position
+      if @show_threaded && cur_id
+        @pending_restore_id = cur_id
+      end
+
+      # Force threaded view to rebuild organizer with new messages
+      if @show_threaded && respond_to?(:organize_current_messages)
+        organize_current_messages(true)
+      end
+
+      set_feedback("Loaded #{new_count} messages (+#{new_count - old_count})", 156, 2)
+      render_message_list
+      render_top_bar
     end
 
     # Ensure all feeds/channels from a source have at least some messages loaded
@@ -2512,7 +2540,7 @@ module Heathrow
 
       render_top_bar
 
-      @load_limit = 1000
+      @load_limit = 200
       @filtered_messages = @db.get_messages({is_read: false}, @load_limit, 0, light: true)
       sort_messages
       @index = 0
@@ -2559,7 +2587,7 @@ module Heathrow
         @section_order = view[:filters]['section_order'].dup
       end
 
-      @load_limit = 1000
+      @load_limit = 200
       if view && view[:filters] && !view[:filters].empty?
         apply_view_filters(view)
         sort_messages
@@ -3701,6 +3729,7 @@ module Heathrow
 
     def show_folder_browser
       @in_folder_browser = true
+      @in_favorites_browser = false
       @folder_browser_index = 0
       @panes[:top].bg = @topcolor
       @folder_collapsed ||= {}
@@ -3781,8 +3810,10 @@ module Heathrow
         @panes[:right].refresh
       end
 
-      # Update top bar
-      @panes[:top].text = " Heathrow - ".b.fg(255) + "Folder Browser".b.fg(201) + " [#{@folder_display.size} folders]".fg(246)
+      # Update top bar (preserve Favorites title if in favorites mode)
+      browser_title = @in_favorites_browser ? "Favorites" : "Folder Browser"
+      browser_color = @in_favorites_browser ? 226 : 201
+      @panes[:top].text = " Heathrow - ".b.fg(255) + browser_title.b.fg(browser_color) + " [#{@folder_display.size} folders]".fg(246)
       @panes[:top].refresh
 
       # Update bottom bar
@@ -3902,6 +3933,7 @@ module Heathrow
           render_folder_browser
         when 'q', 'ESC', "\e"
           @in_folder_browser = false
+          @in_favorites_browser = false
           render_all
           break
         else
@@ -3918,6 +3950,7 @@ module Heathrow
     # Open a specific folder and show its messages
     def open_folder(folder_name)
       @in_folder_browser = false
+      @in_favorites_browser = false
       @current_folder = folder_name
       @current_view = 'A'
       @in_source_view = false
@@ -3932,7 +3965,7 @@ module Heathrow
       @panes[:bottom].refresh
 
       # Light query with limit (full content loaded lazily when viewing)
-      @load_limit = 1000
+      @load_limit = 200
       light_cols = "id, source_id, external_id, thread_id, parent_id, sender, sender_name, recipients, subject, substr(content, 1, 200) as content, timestamp, received_at, read AS is_read, starred AS is_starred, archived, labels, metadata, attachments, folder, replied"
       results = @db.execute(
         "SELECT #{light_cols} FROM messages WHERE folder >= ? AND folder < ? ORDER BY timestamp DESC LIMIT ?",
@@ -3969,6 +4002,7 @@ module Heathrow
     def show_favorites_browser
       favorites = get_favorite_folders
       @in_folder_browser = true
+      @in_favorites_browser = true
       @folder_browser_index = 0
       @panes[:top].bg = @topcolor
       @folder_count_cache = {}  # Fresh counts each time
@@ -3999,7 +4033,7 @@ module Heathrow
         when 'k', 'UP'
           @folder_browser_index = (@folder_browser_index - 1) % @folder_display.size if @folder_display.size > 0
           render_folder_browser
-        when 'ENTER'
+        when 'l', 'RIGHT', 'ENTER'
           folder = @folder_display[@folder_browser_index]
           if folder
             open_folder(folder[:full_name])
@@ -4052,6 +4086,7 @@ module Heathrow
           end
         when 'q', 'ESC', "\e", 'h', 'LEFT'
           @in_folder_browser = false
+          @in_favorites_browser = false
           render_all
           break
         end
@@ -4314,6 +4349,9 @@ module Heathrow
             @folder_collapsed.delete(folder[:full_name])
             @folder_display = flatten_folder_tree(@folder_tree, '', 0, @folder_collapsed)
             render_save_folder_picker(idx, title)
+          elsif folder
+            render_all
+            return folder[:full_name]
           end
         when 'h', 'LEFT'
           folder = @folder_display[idx]
@@ -5679,9 +5717,16 @@ module Heathrow
 
           if result[:success]
             if orig_id
+              # Re-read metadata from DB to get current maildir_file path
+              # (poller may have renamed the file since we captured orig_msg)
+              fresh = @db.get_message(orig_id)
+              if fresh
+                orig_msg = fresh
+              end
+              # Sync disk flag first, then DB, to avoid poller race condition
+              sync_maildir_flag(orig_msg, 'R', true) if orig_msg
               @db.execute("UPDATE messages SET replied = 1 WHERE id = ?", [orig_id])
               orig_msg['replied'] = 1 if orig_msg
-              sync_maildir_flag(orig_msg, 'R', true) if orig_msg
             end
             msg = result[:message]
             if composed[:attachments] && !composed[:attachments].empty?
@@ -7670,7 +7715,9 @@ Required: URL, optional CSS selector
       Config.identity_for_folder(folder)
     end
 
-    # Colorize email content with mutt-style quote levels and signature dimming
+    # Colorize email content with mutt-style quote levels and signature dimming.
+    # Detects both ">" prefix quoting and indentation-based quoting (from HTML
+    # emails rendered via w3m, where blockquotes become indented text).
     def colorize_email_content(content)
       quote_colors = [theme[:quote1] || 114, theme[:quote2] || 180,
                       theme[:quote3] || 139, theme[:quote4] || 109]
@@ -7678,23 +7725,41 @@ Required: URL, optional CSS selector
       link_color = theme[:link] || 4     # blue (vim String)
       email_color = theme[:email] || 5   # magenta (vim Special)
       in_signature = false
+      indent_quote_level = 0  # tracks nesting from "wrote:" attribution lines
 
-      content.lines.map do |line|
+      lines = content.lines
+      result = []
+      lines.each_with_index do |line, i|
         stripped = line.rstrip
         # Detect signature delimiter (RFC 3676: "-- " on its own line)
         if stripped == '-- ' || stripped == '--'
           in_signature = true
-          colorize_links(stripped, sig_color, link_color)
+          indent_quote_level = 0
+          result << colorize_links(stripped, sig_color, link_color)
         elsif in_signature
-          colorize_links(stripped, sig_color, link_color)
+          result << colorize_links(stripped, sig_color, link_color)
         elsif stripped =~ /^(>{1,})\s?/
           level = $1.length
           color = quote_colors[[level - 1, quote_colors.length - 1].min]
-          colorize_links(stripped, color, link_color)
+          result << colorize_links(stripped, color, link_color)
         else
-          colorize_links(stripped, nil, link_color)
+          # Detect "wrote:" attribution lines (start of indented quote block)
+          if stripped =~ /\bwrote:\s*$/
+            indent_quote_level += 1
+            color = quote_colors[[indent_quote_level - 1, quote_colors.length - 1].min]
+            result << colorize_links(stripped, color, link_color)
+          elsif indent_quote_level > 0 && stripped =~ /^\s{2,}/
+            # Indented line inside a quote block
+            color = quote_colors[[indent_quote_level - 1, quote_colors.length - 1].min]
+            result << colorize_links(stripped, color, link_color)
+          else
+            # Non-indented line resets indent quoting
+            indent_quote_level = 0 if indent_quote_level > 0 && !stripped.empty?
+            result << colorize_links(stripped, nil, link_color)
+          end
         end
-      end.join("\n")
+      end
+      result.join("\n")
     end
 
     # Convert HTML to readable text via w3m
@@ -7739,12 +7804,13 @@ Required: URL, optional CSS selector
       tags.each do |tag|
         src = tag[/src=["']([^"']+)["']/i, 1]
         next unless src
-        # Skip by URL patterns
-        next if src =~ /track|pixel|spacer|beacon|\.gif$/i
-        # Skip by HTML dimensions (1x1 tracking pixels, tiny icons)
+        # Skip by URL patterns (tracking, icons, social media badges)
+        next if src =~ /track|pixel|spacer|beacon|\.gif$|icon|logo|badge|button|social|facebook|linkedin|twitter|instagram/i
+        # Skip by HTML dimensions (tracking pixels and small icons)
         w = tag[/width=["']?(\d+)/i, 1]&.to_i
         h = tag[/height=["']?(\d+)/i, 1]&.to_i
-        next if w && h && (w <= 2 || h <= 2)
+        next if w && w <= 40
+        next if h && h <= 40
         urls << src
       end
       urls
@@ -7826,7 +7892,7 @@ Required: URL, optional CSS selector
       # Clear right pane and show images
       n = image_paths.size
       label = n == 1 ? "1 image" : "#{n} images"
-      @panes[:right].text = " [#{label}]  Press I to return".fg(245)
+      @panes[:right].text = " [#{label}]  Press ESC to return".fg(245)
       @panes[:right].full_refresh  # Full refresh to clear image area
 
       pane_w = @panes[:right].w - 2
@@ -7909,7 +7975,6 @@ Required: URL, optional CSS selector
     def format_attachments(attachments)
       return nil unless attachments.is_a?(Array) && !attachments.empty?
       lines = []
-      lines << ("─" * 60).fg(238)
       lines << "Attachments:".b.fg(208)
       attachments.each_with_index do |att, i|
         name = att['name'] || att['filename'] || 'unnamed'
@@ -7930,6 +7995,17 @@ Required: URL, optional CSS selector
     end
 
     # Highlight URLs in a line, applying base_color to non-URL text
+    # Truncate a string to fit within a given display width (CJK-aware)
+    def truncate_to_width(str, max_width)
+      w = 0
+      str.each_char.with_index do |c, i|
+        cw = Rcurses.display_width(c)
+        return str[0...i] if w + cw > max_width
+        w += cw
+      end
+      str
+    end
+
     def colorize_links(line, base_color, link_color)
       url_re = %r{https?://[^\s<>\[\]()]+}
       parts = line.split(url_re, -1)

data/lib/heathrow/ui/threaded_view.rb

@@ -533,7 +533,7 @@ module Heathrow
         if (source_type || msg['source_type']) == 'rss'
           sender = ''  # Don't show sender for RSS
         else
-          sender = sender[0..14] if sender.length > 15
+          sender = truncate_to_width(sender, 14) + '…' if Rcurses.display_width(sender) > 15
         end
         
         # For Discord/Slack channels, show content not channel name
@@ -558,14 +558,14 @@ module Heathrow
         if sender.empty?
           prefix = "#{unread} "
         else
-          prefix = "#{unread} #{sender.ljust(15)} "
+          prefix = "#{unread} #{sender + ' ' * [15 - Rcurses.display_width(sender), 0].max} "
         end
 
         # Truncate content to fit single line (prefix + 2 for nflag+ind from finalize_line)
         pane_width = @panes[:left].w - 5
-        available = pane_width - prefix.length
-        if display_content && display_content.length > available && available > 0
-          display_content = display_content[0..(available-2)] + "…"
+        available = pane_width - Rcurses.display_width(prefix)
+        if display_content && Rcurses.display_width(display_content) > available && available > 0
+          display_content = truncate_to_width(display_content, available - 1) + "…"
         end
 
         finalize_line(msg, selected, prefix, display_content, color)
@@ -574,17 +574,17 @@ module Heathrow
       # Format a thread reply
       def format_thread_reply(msg, selected, indent)
         sender = display_sender(msg)
-        sender = sender[0..12] if sender.length > 12
-        
+        sender = truncate_to_width(sender, 12) if Rcurses.display_width(sender) > 12
+
         content = msg['content'] || ''
         content = content.gsub(/\n/, ' ')
-        
+
         # Truncate based on pane width
         pane_width = @panes[:left].w - 5
-        used_space = 2 + indent.length + 3 + sender.length + 2  # arrow + indent + └─ + sender + : 
+        used_space = 2 + Rcurses.display_width(indent) + 3 + Rcurses.display_width(sender) + 2
         available = pane_width - used_space
-        if content.length > available && available > 0
-          content = content[0..(available-2)] + "…"
+        if Rcurses.display_width(content) > available && available > 0
+          content = truncate_to_width(content, available - 1) + "…"
         end
         
         prefix = "#{indent}└─ #{sender}: "
@@ -599,17 +599,20 @@ module Heathrow
 
         timestamp = (parse_timestamp(msg['timestamp']) || "").ljust(6)
         sender_max = 15
-        sender = sender.length > sender_max ? sender[0..sender_max-2] + '…' : sender.ljust(sender_max)
+        sdw = Rcurses.display_width(sender)
+        sender = sdw > sender_max ? truncate_to_width(sender, sender_max - 1) + '…' : sender + ' ' * [sender_max - sdw, 0].max
         child_indent = indent.empty? ? "" : "    "
         prefix = "#{child_indent}#{timestamp} #{icon} #{sender} "
 
         content = msg['subject'] || msg['content'] || ''
+        content = content.dup if content.frozen?
+        content = content.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') rescue content.force_encoding('UTF-8').scrub('?')
         content = content.gsub(/\n/, ' ')
 
-        used_space = prefix.length + 1
+        used_space = Rcurses.display_width(prefix) + 1
         available = pane_width - used_space
-        if content.length > available && available > 0
-          content = content[0..(available-2)] + "…"
+        if Rcurses.display_width(content) > available && available > 0
+          content = truncate_to_width(content, available - 1) + "…"
         end
 
         color = get_source_color(msg)
@@ -623,7 +626,8 @@ module Heathrow
 
         # Truncate sender to fixed width
         sender_max = 15
-        sender = sender.length > sender_max ? sender[0..sender_max-2] + '…' : sender.ljust(sender_max)
+        sdw = Rcurses.display_width(sender)
+        sender = sdw > sender_max ? truncate_to_width(sender, sender_max - 1) + '…' : sender + ' ' * [sender_max - sdw, 0].max
 
         content = msg['content'] || ''
         content = content.gsub(/\n/, ' ')
@@ -633,9 +637,9 @@ module Heathrow
 
         # Truncate content to fit single line
         pane_width = @panes[:left].w - 5
-        available = pane_width - prefix.length
-        if content.length > available && available > 0
-          content = content[0..(available-2)] + "…"
+        available = pane_width - Rcurses.display_width(prefix)
+        if Rcurses.display_width(content) > available && available > 0
+          content = truncate_to_width(content, available - 1) + "…"
         end
 
         color = get_source_color(msg)

data/lib/heathrow/version.rb

@@ -1,3 +1,3 @@
 module Heathrow
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heathrow
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Geir Isene