Changeset 7804 for platform/tdiary/util

Timestamp:

03/11/08 21:01:14 (9 months ago)

Author:

hsbt

Message:

platform/tdiary/util/posttdiary/posttdiary: rollback to r7629,and support utf-8

Files:

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

platform/tdiary/util/posttdiary/posttdiary.rb

@@ -2 +2 @@
 $KCODE= 'u'
 #
-# posttdiary: update tDiary via e-mail. $Revision: 1.5.2.1 $
+# posttdiary: update tDiary via e-mail. $Revision: 1.5 $
 #
 # Copyright (C) 2002, All right reserved by TADA Tadashi <sho@spc.gr.jp>
@@ -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
@@ -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
+        if %r|http://([^:/]+)(?::(\d+))?(/.*)| =~ url then
                 host = $1
-                port = $2.to_i
-                cgi = $3
-                raise 'bad url.' if not host or not cgi
-                port = 80 if port == 0
+                port = ($2 || 80).to_i
+                cgi  = $3
         else
                 raise 'bad url.'
         end
-        
+
         user = ARGV.shift
         pass = ARGV.shift
@@ -117 +108 @@
         image_name = nil
 
-        mail = NKF::nkf( '-m0 -wXd', ARGF.read )
+        mail = NKF::nkf( '-m0 -Xwd', 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 +117 @@
                         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
+                        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 )
@@ -151 +146 @@
                                 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
-                raise "can not read this mail"
+                raise "cannot read this mail"
         end
 
@@ -166 +161 @@
                 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 +173 @@
         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*<(.+)>/, /(.+?)\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 +201 @@
                         end
                 end
-                if /^Subject:(.*)$/ =~ headlines[n] then
-                        s = $1.sub( /^\s+/, '' )
-                        subject = NKF::nkf( '-wXd', s )
+                if /^Subject:\s*(.+)$/i =~ headlines[n] then
+                        subject = NKF::nkf( '-wXd', $1 )
                         nextline = true
                 end
@@ -230 +222 @@
         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
 
 rescue
         $stderr.puts $!
+        $stderr.puts $@.join( "\n" )
         File::delete( image_dir + image_name ) if image_dir and image_name and FileTest::exist?( image_dir + image_name )
         exit 1