Changeset 7088 for platform/tdiary/util

Timestamp:

02/24/08 12:08:32 (9 months ago)

Author:

drry

Message:

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

• i've made a mistake about the "case" statement in changeset:7079.
  
• backouted some indents to previous coding style.
  

Files:

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

platform/tdiary/util/posttdiary/posttdiary.rb

@@ -68 +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 +93 @@
         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.'
@@ -134 +132 @@
                                 name=".+(\.[^.]+?)" (?# 1: extension)
                         ]imx
-                                image_ext  = $1.downcase
-                                now        = Time::now
-                                list       = image_list( now.strftime( "%Y%m%d" ), image_dir )
+                                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 )
@@ -176 +174 @@
         if /^To:(.*)$/ =~ head then
                 addr = case to = $1.strip
-                when /.*?\s*<(.+)>/
-                when /(.+?)\s*\(.*\)/
+                when /.*?\s*<(.+)>/, /(.+?)\s*\(.*\)/
                         $1
                 else
@@ -227 +224 @@
                 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 ) )}"
@@ -233 +230 @@
                 res, = http.post( cgi, data, {
                                 'Authorization' => "Basic #{auth}",
-                                'Referer'       => url })
+                                'Referer' => url })
         end