Changeset 7045

Timestamp:

02/22/08 22:52:30 (5 years ago)

Author:

mootoh

Message:

platform/quicksilver/TwitterPlugin: http_proxy env supported, collect all following, status post to be async.

Location:

platform/quicksilver/TwitterPlugin

Files:

• Info.plist (modified) (1 diff)
• TwitterPluginSource.rb (modified) (3 diffs)
• qs_action.rb (modified) (5 diffs)

platform/quicksilver/TwitterPlugin/Info.plist

@@ -16 +16 @@
         <string>BNDL</string>
         <key>CFBundleVersion</key>
-        <string>F7</string>
+        <string>109</string>
         <key>NSPrincipalClass</key>
         <string>RCLoader</string>

platform/quicksilver/TwitterPlugin/TwitterPluginSource.rb

@@ -43 +43 @@
       url = 'http://' + screen_name + ':' + password +
             '@twitter.com/statuses/friends/' + screen_name + '.json'
+      #Shared.logger.info(url)
 
       if count > 1
@@ -49 +50 @@
       count += 1
 
-      friends = JSON.parse(open(url).read)
-      friends.each do |friend|
-        Shared.logger.info(friend['screen_name'])
-        obj = OSX::QSObject.objectWithName(friend['screen_name'])
-        obj.setObject_forType('', 'TwitterPluginType')
-        obj.setPrimaryType('TwitterPluginType')
-        objects.push(obj)
+      friends = []
+      begin
+        sio = open(url)
+        #Shared.logger.info('1')
+        res = sio.read
+        #Shared.logger.info('2')
+        unless res
+          #Shared.logger.info('2-5')
+          Shared.logger.info('no friends retrieved.')
+          break
+        end
+        #Shared.logger.info('3')
+        #Shared.logger.info(res.class.to_s)
+
+        friends = JSON.parse(res)
+        #Shared.logger.info('4')
+        friends.each do |friend|
+          #Shared.logger.info(friend['screen_name'])
+          obj = OSX::QSObject.objectWithName(friend['screen_name'])
+          obj.setObject_forType('', 'TwitterPluginType')
+          obj.setPrimaryType('TwitterPluginType')
+          objects.push(obj)
+        end
+
+        @friends += friends
+      rescue => e
+        Shared.logger.info('objectsForEntry : exception: ' + e.to_s)
+        []
       end
-
-      @friends += friends
 
       break if (friends.size < 100)
@@ -77 +97 @@
     return false if @friends.empty?
 
-    Shared.logger.info('1')
-
     her = @friends.find {|x| x['screen_name'] == object.name.to_s}
     img = OSX::NSImage.alloc.initWithContentsOfURL(OSX::NSURL.URLWithString(her['profile_image_url']))

platform/quicksilver/TwitterPlugin/qs_action.rb

@@ -10 +10 @@
 require 'cgi'
 require 'kconv'
+require 'net/http'
+require 'uri'
 
 # 
@@ -29 +31 @@
   end
 
-  def make_request(content)
+  def name_and_pass
+    dict = OSX::NSUserDefaultsController.sharedUserDefaultsController.values;
+    screen_name = dict.valueForKey("TwitterPreference.screenName")
+    password    = dict.valueForKey("TwitterPreference.password")
+    [screen_name.to_s, password]
+  end
+
+  def make_request_with_cocoa(content)
     u = 'http://' + name_pass + '@twitter.com/statuses/update.json'
-    # Shared.logger.info(u.to_s)
+    Shared.logger.info(u.to_s)
 
     req = OSX::NSMutableURLRequest.alloc.initWithURL(OSX::NSURL.URLWithString(u))
@@ -39 +48 @@
     req
   end
+
+  def request_with_cocoa(req)
+    con = OSX::NSURLConnection.connectionWithRequest_delegate(req, self)
+    Shared.logger.info(con ? "request succeeded" : "request failed")
+  end
+
+  def make_request(content)
+    req = Net::HTTP::Post.new('/statuses/update.json')
+    np = name_and_pass
+    req.basic_auth np[0], np[1]
+    req.body = Kconv.toutf8(content)
+    req
+  end
+
+  def request(req)
+    http = if ENV['http_proxy']
+      u = URI.parse(ENV['http_proxy'])
+      Net::HTTP::Proxy(u.host, u.port).new('twitter.com')
+    else
+      Net::HTTP.new('twitter.com')
+    end
+
+    res = http.request(req)
+    Shared.logger.info(res.message)
+    res
+  end
     
   def post_to(arg, friend)
     str = arg.stringValue.to_s
     if str == '/reload'
+      Shared.logger.info('reload')
       reload
       return arg
@@ -54 +90 @@
     begin
       content = 'source=QSTwitter&status=' + CGI.escape(str)
-      req = make_request(content)
-      con = OSX::NSURLConnection.connectionWithRequest_delegate(req, self)
-      # Shared.logger.info(con ? "request succeeded" : "request failed")
+      Thread.new {
+        request(make_request(content))
+      }
     rescue
     end
@@ -74 +110 @@
 
   #
-  # callbacks
+  # callbacks for Cocoa HTTP request
   #
   def connection_didReceiveResponse(con, res)
-    #Shared.logger.info("connection_didReceiveResponse")
+    Shared.logger.info('connection_didReceiveResponse' + res.statusCode.to_s)
   end
 
   def connection_didReceiveData(con, data)
-    #Shared.logger.info("connection_didReceiveData")
+    Shared.logger.info('connection_didReceiveData' + data.to_s)
     #OSX::QSShowNotifierWithAttributes({'QSTwitter' => OSX::QSNotifierTitle, 'posted' => OSX::QSNotifierText})
   end
 
   def connection_didFailWithErro(con, err)
-    #Shared.logger.info("connection_didFailWithErro")
+    Shared.logger.info('connection_didFailWithErro' + err.to_s)
   end
 
   def connectiondidFinishLoading(con)
-    #Shared.logger.info("connectiondidFinishLoading")
+    Shared.logger.info("connectiondidFinishLoading")
   end
 end # Action