dragongoserver 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,6 @@
+== 0.0.4 2008-01-06
+* 1 enhancement:
+  * on screen display with option -osd/--osd in 'dgs' script
 == 0.0.3 2008-01-01
 * 1 enhancement:
   * new option -ml/--missing-loop in dgs script

data/bin/dgs

@@ -46,11 +46,17 @@ Choice.options do
     desc 'Show running games'
   end
 
+  option :osd do
+    short '-osd'
+    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
 end
 
 #p Choice.choices
 opt_waiting = Choice.choices['waiting'] # true/false
 opt_running = Choice.choices['running'] # true/false
+@opt_osd = Choice.choices['osd'] # true/false
 opt_waitingloop = Choice.choices['waitingloop'] # true/false
 if opt_waiting
   dgs = Dgs.new
@@ -73,33 +79,45 @@ if opt_running
     puts "you have no running games"
   end
 end
- def plural(n)
-   if n == 1
-     ""
-   else
-     "s"
-   end
-end
-   def neue_zuege?(dgs)
 
-      w = dgs.waiting_games
-p w
-      #if dgs.waiting_games.size > 0 # @page.body.include?(NO_GAMES)
-      if w.size > 0 # @page.body.include?(NO_GAMES)
-        true
-      else
-        false
-      end
-    end
+def plural(n)
+  if n == 1
+    ""
+  else
+    "s"
+  end
+end
 
-  def dringende_zuege(dgs=nil)
-    false # TODO:
+def neue_zuege?(dgs)
+  w = dgs.waiting_games
+  p w
+  #if dgs.waiting_games.size > 0 # @page.body.include?(NO_GAMES)
+  if w.size > 0 # @page.body.include?(NO_GAMES)
+    true
+  else
+    false
   end
+end
 
-  $nur_dringende = false # TODO:
-  $min_secs = 60*1
-  $secs = $min_secs
-  $count = 0
+def dringende_zuege(dgs=nil)
+   false # TODO:
+end
+
+$nur_dringende = false # TODO:
+$min_secs = 60*1
+$secs = $min_secs
+$count = 0
+def osd_output?
+  return @opt_osd
+end
+
+  def puts_x(arg)
+    puts arg 
+    if osd_output?
+      $osd.puts(arg)
+      $osd.flush
+    end
+  end
 
   def schleife
     dgs = Dgs.new
@@ -137,7 +155,7 @@ p w
         $osd.puts("DRINGENDE Spiele")
       end
       # puts("Deine Mitspieler bei Dragon Go Server warten auf deine Spielzuege")
-      puts("Your opponents at Dragon Go Server are waiting for your moves")
+      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
@@ -153,10 +171,14 @@ p w
 if opt_waitingloop
   while 1
     # $osd = IO.popen("osd_cat -p middle -f -adobe-helvetica-*-*-*-*-24-*-*-*-    *-*-*-* -s 3 -S lightgray --delay=60","w+")
-    #-- $osd = IO.popen("osd_cat -p middle -f -sony-fixed-medium-*-normal-*-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
-    #-- $osd.close_write
-    #-- $osd.close
+    if osd_output?
+    $osd.close_write
+    $osd.close
+    end
     # puts "warte #{$secs} Sekunden (#{$secs/60} Minuten)"
     puts "waiting #{$secs} seconds (#{$secs/60} minute#{plural($secs/60)})"
     sleep($secs)

data/lib/dragongoserver/dragongoserver.rb

@@ -39,9 +39,17 @@ class Dgs
     if !page.body.include?(YOUR_TURN)
       raise "PageError: #{DGS_STATUS_PAGE} not found"
     end
+    game_id=0
+    user_id=0
     page.body.each {|line|
       if line =~ /gid=([0-9]+)"/
-        games << $1.to_i
+        game_id = $1.to_i
+        # ??? games << {:game => game_id, :user => userid}
+        #  games << $1.to_i
+      games << game_id
+      end
+      if line =~ /uid=([0-9]+)"/ and game_id > 0
+        user_id = $1.to_i
       end
     }
     # aus Bequemlichkeitsgruenden (gid= kommt mehrfach vor): uniq    

data/lib/dragongoserver/version.rb

@@ -2,7 +2,7 @@ module Dragongoserver #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragongoserver
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-01 00:00:00 +01:00
+date: 2008-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency