Changeset 7079 for platform/tdiary/util

Timestamp:

02/24/08 02:22:08 (9 months ago)

Author:

drry

Message:

platform/tdiary/util/posttdiary/posttdiary.rb:

• Net::HTTP#get/post の HTTP ヘッダがハッシュになっていなかったのを直しました。
  
• 正規表現を修正しました。
  
• いくつかの冗長な部分を簡略化しました。
  
• インデントの修整をしました。
  
• ほか。
  

Files:

• platform/tdiary/util/posttdiary/posttdiary.rb (modified) (13 diffs)

platform/tdiary/util/posttdiary/posttdiary.rb

@@ -9 +9 @@
 
 def usage
-        text = <<-TEXT
+        <<-TEXT.gsub( /^\t{2}/, '' )
                 #{File::basename __FILE__}: update tDiary via e-mail.
                 usage: ruby #{File::basename __FILE__} [options] <url> [user] [passwd]
@@ -27 +27 @@
                   --use-subject,  -s: use mail subject to subtitle.
                           and insert image between subtitle and body.
-  TEXT
-  text.gsub( /\t/, '' )
+        TEXT
 end
 
@@ -34 +33 @@
         image_path = []
         Dir.foreach( path ) do |file|
-                if file =~ /(\d{8,})_(\d+)\.(.*)/ then
-                        if $1 == date then
-                                image_path[$2.to_i] = file
-                        end
+                if file =~ /(\d{8,})_(\d+)\./ and $1 == date then
+                        image_path[$2.to_i] = file
                 end
         end
@@ -71 +68 @@
         use_subject = false
         parser.set_options(
-                ['--image-path', '-i', GetoptLong::REQUIRED_ARGUMENT],
-                ['--image-url', '-u', GetoptLong::REQUIRED_ARGUMENT],
+                ['--image-path',   '-i', GetoptLong::REQUIRED_ARGUMENT],
+                ['--image-url',    '-u', GetoptLong::REQUIRED_ARGUMENT],
                 ['--image-format', '-f', GetoptLong::REQUIRED_ARGUMENT],
-                ['--use-subject', '-s', GetoptLong::NO_ARGUMENT]
+                ['--use-subject',  '-s', GetoptLong::NO_ARGUMENT]
         )
         begin
@@ -93 +90 @@
         end
         raise usage if (image_dir and not image_url) or (not image_dir and image_url)
-        if image_dir then
-                image_dir += '/' unless %r[/$] =~ image_dir
-        end
-        if image_url then
-                image_url += '/' unless %r[/$] =~ image_url
-        end
+        image_dir.sub!( %r[/*$], '/' ) if image_dir
+        image_url.sub!( %r[/*$], '/' ) if image_url
         url = ARGV.shift
         if %r|http://([^:/]*):?(\d*)(/.*)| =~ url then
@@ -109 +102 @@
                 raise 'bad url.'
         end
-        
+
         user = ARGV.shift
         pass = ARGV.shift
@@ -119 +112 @@
         mail = NKF::nkf( '-m0 -Xed', ARGF.read )
         raise "#{File::basename __FILE__}: no mail text." if not mail or mail.length == 0
-        
-        head, body = mail.split( /\r*\n\r*\n/, 2 )
+
+        head, body = mail.split( /(?:\r?\n){2}, 2 )
 
         if head =~ /Content-Type:\s*Multipart\/Mixed.*boundary=\"(.*?)\"/im then
@@ -126 +119 @@
                         raise "no --image-path and --image-url options"
                 end
-        
+
                 bound = "--" + $1
                 body_sub = body.split( Regexp.compile( Regexp.escape( bound ) ) )
                 body_sub.each do |b|
-                        sub_head, sub_body = b.split( /\r*\n\r*\n/, 2 )
-
-                        next unless sub_head =~ /Content-Type/
+                        sub_head, sub_body = b.split( /(?:\r?\n){2}/, 2 )
+
+                        next unless sub_head =~ /Content-Type:/i
 
                         if sub_head =~ %r[^Content-Type:\s*text/plain]i then
                                 @body = sub_body
-                        elsif sub_head =~ %r[^Content-Type:\s*(image/|application/octet-stream).*name=".*(\..*?)"]im
-                                image_ext = $2.downcase
-                                now = Time::now
-                                list = image_list( now.strftime( "%Y%m%d" ), image_dir )
+                        elsif sub_head =~ %r[
+                                ^Content-Type:\s*
+                                (?:image/ | application/octet-stream).+
+                                name=".+(\.[^.]+?)" (?# 1: extension)
+                        ]imx
+                                image_ext  = $1.downcase
+                                now        = Time::now
+                                list       = image_list( now.strftime( "%Y%m%d" ), image_dir )
                                 image_name = now.strftime( "%Y%m%d" ) + "_" + list.length.to_s + image_ext
                                 File::umask( 022 )
@@ -151 +148 @@
                                 if /\.bmp$/i =~ image_name then
                                         bmp_to_png( image_dir + image_name )
-                                        image_name.sub!( /\.bmp$/, '.png' )
+                                        image_name.sub!( /\.bmp$/i, '.png' )
                                 end
-                                @image_name = [] unless @image_name
+                                @image_name ||= []
                                 @image_name << image_name
                         end
                 end
-        elsif head =~ /^Content-Type:\s*text\/plain/i 
+        elsif head =~ /^Content-Type:\s*text\/plain/i
                 @body = body
         else
@@ -166 +163 @@
                 img_src = ""
                 @image_name.each do |i|
-                        serial = i.sub( /^\d+_(\d+)\..*$/, '\1' )
+                        serial = i.sub( /^\d+_(\d+)\./n, '\1' )
                         img_src += image_format.gsub( /\$0/, serial ).gsub( /\$1/, image_url + i )
                 end
                 if use_subject then
-                        @body = "#{img_src}\n#{(@body || '').sub( /\n+\z/, '' )}"
+                        @body = "#{img_src}\n#{@body}".sub( /(?:\r?\n|\r)+\z/, "\n" )
                 else
-                        @body = "#{(@body || '').sub( /\n+\z/, '' )}\n#{img_src}"
+                        @body = "#{@body}".sub( /(?:\r?\n|\r)+\z/, "\n" ) << img_src
                 end
         end
@@ -178 +175 @@
         addr = nil
         if /^To:(.*)$/ =~ head then
-                to = $1.strip
-                if /.*?\s*<(.*)>/ =~ to then
-                        addr = $1
-                elsif /(.*?)\s*\(.*\)/ =~ to
-                        addr = $1
+                addr = case to = $1.strip
+                when /.*?\s*<(.+)>/
+                when /(.+?)\s*\(.*\)/
+                        $1
                 else
-                        addr = to
-                end
-        end
-        
+                        to
+                end
+        end
+
         if /([^-]+)-(.*)@/ =~ addr then
-                user = $1 unless user
-                pass = $2 unless pass
-        end
-        
+                user ||= $1
+                pass ||= $2
+        end
+
         raise "no user." unless user
         raise "no passwd." unless pass
-        
+
         subject = ''
         nextline = false
-        headlines = head.split( /[\r\n]+/ )
+        headlines = head.split( /(?:\r?\n|\r)+/ )
         for n in 0 .. headlines.size-1
                 if nextline then
@@ -208 +204 @@
                         end
                 end
-                if /^Subject:(.*)$/ =~ headlines[n] then
-                        s = $1.sub( /^\s+/, '' )
-                        subject = NKF::nkf( '-eXd', s )
+                if /^Subject:\s*(.+)$/i =~ headlines[n] then
+                        subject = NKF::nkf( '-eXd', $1 )
                         nextline = true
                 end
@@ -230 +225 @@
         Net::HTTP.start( host, port ) do |http|
                 auth = ["#{user}:#{pass}"].pack( 'm' ).strip
-                res, = http.get( cgi,
+                res, = http.get( cgi, {
                                 'Authorization' => "Basic #{auth}",
-                                'Referer' => url )
+                                'Referer'       => url })
                 if %r|<input type="hidden" name="csrf_protection_key" value="([^"]+)">| =~ res.body then
                         data << "&csrf_protection_key=#{CGI::escape( CGI::unescapeHTML( $1 ) )}"
                 end
-                res, = http.post( cgi, data,
+                res, = http.post( cgi, data, {
                                 'Authorization' => "Basic #{auth}",
-                                'Referer' => url )
+                                'Referer'       => url })
         end