evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup in HUD_main and HUD.py to simplify.

Browse Source 
HUD_run_me no longer needed but not removed.
This commit is contained in:
Ray 2009-02-21 18:19:49 -05:00
parent 18140defd8
commit 2ebb026543
3 changed files with 126 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyfpdb/GuiAutoImport.py
View File

@ -128,12 +128,12 @@ class GuiAutoImport (threading.Thread):
widget.set_label(u'Stop Autoimport') widget.set_label(u'Stop Autoimport')
if self.pipe_to_hud is None: if self.pipe_to_hud is None:
if os.name == 'nt': if os.name == 'nt':
command = "python HUD_run_me.py" + " %s" % (self.database) command = "python HUD_main.py" + " %s" % (self.database)
bs = 0 # windows is not happy with line buffing here bs = 0 # windows is not happy with line buffing here
self.pipe_to_hud = subprocess.Popen(command, bufsize = bs, stdin = subprocess.PIPE, self.pipe_to_hud = subprocess.Popen(command, bufsize = bs, stdin = subprocess.PIPE,
universal_newlines=True) universal_newlines=True)
else: else:
command = self.config.execution_path('HUD_run_me.py') command = self.config.execution_path('HUD_main.py')
bs = 1 bs = 1
self.pipe_to_hud = subprocess.Popen((command, self.database), bufsize = bs, stdin = subprocess.PIPE, self.pipe_to_hud = subprocess.Popen((command, self.database), bufsize = bs, stdin = subprocess.PIPE,
universal_newlines=True) universal_newlines=True)

221
pyfpdb/HUD_main.py
View File

@ -26,7 +26,6 @@ Main for FreePokerTools HUD.
# to do hud to echo, but ignore non numbers # to do hud to echo, but ignore non numbers
# to do no stat window for hero # to do no stat window for hero
# to do things to add to config.xml # to do things to add to config.xml
# to do font and size
# Standard Library modules # Standard Library modules
import sys import sys
@ -47,141 +46,147 @@ import Database
import Tables import Tables
import Hud import Hud
# global dict for keeping the huds class HUD_main(object):
hud_dict = {} """A main() object to own both the read_stdin thread and the gui."""
eb = 0 # our former event-box # This class mainly provides state for controlling the multiple HUDs.
db_connection = 0; def __init__(self, db_name = 'fpdb'):
config = 0; self.db_name = db_name
self.config = Configuration.Config()
self.hud_dict = {}
def destroy(*args): # call back for terminating the main eventloop # a thread to read stdin
gtk.main_quit() gobject.threads_init() # this is required
thread.start_new_thread(self.read_stdin, ()) # starts the thread
def create_HUD(new_hand_id, table, db_name, table_name, max, poker_game, db_connection, config, stat_dict): # a main window
global hud_dict, eb self.main_window = gtk.Window()
self.main_window.connect("destroy", self.destroy)
self.vb = gtk.VBox()
self.label = gtk.Label('Closing this window will exit from the HUD.')
self.vb.add(self.label)
self.main_window.add(self.vb)
self.main_window.set_title("HUD Main Window")
self.main_window.show_all()
def idle_func(): def destroy(*args): # call back for terminating the main eventloop
global hud_dict, eb gtk.main_quit()
gtk.gdk.threads_enter() def create_HUD(self, new_hand_id, table, table_name, max, poker_game, is_tournament, stat_dict):
try:
newlabel = gtk.Label(table.site + " - " + table_name)
eb.add(newlabel)
newlabel.show()
hud_dict[table_name] = Hud.Hud(table, max, poker_game, config, db_connection) def idle_func():
hud_dict[table_name].tablehudlabel = newlabel
hud_dict[table_name].create(new_hand_id, config) gtk.gdk.threads_enter()
for m in hud_dict[table_name].aux_windows: try:
m.update_data(new_hand_id, db_connection) newlabel = gtk.Label(table.site + " - " + table_name)
m.update_gui(new_hand_id) self.vb.add(newlabel)
hud_dict[table_name].update(new_hand_id, config, stat_dict) newlabel.show()
hud_dict[table_name].reposition_windows()
self.hud_dict[table_name] = Hud.Hud(self, table, max, poker_game, self.config, self.db_connection)
self.hud_dict[table_name].tablehudlabel = newlabel
self.hud_dict[table_name].create(new_hand_id, self.config)
for m in self.hud_dict[table_name].aux_windows:
m.update_data(new_hand_id, self.db_connection)
m.update_gui(new_hand_id)
self.hud_dict[table_name].update(new_hand_id, self.config, stat_dict)
self.hud_dict[table_name].reposition_windows()
return False
finally:
gtk.gdk.threads_leave()
gobject.idle_add(idle_func)
def update_HUD(self, new_hand_id, table_name, config, stat_dict):
"""Update a HUD gui from inside the non-gui read_stdin thread."""
# This is written so that only 1 thread can touch the gui--mainly
# for compatibility with Windows. This method dispatches the
# function idle_func() to be run by the gui thread, at its leisure.
def idle_func():
gtk.gdk.threads_enter()
try:
self.hud_dict[table_name].update(new_hand_id, config, stat_dict)
for m in self.hud_dict[table_name].aux_windows:
m.update_gui(new_hand_id)
return False
finally:
gtk.gdk.threads_leave()
gobject.idle_add(idle_func)
def HUD_removed(self, tablename):
tablename = Tables.clean_title(tablename)
# TODO: There's a potential problem here somewhere, that this hacks around .. the table_name as being passed to HUD_create is cleaned,
# but the table.name as being passed here is not cleaned. I don't know why. -eric
if tablename in self.hud_dict and self.hud_dict[tablename].deleted:
self.vb.remove(self.hud_dict[tablename].tablehudlabel)
del self.hud_dict[tablename]
return False return False
finally:
gtk.gdk.threads_leave()
gobject.idle_add(idle_func)
def update_HUD(new_hand_id, table_name, config, stat_dict): return True
global hud_dict
def idle_func():
gtk.gdk.threads_enter()
try:
hud_dict[table_name].update(new_hand_id, config, stat_dict)
for m in hud_dict[table_name].aux_windows:
m.update_gui(new_hand_id)
return False
finally:
gtk.gdk.threads_leave()
gobject.idle_add(idle_func)
def HUD_removed(tablename): def read_stdin(self): # This is the thread function
global hud_dict, eb """Do all the non-gui heavy lifting for the HUD program."""
tablename = Tables.clean_title(tablename) # This db connection is for the read_stdin thread only. It should not
# TODO: There's a potential problem here somewhere, that this hacks around .. the table_name as being passed to HUD_create is cleaned, # be passed to HUDs for use in the gui thread. HUD objects should not
# but the table.name as being passed here is not cleaned. I don't know why. -eric # need their own access to the database, but should open their own
if tablename in hud_dict and hud_dict[tablename].deleted: # if it is required.
eb.remove(hud_dict[tablename].tablehudlabel) self.db_connection = Database.Database(self.config, self.db_name, 'temp')
del hud_dict[tablename] tourny_finder = re.compile('(\d+) (\d+)')
return False
return True while True: # wait for a new hand number on stdin
new_hand_id = sys.stdin.readline()
def read_stdin(): # This is the thread function new_hand_id = string.rstrip(new_hand_id)
global hud_dict, eb if new_hand_id == "": # blank line means quit
self.destroy()
db_connection = Database.Database(config, db_name, 'temp') break # this thread is not always killed immediately with gtk.main_quit()
tourny_finder = re.compile('(\d+) (\d+)')
while True: # wait for a new hand number on stdin
new_hand_id = sys.stdin.readline()
new_hand_id = string.rstrip(new_hand_id)
if new_hand_id == "": # blank line means quit
destroy()
break # this thread is not always killed immediately with gtk.main_quit()
# get basic info about the new hand from the db # get basic info about the new hand from the db
(table_name, max, poker_game) = db_connection.get_table_name(new_hand_id) (table_name, max, poker_game) = self.db_connection.get_table_name(new_hand_id)
stat_dict = self.db_connection.get_stats_from_hand(new_hand_id)
# find out if this hand is from a tournament # find out if this hand is from a tournament
is_tournament = False mat_obj = tourny_finder.search(table_name)
(tour_number, tab_number) = (0, 0) if mat_obj:
mat_obj = tourny_finder.search(table_name) is_tournament = True
if mat_obj: (tour_number, tab_number) = mat_obj.group(1, 2)
is_tournament = True temp_key = tour_number
(tour_number, tab_number) = mat_obj.group(1, 2)
stat_dict = db_connection.get_stats_from_hand(new_hand_id)
# if a hud for this CASH table exists, just update it
if table_name in hud_dict:
# update the data for the aux_windows
for aw in hud_dict[table_name].aux_windows:
aw.update_data(new_hand_id, db_connection)
update_HUD(new_hand_id, table_name, config, stat_dict)
# if a hud for this TOURNAMENT table exists, just update it
elif tour_number in hud_dict:
update_HUD(new_hand_id, tour_number, config, stat_dict)
# otherwise create a new hud
else:
if is_tournament:
tablewindow = Tables.discover_tournament_table(config, tour_number, tab_number)
if tablewindow == None:
sys.stderr.write("tournament %s, table %s not found\n" % (tour_number, tab_number))
else:
create_HUD(new_hand_id, tablewindow, db_name, tour_number, max, poker_game, db_connection, config, stat_dict)
else: else:
tablewindow = Tables.discover_table_by_name(config, table_name) is_tournament = False
(tour_number, tab_number) = (0, 0)
temp_key = table_name
# Update an existing HUD
if temp_key in self.hud_dict:
for aw in self.hud_dict[temp_key].aux_windows:
aw.update_data(new_hand_id, self.db_connection)
self.update_HUD(new_hand_id, temp_key, self.config, stat_dict)
# Or create a new hud
else:
if is_tournament:
tablewindow = Tables.discover_tournament_table(self.config, tour_number, tab_number)
else:
tablewindow = Tables.discover_table_by_name(self.config, table_name)
if tablewindow == None: if tablewindow == None:
if is_tournament:
table_name = tour_number + " " + tab_number
sys.stderr.write("table name "+table_name+" not found\n") sys.stderr.write("table name "+table_name+" not found\n")
else: else:
create_HUD(new_hand_id, tablewindow, db_name, table_name, max, poker_game, db_connection, config, stat_dict) self.create_HUD(new_hand_id, tablewindow, temp_key, max, poker_game, is_tournament, stat_dict)
if __name__== "__main__": if __name__== "__main__":
sys.stderr.write("HUD_main starting\n") sys.stderr.write("HUD_main starting\n")
# database name can be passed on command line
try: try:
db_name = sys.argv[1] db_name = sys.argv[1]
except: except:
db_name = 'fpdb' db_name = 'fpdb'
sys.stderr.write("Using db name = %s\n" % (db_name)) sys.stderr.write("Using db name = %s\n" % (db_name))
config = Configuration.Config() # start the HUD_main object
hm = HUD_main(db_name = db_name)
gobject.threads_init() # this is required
thread.start_new_thread(read_stdin, ()) # starts the thread
main_window = gtk.Window()
main_window.connect("destroy", destroy)
eb = gtk.VBox()
label = gtk.Label('Closing this window will exit from the HUD.')
eb.add(label)
main_window.add(eb)
main_window.set_title("HUD Main Window")
main_window.show_all()
# start the event loop
gtk.main() gtk.main()

5
pyfpdb/Hud.py
View File

@ -47,7 +47,8 @@ import HUD_main
class Hud: class Hud:
def __init__(self, table, max, poker_game, config, db_connection): def __init__(self, parent, table, max, poker_game, config, db_connection):
self.parent = parent
self.table = table self.table = table
self.config = config self.config = config
self.poker_game = poker_game self.poker_game = poker_game
@ -175,7 +176,7 @@ class Hud:
self.deleted = True self.deleted = True
self.main_window.disconnect(self.main_window.destroyhandler) # so we don't potentially infiniteloop in here, right self.main_window.disconnect(self.main_window.destroyhandler) # so we don't potentially infiniteloop in here, right
self.main_window.destroy() self.main_window.destroy()
HUD_main.HUD_removed(self.table.name) self.parent.HUD_removed(self.table.name)
def kill_hud_menu(self, *args): def kill_hud_menu(self, *args):
self.main_window.destroy() self.main_window.destroy()