dragongoserver 0.1.1 → 0.3.0

data/History.txt

@@ -1,3 +1,19 @@
+== 0.3.0 2009-07-10
+
+* 1 bug-fix:
+  * Encoding-Klauseln fuer Ruby 1.9 ergaenzt
+* 2 enhancements:
+  * new option --threshold=N 
+  * Ruby 1.9 compatibility
+
+== 0.2.0 2008-05-06
+
+* 2 enhancements:
+  * new option --check-timeout-finished=userid
+  * new method finished_games_for_user
+* 1 bug-fix:
+  * method renaming error (neue_zuege? -> new_moves?)
+
 == 0.1.0 2008-04-27
 * 4 enhancements:
   * new option -min/--min-wait in dgs script

data/bin/dgs

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'rubygems'
 require 'dragongoserver'
@@ -6,10 +7,10 @@ require 'choice'
 
 version = Dragongoserver::VERSION::STRING
 Choice.options do
-  header ''
-  header 'Specific options:'
+  # header ''
+  # header 'Specific options:'
   #...
-  separator ''
+  #separator ''
   separator 'Common options: '
 
   option :help do
@@ -51,19 +52,21 @@ Choice.options do
     long '--osd'
     desc 'Show messages as an on-screen-display, "osd_cat" must be installed (see http://www.ignavus.net/software.html for further details)'
   end
-  if false
-    short '-p'
-    long '--port=PORT'
-    desc 'The port to listen on (default 21)'
-    cast Integer
-    default 21
+  
+  option :finished_games do
+    short '-fg'
+    long '--finished-games'
+    desc 'display the most recent finished games'
+    #cast Integer
+    #default 10
   end
-  option :min_wait do
-    short '-min'
-    long '--min-wait=MIN'
-    desc 'Minimum wait time between checks'
-    cast Integer
-    default 1
+  
+  # listet auf, wie oft ein Spieler in den beendeten Spielen
+  # durch Timeout verloren hat
+  option :check_timeout_finished do
+    short '-ctf'
+    long '--check-timeout-finished'    
+    cast Integer # User-id
   end
   
   option :with_name do
@@ -71,12 +74,50 @@ Choice.options do
     long '--with-name'
     desc 'Show games with name'
   end
+  
+  option :min_wait do
+    short '-mw'
+    long '--min-wait'
+    desc 'Minimum wait time in minutes'
+    cast Integer
+    default 1
+  end
+  
+  option :threshold do
+    short '-s'
+    long '--threshold'
+    desc 'Minimum number of waiting games'
+    cast Integer
+    default 1
+  end
+
+end
 
+if Choice.choices['check_timeout_finished']
+  puts "timeout check für user #{Choice.choices['check_timeout_finished']} ausgewählt"
+  dgs_username = ENV['DGS_USERNAME']
+  dgs_password = ENV['DGS_PASSWORD']
+  @dgs = Dgs.new(dgs_username, dgs_password)
+  finished = @dgs.finished_games_for_user(Choice.choices['check_timeout_finished'])
+  count = 0
+  finished.each {|g|
+    if g[:reason] == 'Time' and
+        g[:winner] != g[:player_color]
+      #p g[:winner] #
+      #g[:winner] != g[:player_color]
+      count += 1
+    end
+  }
+  puts "at least #{finished.size} finished games"
+  puts "#{count} games finished with timeout"  
+  exit
 end
 
+@cache_gameinfos = {}
 #p Choice.choices
 opt_waiting = Choice.choices['waiting'] # true/false
 opt_running = Choice.choices['running'] # true/false
+opt_finished_games = Choice.choices['finished_games'] # true/false
 $opt_with_name = Choice.choices['with_name'] # true/false
 @opt_osd = Choice.choices['osd'] # true/false
 opt_waitingloop = Choice.choices['waitingloop'] # true/false
@@ -103,6 +144,39 @@ if opt_running
   end
 end
 
+if opt_finished_games
+=begin
+<tr class=Row3 ondblclick="javascript:this.className=((this.className=='Row3')?'HilRow3':'Row3');">
+
+  <td class=Button><a class=Button href="game.php?gid=393488">393488</a></td>
+  <td><A href="sgf.php?gid=393488"><font color="#d50047">sgf</font></A></td>
+  <td><A href="userinfo.php?uid=107"><font color=black>maggie</font></a></td>
+  <td align=center><img src="17/b.gif" alt="b"></td>
+  <td>19</td>
+  <td>4</td>
+
+  <td>0.5</td>
+  <td>213</td>
+  <td>B+60.5</td>
+  <td align=center><img src="images/yes.gif" alt="Yes"></td>
+  <td>Yes</td>
+  <td>2008-04-23 22:48</td>
+
+ </tr>
+=end
+  dgs = Dgs.new
+  finished_games = dgs.finished_games
+  if finished_games.size > 0
+    puts "you have a total of #{finished_games.size} finished games"
+    puts "finished games:"
+    finished_games.each { |game|
+      puts "#{game[:id]} #{game[:finished_at]}"
+    }
+  else
+    puts "you have no finished games"
+  end
+end
+
 def plural(n)
   if n == 1
     ""
@@ -112,14 +186,30 @@ def plural(n)
 end
 
 def new_moves?(dgs)
-  w = dgs.waiting_games
+  begin
+    w = dgs.waiting_games
+  rescue Timeout::Error
+    puts "timeout error. retrying in 30 secs"
+    sleep 30
+    retry
+  end
   if $opt_with_name
     print '['
     w.each {|game|
       print "#{game} "
-      gi = dgs.gameinfo(game)
-      print gi[:white][:name]+' '       
-      print gi[:black][:name]+','
+      # ggf. aus Cache holen, anstatt jedesmal neu von DGS ermitteln,
+      # da sich die Namen der Spieler in der Regel nicht waehrend der
+      # Laufzeit dieses Skripts aendern
+      gi=cache_gameinfo(game)
+      if gi
+        print "[c] "
+      end
+      unless gi
+        gi = dgs.gameinfo(game) 
+        @cache_gameinfos[game] = gi
+      end
+      print gi[:white][:name]+' ' unless gi[:white][:name].include? "(#{dgs.username})"       
+      print gi[:black][:name]+',' unless gi[:black][:name].include? "(#{dgs.username})"       
       puts
     }
     puts ']'
@@ -128,9 +218,17 @@ def new_moves?(dgs)
   end
   #if dgs.waiting_games.size > 0 # @page.body.include?(NO_GAMES)
   if w.size > 0 # @page.body.include?(NO_GAMES)
-    true
+    if $threshold 
+      if w.size < $threshold.to_i
+        return false
+      else
+        return true  
+      end
+    else
+      return true
+    end
   else
-    false
+    return false
   end
 end
 
@@ -142,6 +240,7 @@ $nur_dringende = false # TODO:
 $min_secs = Choice.choices[:min_wait].to_i*60 #60*15
 $secs = $min_secs
 $count = 0
+$threshold = Choice.choices[:threshold].to_i
 def osd_output?
   return @opt_osd
 end
@@ -154,10 +253,14 @@ def puts_x(arg)
   end
 end
 
+def cache_gameinfo(game)
+  @cache_gameinfos[game]
+end
+
 def schleife
   dgs = Dgs.new
-  # dgs.login
-  #page = dgs.page
+  $min_secs = Choice.choices[:min_wait].to_i*60 #60*15
+  
   $dringend = false
   changes = false
   if $nur_dringende 
@@ -170,31 +273,23 @@ def schleife
   elsif new_moves? dgs
     changes = true
   else
-    # puts "keine neuen Zuege"
     puts "no waiting moves"
-    #
   end
   if changes
     $count = 0
-    # puts "neue Zuege, neue Methode"
     puts "waiting games"
     $secs = $secs / 2
     if $secs < $min_secs
       $secs = $min_secs
     end
-    # puts "vermindere Abfrageintervall auf #{$secs} Sekunden(n)"
     puts "decreasing request interval to #{$secs} seconds"
-    # puts "neue Zuege"
     puts "waiting games"
     if $dringend
       $osd.puts("DRINGENDE Spiele")
     end
-    # puts("Deine Mitspieler bei Dragon Go Server warten auf deine Spielzuege")
     puts_x("Your opponents at Dragon Go Server are waiting for your moves")
-    #-- $osd.puts("Deine Mitspieler bei Dragon Go Server warten auf deine Spielzuege")
-    #-- $osd.flush
   else
-    $count+=1
+    $count += 1
     if $count >= 3
       $secs = $secs*2
       #  puts "erhoehe Abfrageintervall auf #{$secs} Sekunden(n)"
@@ -203,13 +298,20 @@ def schleife
     end
   end
 end
+
 if opt_waitingloop
   while 1
     # $osd = IO.popen("osd_cat -p middle -f -adobe-helvetica-*-*-*-*-24-*-*-*-    *-*-*-* -s 3 -S lightgray --delay=60","w+")
     if osd_output?
       $osd = IO.popen("osd_cat -p middle -f -sony-fixed-medium-*-normal-*-24-*-*-*-*-*-*-* -s 3 -S lightgray --delay=60","w+")
     end
-    schleife
+    begin
+      schleife
+    rescue SocketError
+      puts "SocketError - waiting 60 secs and retrying"
+      sleep 60
+      retry
+    end
     if osd_output?
       $osd.close_write
       $osd.close

data/lib/dragongoserver.rb

@@ -1,7 +1,9 @@
-# $:.unshift File.dirname(__FILE__)
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Dragongoserver
 end
 
 require 'dragongoserver/version'
 require 'dragongoserver/dragongoserver'
+require 'dragongoserver/game'

data/lib/dragongoserver/dragongoserver.rb

@@ -12,8 +12,9 @@ class Dgs
   USER_AGENT_ALIAS = 'Mac Safari' # should work with every browser type
 
   SAVE_WAIT = 15 # wait n seconds before each request
-  # if we are doing to many requests at DGS the account will be
-  # temporarily blocked (for about 1 day)
+  # if we are doing too many requests at DGS the account (YOUR ACCOUNT)
+  # will be temporarily blocked (for about 1 day)
+
   attr_reader :username
   
   def initialize(username=nil,password=nil)
@@ -49,7 +50,7 @@ class Dgs
     end
     game_id=0
     user_id=0
-    page.body.each {|line|
+    page.body.each_line {|line|
       if line =~ /gid=([0-9]+)"/
         game_id = $1.to_i
         # ??? games << {:game => game_id, :user => userid}
@@ -83,16 +84,174 @@ class Dgs
       raise "PageError: #{DGS_STATUS_PAGE} not found"
     end
 
-    page = agent.click page.links.text('Show running games')
-    page.body.each {|line|
+    # page = agent.click page.links.text('Show running games')
+    page = agent.click page.link_with(:text => 'Show running games')
+    
+    #    *_with(:text => "Show running games")
+    page.body.each_line {|line|
       if line =~ /gid=([0-9]+)"/
         games << $1.to_i
       end
     }
+    
+    # BEGIN naechste Seite(n)
+    #p page.links    
+    #    page = agent.click page.link_with(:text => '=&gt;')
+    while true
+      begin
+        page = agent.click page.link_with(:text => '=>')
+      rescue
+        break # keine weitere Seite vorhanden
+      end
+        
+      page.body.each {|line|
+        if line =~ /gid=([0-9]+)"/
+          games << $1.to_i
+        end
+      }
+    end
+    # END  naechste Seite(n)
     # aus Bequemlichkeitsgruenden (gid= kommt mehrfach vor): uniq    
     games.uniq
   end
+  
+  # Array of your finished games
+  # http://www.dragongoserver.net/show_games.php?uid=10737
+  def finished_games
+    save_wait
+    games = []
+    #@home = 'http://www.dragongoserver.net/show_games.php?uid=10737' #TODO:
+    @home = DGS_STATUS_PAGE
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = USER_AGENT_ALIAS
+
+    page = agent.get(@home)
+    if page.body.include?(LOGGED_IN)
+      page = login(agent)
+    end
+
+    #if !page.body.include?(YOUR_TURN)
+    #  raise "PageError: #{DGS_STATUS_PAGE} not found"
+    #end
+
+    #    page = agent.click page.links.text('Show finished games')
+    page = agent.click page.link_with(:text => 'Show finished games')
+    page.body.each_line {|line|
+      if line =~ /gid=([0-9]+)"/
+        games << {:id => $1.to_i, :finished_at => DateTime.now}
+      end
+    }
+    page_no = 1
+    
+    #    p page.links.find { |l| l.title =~ /next page/ }
+    #p page.links
 
+    # naechste Seite
+    #    while page.link_with(:text => '+')
+    while page.link_with(:title => 'next page [&amp;&gt;]')
+      page_no += 1
+      puts "at page_no = #{page_no}"
+      #      page = agent.click page.link_with(:text => '+')
+      page = agent.click page.link_with(:title => 'next page [&amp;&gt;]') 
+      # nochmal alle Spiele auf Folgeseite durchgehen
+      page.body.each {|line|
+        if line =~ /gid=([0-9]+)"/
+          games << {:id => $1.to_i, :finished_at => DateTime.now}
+        end
+      }
+    end
+    
+    # aus Bequemlichkeitsgruenden (gid= kommt mehrfach vor): uniq    
+    games.uniq
+  end
+  
+  # same as finished_games but only the ids of the games
+  def finished_games_ids
+    result = []
+    finished_games.each { |e| 
+      result << e[:id]
+    }
+    result
+  end
+  
+  # http://www.dragongoserver.net/show_games.php?uid=31098&finished=1
+  # the first page of finished games for this user
+  def finished_games_for_user(user_id)
+    save_wait
+    games = []
+    @home = "http://www.dragongoserver.net/show_games.php?uid=#{user_id}&finished=1" #TODO:
+    #p @home
+    #@home = DGS_STATUS_PAGE
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = USER_AGENT_ALIAS
+
+    page = agent.get(@home)
+    if page.body.include?(LOGGED_IN)
+      page = login(agent)
+      page = agent.click page.link_with(:text => 'Users')
+      if !page.body.include?("Active users")
+        raise "Active users not diplaying"
+      end
+      form = page.forms.first
+      form.sf1 = user_id.to_s
+      
+      page = agent.submit(form)
+#      page = agent.click page.links.text("#{user_id}")
+      page = agent.click page.link_with(:text => "#{user_id}")
+#      page = agent.click page.links.text("Show finished games")
+      page = agent.click page.link_with(:text => "Show finished games")
+    end
+    if !page.body.include?("Finished games for")
+      #p page.body
+      raise "Finished games for not on page"
+    end
+    #page = agent.click page.links.text('Show finished games')
+    one_game = {}
+    page.body.each {|line|
+      #  p line
+      #p one_game
+      if line =~ /gid=([0-9]+)"/
+        one_game[:id] = $1.to_i
+      end
+      # <td align=center><img src="17/w.gif" alt="w"></td>
+      if line =~ /[wb].gif/ and
+          one_game[:id]
+        #p $1
+        color = line.split('.gif')[0][-1,1]
+        #p line.split('.gif')[0] #[-1,1]
+        #p color
+        if color == 'w'
+          one_game[:player_color] = :white
+        else
+          one_game[:player_color] = :black
+        end
+      end
+      # W+Time
+      if line =~ /[WB]\+/ and
+          one_game[:id]
+        color,reason = line.split('+')
+        if color[-1,1] == 'W'
+          one_game[:winner] = :white
+        else
+          one_game[:winner] = :black
+        end
+      
+        one_game[:reason] = reason[0,reason.index('<')]
+      end
+      #<td>2008-04-19 10:29</td>
+      if line =~ /(\d+)-(\d+)-(\d+)/ and
+          one_game[:id]
+        d = Date.new($1.to_i,$2.to_i,$3.to_i)
+        one_game[:finished_at] = d
+        games << one_game
+        one_game = {}
+      end
+    }
+    # aus Bequemlichkeitsgruenden (gid= kommt mehrfach vor): uniq    
+    #p games
+    games  # .uniq
+  end
+  
   # your rank as a GoRank object
   def get_rank
     save_wait
@@ -109,12 +268,15 @@ class Dgs
       raise "PageError: #{DGS_STATUS_PAGE} not found"
     end
     a = show_regexp(page.body, /(\d+)&nbsp;(kyu|dan)/)
-    num = a[0]
+    num = a[0].to_i
     what = a[1].to_sym
     myRank = GoRank.new num, what
     myRank
   end
 
+  # rank is an alias to get_rank
+  alias :rank :get_rank
+
   # your id at DGS
   def userid
     save_wait
@@ -163,7 +325,7 @@ class Dgs
     @userinfo[:country] = nil
       
     result = Hash.new    
-    page.body.each {|line|
+    page.body.each_line {|line|
       #<td class="Rubric">Name</td><td>Thomas Preymesser</td>
       if line =~ /td class="Rubric"/
         #p line
@@ -183,12 +345,19 @@ class Dgs
         elsif a[0]=="Rating"
           #
           
-          b = show_regexp(a[1], /(\d+)&nbsp;(kyu|dan)/)
-          num = b[0]
-          what = b[1].to_sym
-          myRank = GoRank.new num, what
-          result[:rating] = myRank
-          #
+          if  a[1] =~ /(\d+)&nbsp;(kyu|dan)/
+            b = show_regexp(a[1], /(\d+)&nbsp;(kyu|dan)/)
+            num = b[0].to_i
+            what = b[1].to_sym
+            begin
+              result[:rating] = GoRank.new num, what
+            rescue
+              raise "illegal rank: #{a[1]}\n#{num}/#{what}"
+            end
+          else
+            result[:rating] = nil
+          end
+          ##
           #result[:rating] = a[1]
         elsif a[0]=="Last access"
           result[:lastaccess] = DateTime.parse(a[1].gsub(/&nbsp;/,' '))
@@ -263,20 +432,22 @@ Time remaining: 9&nbsp;days&nbsp;and&nbsp;6&nbsp;hours</td>
     #elements =   doc.search("//table[@class='GameInfos']").search('tr[@id='BlackInfo')
     elements =   doc.search("//table[@class='GameInfos']")
     blackinfo = (elements/"tr[@id='blackInfo']")
-    #pp blackinfo
     whiteinfo = (elements/"tr[@id='whiteInfo']")
-    whiteinfo_name = (whiteinfo/"td[@class='Name']/a").inner_html
-    blackinfo_name = (blackinfo/"td[@class='Name']/a").inner_html
-    #pp whiteinfo
-    #pp whiteinfo_name
-    #pp blackinfo_name
-    ##p whiteinfo_name.inner_html
+    whiteinfo_name = (whiteinfo/"td[@class='Name']/a").inner_text #2008-12-28 inner_html
+    blackinfo_name = (blackinfo/"td[@class='Name']/a").inner_text #2008-12-28 inner_html
     result[:black][:name] = blackinfo_name
     result[:white][:name] = whiteinfo_name
-    #    p result
+    
     result
   end
   
+  # all games of the own user
+  # finished games + running games
+  # TODO: should return an array of game instances  
+  def games
+    [4,5,6]
+  end
+  
   private
 
   def show_regexp(a, re)
@@ -290,7 +461,8 @@ Time remaining: 9&nbsp;days&nbsp;and&nbsp;6&nbsp;hours</td>
   def login(agent)
     @home = DGS_INDEX_PAGE
     page = agent.get(@home)
-    form = page.forms.with.name("loginform").first
+    #form = page.forms.with.name("loginform").first
+    form = page.form("loginform")
     form.fields.find {|f| f.name == 'userid'}.value = @username
     form.fields.find {|f| f.name == 'passwd'}.value = @password
     page = agent.submit(form, form.buttons.first)
@@ -301,4 +473,4 @@ Time remaining: 9&nbsp;days&nbsp;and&nbsp;6&nbsp;hours</td>
     sleep(SAVE_WAIT)
   end
   
-end
+end