From d4299288f28af513dbddadd5a68dfa4e7a15edac Mon Sep 17 00:00:00 2001 From: wmorgan Date: Wed, 19 Sep 2007 15:40:36 +0000 Subject: [PATCH] global search and replace: raw_full_message -> raw_message git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@587 5c8cc53c-5e98-4d25-b20a-d8db53a31250 --- bin/sup-sync-back | 2 +- lib/sup/draft.rb | 2 +- lib/sup/imap.rb | 6 +++--- lib/sup/maildir.rb | 2 +- lib/sup/mbox/loader.rb | 8 ++++---- lib/sup/mbox/ssh-loader.rb | 2 +- lib/sup/message.rb | 10 +++++----- lib/sup/modes/thread-view-mode.rb | 2 +- lib/sup/source.rb | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/sup-sync-back b/bin/sup-sync-back index ff4aa3a..57bebbe 100644 --- a/bin/sup-sync-back +++ b/bin/sup-sync-back @@ -8,7 +8,7 @@ require "sup" ## save a message 'm' to an open file pointer 'fp' def save m, fp - m.source.each_raw_full_message_line(m.source_info) { |l| fp.print l } + m.source.each_raw_message_line(m.source_info) { |l| fp.print l } end def die msg $stderr.puts "Error: #{msg}" diff --git a/lib/sup/draft.rb b/lib/sup/draft.rb index 8a303b4..d5d61ee 100644 --- a/lib/sup/draft.rb +++ b/lib/sup/draft.rb @@ -99,7 +99,7 @@ class DraftLoader < Source ret end - def raw_full_message offset + def raw_message offset IO.readlines(fn_for_offset(offset)).join end diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb index 24b4e6e..42937bd 100644 --- a/lib/sup/imap.rb +++ b/lib/sup/imap.rb @@ -106,7 +106,7 @@ class IMAP < Source end def load_message id - RMail::Parser.read raw_full_message(id) + RMail::Parser.read raw_message(id) end def raw_header id @@ -118,11 +118,11 @@ class IMAP < Source end synchronized :raw_header - def raw_full_message id + def raw_message id unsynchronized_scan_mailbox get_imap_fields(id, 'RFC822').first.gsub(/\r\n/, "\n") end - synchronized :raw_full_message + synchronized :raw_message def connect return if @imap diff --git a/lib/sup/maildir.rb b/lib/sup/maildir.rb index df1ee8c..976dabb 100644 --- a/lib/sup/maildir.rb +++ b/lib/sup/maildir.rb @@ -60,7 +60,7 @@ class Maildir < Source ret end - def raw_full_message id + def raw_message id scan_mailbox with_file_for(id) { |f| f.readlines.join } end diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb index 29ca62b..8475228 100644 --- a/lib/sup/mbox/loader.rb +++ b/lib/sup/mbox/loader.rb @@ -86,19 +86,19 @@ class Loader < Source ret end - def raw_full_message offset + def raw_message offset ret = "" - each_raw_full_message_line(offset) { |l| ret += l } + each_raw_message_line(offset) { |l| ret += l } ret end ## apparently it's a million times faster to call this directly if ## we're just moving messages around on disk, than reading things - ## into memory with raw_full_message. + ## into memory with raw_message. ## ## i hoped never to have to move shit around on disk but ## sup-sync-back has to do it. - def each_raw_full_message_line offset + def each_raw_message_line offset @mutex.synchronize do @f.seek offset yield @f.gets diff --git a/lib/sup/mbox/ssh-loader.rb b/lib/sup/mbox/ssh-loader.rb index bea585e..e422a48 100644 --- a/lib/sup/mbox/ssh-loader.rb +++ b/lib/sup/mbox/ssh-loader.rb @@ -65,7 +65,7 @@ class SSHLoader < Source end end - [:start_offset, :load_header, :load_message, :raw_header, :raw_full_message].each do |meth| + [:start_offset, :load_header, :load_message, :raw_header, :raw_message].each do |meth| define_method(meth) { |*a| safely { @loader.send meth, *a } } end end diff --git a/lib/sup/message.rb b/lib/sup/message.rb index cf3e826..cb4b5b6 100644 --- a/lib/sup/message.rb +++ b/lib/sup/message.rb @@ -308,13 +308,13 @@ EOS with_source_errors_handled { @source.raw_header @source_info } end - def raw_full_message - with_source_errors_handled { @source.raw_full_message @source_info } + def raw_message + with_source_errors_handled { @source.raw_message @source_info } end - ## much faster than raw_full_message - def each_raw_full_message_line &b - with_source_errors_handled { @source.each_raw_full_message_line(@source_info, &b) } + ## much faster than raw_message + def each_raw_message_line &b + with_source_errors_handled { @source.each_raw_message_line(@source_info, &b) } end def content diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb index adf4c0b..897850c 100644 --- a/lib/sup/modes/thread-view-mode.rb +++ b/lib/sup/modes/thread-view-mode.rb @@ -210,7 +210,7 @@ class ThreadViewMode < LineCursorMode fn = BufferManager.ask_for_filename :filename, "Save message to file: " return unless fn save_to_file(fn) do |f| - m.each_raw_full_message_line { |l| f.print l } + m.each_raw_message_line { |l| f.print l } end end end diff --git a/lib/sup/source.rb b/lib/sup/source.rb index d56f25a..50fc163 100644 --- a/lib/sup/source.rb +++ b/lib/sup/source.rb @@ -31,7 +31,7 @@ class Source ## - load_header offset ## - load_message offset ## - raw_header offset - ## - raw_full_message offset + ## - raw_message offset ## - check ## - next (or each, if you prefer): should return a message and an ## array of labels. -- 2.45.2