cpsn 0.6.2 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/bin/cpsn

@@ -3,7 +3,7 @@
 # cpsn - Query Friend status on the Playstation Network (tm)
 #
 # Author:: James Bowes <jbowes@repl.ca>
-# Copyright:: Copyright (C) 2009 James Bowes
+# Copyright:: Copyright (C) 2009 - 2011 James Bowes
 
 require 'rubygems'
 require 'mechanize'
@@ -13,9 +13,8 @@ require 'optparse'
 require 'logger'
 require 'set'
 
-$login_url = "https://store.playstation.com/external/index.vm?returnURL=https%3a%2f%2fsecureus.playstation.com%2fRegistration%2fPSNL%2fSignInFrame.aspx"
-$friend_url = "http://profiles.us.playstation.com/playstation/psn/profile/friends"
-$json_url = "http://profiles.us.playstation.com/playstation/psn/profile/get_gamer_summary_data?id="
+$login_url = "https://store.playstation.com/external/index.vm?returnURL=http://us.playstation.com/uwps/PSNTicketRetrievalGenericServlet"
+$friend_url = "http://us.playstation.com/playstation/psn/profile/friends?id="
 
 
 class Cpsn
@@ -76,28 +75,51 @@ class Cpsn
         return groups
     end
 
+
+    def login_failed
+        puts "Error logging in. Did you give the right username and password?"
+        exit
+    end
+
+
     def get_cookie(username, password)
         @log.debug("Signing in for new cookie")
+
+        @agent.redirect_ok = false
         page = @agent.get($login_url)
         login_form = page.forms.first
-        login_form.loginName = username
-        login_form.password = password
+        login_form.j_username = username
+        login_form.j_password = password
         page = @agent.submit(login_form)
-        link = page.links.first
+        
+        if page.code != "302"
+            login_failed
+        end
 
-        if link.text == "Sign In"
-            puts "Error logging in. Did you give the right username and password?"
-            exit
+        page = @agent.get(page.response['Location'])
+
+        if page.code != "302"
+            login_failed
         end
 
-        page = link.click
-      
+        # we don't need to follow this last redirect, just to get the sesison
+        # id
+        location = page.response['Location']
+        parts = location.split("sessionId=")
+        sessionId = parts[1]
+
+        # this sets the sessionid cookie and others, which we need.
+        @agent.get("http://us.playstation.com/uwps/HandleIFrameRequests?sessionId=" + sessionId)
+
         @agent.cookie_jar.save_as File.expand_path("~/.cpsn/cookies.yml")
+
+
+        @agent.redirect_ok = true
     end
 
     def get_agent(username, password, force_cookie)
         @log.debug("Creating new user agent")
-        @agent = WWW::Mechanize.new
+        @agent = Mechanize.new
         @agent.user_agent_alias = 'Mac FireFox'
         @agent.redirect_ok = true
 
@@ -111,7 +133,7 @@ class Cpsn
     def get_friends()
         begin
             return _get_friends()
-        rescue WWW::Mechanize::ResponseCodeError => response
+        rescue Mechanize::ResponseCodeError => response
             if response.response_code == '403'
                 get_cookie(@settings[:username].value,
                            @settings[:password].value)
@@ -125,7 +147,7 @@ class Cpsn
     def get_friend_status(friend)
         begin
             return _get_friend_status(friend)
-        rescue WWW::Mechanize::ResponseCodeError => response
+        rescue Mechanize::ResponseCodeError => response
             if response.response_code == '403'
                 get_cookie(@settings[:username].value,
                            @settings[:password].value)
@@ -140,7 +162,12 @@ class Cpsn
 
     def _get_friends()
         @log.debug("Getting friends list")
-        page = @agent.get($friend_url)
+        @agent.get( "http://us.playstation.com/myfriends/")
+        url = $friend_url + rand().to_s
+        page = @agent.get("http://us.playstation.com/uwps/decryptText?id=0.1234554")
+        @log.debug("friend url: " + url)
+        page = @agent.get(url, nil, "http://us.playstation.com/myfriends/")
+
         divs = page.search("div.slotcontent")
 
         friends = []
@@ -155,25 +182,21 @@ class Cpsn
 
     def _get_friend_status(friend)
         @log.debug("Loading friend status for #{friend}")
-        page = @agent.get($json_url + friend)
-        data = JSON.parse(page.body)
+        page = @agent.get("http://us.playstation.com/playstation/psn/profile/" + friend + "?id=0.12343", nil, "http://us.playstation.com/myfriends")
 
-        @log.debug(data)
+        friend = {:name => friend,
+                  :status => 'offline',
+                  :playing => '',
+        }
 
-        friend = {:name => data["userName"]}
+        status = page.search("div.oStatus")[0]
 
-        if data["onlineStatus"] == nil
-            return nil
-        end
+        if status.search("div")[0].attributes['class'].to_s == "onlineStatus online"
+            friend[:status] = "online"
+
+            playing = page.search("span._iamplaying_")
+            friend[:playing] = playing[0].text.strip
 
-        if data["onlineStatus"]["extensionStatus"] != nil
-           friend[:status] = 'online'
-           friend[:playing] = data["onlineStatus"]["extensionStatus"]["title"]
-           friend[:game_status] = data["onlineStatus"]["extensionStatus"]["status"]
-        else
-           friend[:status] = 'offline'
-           friend[:playing] = ""
-           friend[:game_status] = ""
         end
 
         return friend
@@ -237,7 +260,7 @@ for friend_name in friend_names
 
     if friend
         if friend[:status] != "offline" or options[:offline]
-            puts friend[:status] + "\t" + friend[:name] + "\t" + friend[:playing] + "\t" + friend[:game_status]
+            puts friend[:status] + "\t" + friend[:name] + "\t" + friend[:playing]
         end
     else
         puts "Error: no access to " + friend_name

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cpsn
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  hash: 3
+  prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - James Bowes
@@ -9,29 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
-default_executable: cpsn
+date: 2011-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 9
+        - 3
         version: 0.9.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: "\n        Query PSN friend status from the CLI. Shows useful information like the\n        game being played, and what mode or map your friend is playing\n        (if available).\n    "
 email: jbowes@repl.ca
 executables: 
@@ -41,37 +58,41 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
 - README.mkd
 - Rakefile
 - TODO
 - VERSION
 - bin/cpsn
-has_rdoc: true
 homepage: http://github.com/jbowes/cpsn
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - bin
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Query PSN friend status from the CLI

data/.gitignore

@@ -1,2 +0,0 @@
-*.sw?
-pkg