X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fsup%2Fmessage-chunks.rb;h=ba8b84641f294d3820896ddb53f06dd2169c76b9;hb=0cf173b0753bbe7987cb220bd6230eb25fd084bb;hp=e96dab408240ebf331c263e829e6fd24dfaebd3b;hpb=f1a13dd2a9b9b8259d29d0ed7523b21a5fd1fff8;p=sup diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb index e96dab4..ba8b846 100644 --- a/lib/sup/message-chunks.rb +++ b/lib/sup/message-chunks.rb @@ -1,3 +1,5 @@ +require 'tempfile' + ## Here we define all the "chunks" that a message is parsed ## into. Chunks are used by ThreadViewMode to render a message. Chunks ## are used for both MIME stuff like attachments, for Sup's parsing of @@ -5,7 +7,7 @@ ## notices like "this message was decrypted" or "this message contains ## a valid signature"---basically, anything we want to differentiate ## at display time. - +## ## A chunk can be inlineable, expandable, or viewable. If it's ## inlineable, #color and #lines are called and the output is treated ## as part of the message text. This is how Text and one-line Quotes @@ -15,13 +17,27 @@ ## #patina_text are called to generate a "patina" (a one-line widget, ## basically), and the user can press enter to toggle the display of ## the chunk content, which is generated from #color and #lines as -## above. This is how Quote, Signature, and most widgets work. +## above. This is how Quote, Signature, and most widgets +## work. Exandable chunks can additionally define #initial_state to be +## :open if they want to start expanded (default is to start collapsed). ## ## If it's not expandable but is viewable, a patina is displayed using ## #patina_color and #patina_text, but no toggling is allowed. Instead, ## if #view! is defined, pressing enter on the widget calls view! and ## (if that returns false) #to_s. Otherwise, enter does nothing. This -## is how non-inlineable attachments work. +## is how non-inlineable attachments work. +## +## Independent of all that, a chunk can be quotable, in which case it's +## included as quoted text during a reply. Text, Quotes, and mime-parsed +## attachments are quotable; Signatures are not. + +## monkey-patch time: make temp files have the right extension +class Tempfile + def make_tmpname basename, n + sprintf '%d-%d-%s', $$, n, basename + end +end + module Redwood module Chunk @@ -30,35 +46,57 @@ module Chunk Executes when decoding a MIME attachment. Variables: content_type: the content-type of the message - filename: the filename of the attachment as saved to disk (generated - on the fly, so don't call more than once) + filename: the filename of the attachment as saved to disk sibling_types: if this attachment is part of a multipart MIME attachment, an array of content-types for all attachments. Otherwise, the empty array. Return value: The decoded text of the attachment, or nil if not decoded. EOS + + HookManager.register "mime-view", < content_type, - :filename => lambda { write_to_disk }, - :sibling_types => sibling_types - text.split("\n") if text + HookManager.run "mime-decode", :content_type => content_type, + :filename => lambda { write_to_disk }, + :sibling_types => sibling_types end + + @lines = nil + if text + @lines = text.gsub("\r\n", "\n").gsub(/\t/, " ").gsub(/\r/, "").split("\n") + @quotable = true + end end def color; :none end @@ -75,15 +113,24 @@ EOS ## something we can display inline. otherwise, it's viewable. def inlineable?; false end def expandable?; !viewable? end + def initial_state; :open end def viewable?; @lines.nil? end + def view_default! path + cmd = "/usr/bin/run-mailcap --action=view '#{@content_type}:#{path}' > /dev/null 2> /dev/null" + Redwood::log "running: #{cmd.inspect}" + system cmd + $? == 0 + end + def view! path = write_to_disk - system "/usr/bin/run-mailcap --action=view #{@content_type}:#{path} >& /dev/null" - $? == 0 + ret = HookManager.run "mime-view", :content_type => @content_type, + :filename => path + ret || view_default!(path) end def write_to_disk - file = Tempfile.new "redwood.attachment" + file = Tempfile.new(@filename || "sup-attachment") file.print @raw_content file.close file.path @@ -103,11 +150,14 @@ EOS @lines = lines.map { |l| l.chomp.wrap WRAP_LEN }.flatten # wrap ## trim off all empty lines except one - lines.pop while lines.last =~ /^\s*$/ + @lines.pop while @lines.length > 1 && @lines[-1] =~ /^\s*$/ && @lines[-2] =~ /^\s*$/ end - def color; :none end def inlineable?; true end + def quotable?; true end + def expandable?; false end + def viewable?; false end + def color; :none end end class Quote @@ -117,7 +167,10 @@ EOS end def inlineable?; @lines.length == 1 end + def quotable?; true end def expandable?; !inlineable? end + def viewable?; false end + def patina_color; :quote_patina_color end def patina_text; "(#{lines.length} quoted lines)" end def color; :quote_color end @@ -130,24 +183,34 @@ EOS end def inlineable?; @lines.length == 1 end + def quotable?; false end def expandable?; !inlineable? end + def viewable?; false end + def patina_color; :sig_patina_color end def patina_text; "(#{lines.length}-line signature)" end def color; :sig_color end end - class EnclosedMessageNotice - attr_reader :from, :lines + class EnclosedMessage + attr_reader :lines def initialize from, body @from = from @lines = body.split "\n" end + def from + @from ? @from.longname : "unknown sender" + end + def inlineable?; false end + def quotable?; false end def expandable?; true end + def initial_state; :open end + def viewable?; false end def patina_color; :generic_notice_patina_color end - def patina_text; "Begin enclosed message from #{@from.longname} (#{@lines.length} lines)" end + def patina_text; "Begin enclosed message from #{from} (#{@lines.length} lines)" end def color; :quote_color end end @@ -171,6 +234,7 @@ EOS def color; patina_color end def inlineable?; false end + def quotable?; false end def expandable?; !@lines.empty? end def viewable?; false end end