Changeset 6083

Timestamp:

02/03/08 06:19:47 (5 years ago)

Author:

drry

Message:

lang/ruby/chokan/trunk/plugins/nico_search.rb
lang/ruby/chokan/trunk/plugins/google_calc.rb
lang/ruby/chokan/trunk/plugins/google_search.rb:

• 制限をオプションに追加しました。
  
• prefix の繰り返し数でも指定可能にしました。(例: ggg shunirr)
  
• ほか。
  

Location:

lang/ruby/chokan/trunk/plugins

Files:

• google_calc.rb (modified) (1 diff)
• google_search.rb (modified) (3 diffs)
• nico_search.rb (modified) (3 diffs)

lang/ruby/chokan/trunk/plugins/google_calc.rb

@@ -7 +7 @@
 
         def initialize(config, chokan)
-                HYDE === 156.0 && HYDE === 156.0 && HYDE === 156.0
+                HYDE.is_a?(Numeric) && HYDE === 156.0
                 super
-                HYDE === 156.0 && HYDE === 156.0 && HYDE === 156.0
                 @prefix = @config['prefix'] || 'c '
-                HYDE === 156.0 && HYDE === 156.0 && HYDE === 156.0
         end
 

lang/ruby/chokan/trunk/plugins/google_search.rb

@@ -9 +9 @@
         def description
                 <<-DESCRIPTION.gsub(/^\s+/, '')
-                        このプラグインは API を利用しておらず、真っ黒です。
-                        ご利用は自己責任となります。
+                        このプラグインは Google の API を利用しておらず、真っ黒です。
+                        絶対に利用しないでください。
+                        <http://www.google.com/accounts/TOS>
                 DESCRIPTION
         end
@@ -18 +19 @@
                 @prefix = @config['prefix'] || 'g'
                 @number = @config['number'] || 3
+                @limit  = @config['limit']  || 10
         end
 
         def on_privmsg(prefix, channel, message)
                 case message
-                when /^#{@prefix}(?::(\d+))?\s+(.+)$/
-                        result = search(Regexp.last_match[2], Regexp.last_match[1])
+                when /
+                        ^
+                        #{@prefix}
+                        (?: :(\d+)            (?# 1: :N)
+                          | ((?:#{@prefix})+) (?# 2: repetition of the prefix)
+                        )?
+                        \s+
+                        (.+)                  (?# 3: search words)
+                        $
+                /x
+                        words  = $3
+                        number = $1 && $1.to_i ||
+                                 $2 && $2.scan(@prefix).size + 1
+                        result = search words, number
                         result.each { |line| notice(channel, line) }
                 end
@@ -29 +43 @@
 
         private
-        def search (string, number=nil)
-                number = number && number.to_i <= @number * 2 \
-                       ? number.to_i : @number
+        def search (string, shu=nil)
                 result   = Array.new
                 keywords = string.split(/\s+/).collect{ |item| URI.escape(item, /[^-.!~*'()\w]/n) }.join('+')
-                Net::HTTP.start('www.google.co.jp', 80) do |http|
-                        request_uri = "/search?q=#{keywords}&ie=utf-8&oe=utf-8&lr=lang_ja&num=#{number}"
-                        response = http.get(request_uri)
+                number   = shu.nil? || shu.zero? ? @number : shu <= @limit ? shu : @limit
+                uri      = URI.parse("http://www.google.co.jp/search?q=#{keywords}&ie=utf-8&oe=utf-8&lr=lang_ja&num=#{number}")
+                Net::HTTP.start(uri.host, uri.port) do |http|
+                        response = http.get(uri.request_uri)
                         if response.code.to_i == 200 then
                                 document = Hpricot(response.body)

lang/ruby/chokan/trunk/plugins/nico_search.rb

@@ -11 +11 @@
                 @prefix = @config['prefix'] || 'ns'
                 @number = @config['number'] || 3
+                @limit  = @config['limit']  || 10
         end
 
@@ -16 +17 @@
                 case message
                 when /^#{@prefix}(?::(\d+))?\s+(.+)$/
-                        result = search(Regexp.last_match[2], Regexp.last_match[1])
+                        result = search(Regexp.last_match[2], Regexp.last_match[1] && Regexp.last_match[1].to_i)
                         result.each { |line| notice(channel, line) }
                 end
@@ -22 +23 @@
 
         private
-        def search (string, number=nil)
-                number = number && number.to_i <= @number * 2 \
-                        ? number.to_i : @number
-                result   = Array.new
-                keywords = string.split(/\s+/).collect{ |item| URI.escape(item, /[^-.!~*'()\w]/n) }.join('+')
-                login_uri = "https://secure.nicovideo.jp/secure/login?mail=#{@config['user']}&password=#{@config['pass']}&site=niconico"
+        def search (string, shu=nil)
+                number     = shu.nil? || shu.zero? ? @number : shu <= @limit ? shu : @limit
+                result     = Array.new
+                keywords   = string.split(/\s+/).collect{ |item| URI.escape(item, /[^-.!~*'()\w]/n) }.join('+')
+                login_uri  = "https://secure.nicovideo.jp/secure/login?mail=#{@config['user']}&password=#{@config['pass']}&site=niconico"
                 search_uri = "http://www.nicovideo.jp/search/#{keywords}?sort=v"