diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt index bdc21599..78cee90a 100644 --- a/docs/known-bugs-and-planned-features.txt +++ b/docs/known-bugs-and-planned-features.txt @@ -5,11 +5,12 @@ Please also see db-todo.txt alpha2 (release 22Aug) ====== seperate and improve instructions for update -re-run existing regression tests +PrintPlayerHudData update website for dropping profile subfolder alpha3 (release by 31Aug) ====== +specify NOT NULL on almost all table columns ebuild: symlink doesnt work, USE gtk, more automation, update install-in-gentoo.txt, set permissions in it, copy docs to correct place, use games eclass or whatever to get games group notice, print notice about install-in-gentoo.txt and mysql --config update status or make a support matrix table for website add instructions for mailing list to contacts diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 27f3d259..ebbe9901 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -376,7 +376,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt") self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window.connect("delete_event", self.delete_event) self.window.connect("destroy", self.destroy) - self.window.set_title("Free Poker DB - version: alpha1+, p66") + self.window.set_title("Free Poker DB - version: alpha1+, p67") self.window.set_border_width(1) self.window.set_size_request(1020,400) self.window.set_resizable(True) diff --git a/regression-test/print_hand.py b/regression-test/PrintHand.py similarity index 69% rename from regression-test/print_hand.py rename to regression-test/PrintHand.py index fa73e9b3..e29414ba 100755 --- a/regression-test/print_hand.py +++ b/regression-test/PrintHand.py @@ -87,34 +87,34 @@ if base=="hold": elif base=="stud": doBets=True -if do_bets: - cursor.execute("SELECT small_bet FROM gametypes WHERE id=%s", (gametype_id, )) +if doBets: + cursor.execute("SELECT smallBet FROM Gametypes WHERE id=%s", (gametypeId, )) sbet=cursor.fetchone()[0] - cursor.execute("SELECT big_bet FROM gametypes WHERE id=%s", (gametype_id, )) + cursor.execute("SELECT bigBet FROM Gametypes WHERE id=%s", (gametypeId, )) bbet=cursor.fetchone()[0] - gt_string+=(" sbet: "+str(sbet)+" bbet: "+str(bbet)) -print gt_string + gtString+=(" sbet: "+str(sbet)+" bbet: "+str(bbet)) +print gtString if type=="ring": pass elif type=="tour": #cursor.execute("SELECT tourneys_players_id FROM hands - cursor.execute("""SELECT DISTINCT tourneys_players.id - FROM hands JOIN hands_players ON hands_players.hand_id=hands.id - JOIN tourneys_players ON hands_players.tourneys_players_id=tourneys_players.id - WHERE hands.id=%s""", (hand_id,)) - hands_players_ids=cursor.fetchall() - print "dbg hands_players_ids:",hands_players_ids + cursor.execute("""SELECT DISTINCT TourneysPlayers.id + FROM Hands JOIN HandsPlayers ON HandsPlayers.handId=Hands.id + JOIN TourneysPlayers ON HandsPlayers.tourneysPlayersId=TourneysPlayers.id + WHERE Hands.id=%s""", (hand_id,)) + handsPlayersIds=cursor.fetchall() + print "dbg hands_players_ids:",handsPlayersIds print "" - print "From Table tourneys" + print "From Table Tourneys" print "===================" print "TODO" print "" - print "From Table tourneys_players" - print "===========================" + print "From Table TourneysPlayers" + print "==========================" print "TODO" else: print "invalid type:",type @@ -122,53 +122,50 @@ else: print "" -print "From Table hands" -print "================" - -print "site_hand_no:",site_hand_no,"hand_start:",hand_start,"seat_count:",seat_count -#,"hand_id:",hand_id,"gametype_id:",gametype_id +print "From Table BoardCards" +print "=====================" if (category=="holdem" or category=="omahahi" or category=="omahahilo"): - cursor.execute("""SELECT * FROM board_cards WHERE hand_id=%s""",(hand_id, )) + cursor.execute("""SELECT * FROM BoardCards WHERE handId=%s""",(handId, )) bc=cursor.fetchone() print "Board cards:", ful.cards2String(bc[2:]) print "" -print "From Table hands_players" -print "========================" -cursor.execute("""SELECT * FROM hands_players WHERE hand_id=%s""",(hand_id, )) -hands_players=cursor.fetchall() -player_names=[] -for i in range (len(hands_players)): - line=hands_players[i][2:] - player_names.append(ful.id_to_player_name(cursor, line[0])) - printstr="player_name:"+player_names[i]+" player_startcash:"+str(line[1]) +print "From Table HandsPlayers" +print "=======================" +cursor.execute("""SELECT * FROM HandsPlayers WHERE handId=%s""",(handId, )) +handsPlayers=cursor.fetchall() +playerNames=[] +for i in range (len(handsPlayers)): + line=handsPlayers[i][2:] + playerNames.append(ful.id_to_player_name(cursor, line[0])) + printstr="playerName:"+playerNames[i]+" playerStartcash:"+str(line[1]) if (category=="holdem" or category=="omahahi" or category=="omahahilo"): printstr+=" position:"+ful.position2String(line[2])+" cards:" if (category=="holdem"): - printstr+=ful.cards2String(line[4:8]) + printstr+=ful.cards2String(line[5:9]) else: - printstr+=ful.cards2String(line[4:12]) + printstr+=ful.cards2String(line[5:13]) elif (category=="razz" or category=="studhi" or category=="studhilo"): printstr+=" ante:"+str(line[3])+" cards:" - printstr+=ful.cards2String(line[4:18]) + printstr+=ful.cards2String(line[5:19]) else: print "TODO: raise error, print_hand.py" sys.exit(1) - printstr+=" winnings:"+str(line[18])+" rake:"+str(line[19]) + printstr+=" winnings:"+str(line[19])+" rake:"+str(line[20]) print printstr print "" -print "From Table hands_actions" -print "========================" -for i in range (len(hands_players)): - cursor.execute("""SELECT * FROM hands_actions WHERE hand_player_id=%s""",(hands_players[i][0], )) - hands_actions=cursor.fetchall() - for j in range (len(hands_actions)): - line=hands_actions[j][2:] - printstr="player_name:"+player_names[i] +print "From Table HandsActions" +print "=======================" +for i in range (len(handsPlayers)): + cursor.execute("""SELECT * FROM HandsActions WHERE handPlayerId=%s""",(handsPlayers[i][0], )) + handsActions=cursor.fetchall() + for j in range (len(handsActions)): + line=handsActions[j][2:] + printstr="playerName:"+playerNames[i] printstr+=" street:"+ful.street_int2String(category, line[0])+" streetActionNo:"+str(line[1])+" action:"+line[2] printstr+=" amount:"+str(line[3]) print printstr diff --git a/regression-test/fpdb_util_lib.py b/regression-test/fpdb_util_lib.py index 565f7cbd..a450a453 100644 --- a/regression-test/fpdb_util_lib.py +++ b/regression-test/fpdb_util_lib.py @@ -39,14 +39,15 @@ def cards2String(arr): elif (arr[i*2]>=2 and arr[i*2]<=9): result+=str(arr[i*2]) else: - print "TODO: raise error, cards2String failed, arr[i*2]:",arr[i*2] + print "TODO: raise error, cards2String failed, arr[i*2]:", arr[i*2], "len(arr):", len(arr) + print "arr:",arr sys.exit(1) result+=arr[i*2+1] result+=" " return result[:-1] def id_to_player_name(cursor, id): - cursor.execute("SELECT name FROM players WHERE id=%s", (id, )) + cursor.execute("SELECT name FROM Players WHERE id=%s", (id, )) return cursor.fetchone()[0] def position2String(pos): diff --git a/regression-test/ps.14519394979.expected.txt b/regression-test/ps.14519394979.expected.txt index 962ec68c..c1eb98d7 100644 --- a/regression-test/ps.14519394979.expected.txt +++ b/regression-test/ps.14519394979.expected.txt @@ -1,46 +1,49 @@ Connected to MySQL on localhost. Print Hand Utility -options.site: PokerStars site_id: 2 +options.site: PokerStars siteId: 2 -From Table gametypes +From Table Hands +================ +handId: 1 tableName: Merope siteHandNo: 14519394979 gametypeId: 1 handStart: 2008-01-13 05:22:15 seats: 7 maxSeats: 10 + +From Table Gametypes ==================== -type: ring category: holdem limit_type: fl +type: ring base: hold category: holdem limitType: fl hiLo: h sb: 1 bb: 2 sbet: 2 bbet: 4 -From Table hands -================ -site_hand_no: 14519394979 hand_start: 2008-01-13 05:22:15 seat_count: 7 +From Table BoardCards +===================== Board cards: Qd Th Js 2s 7s -From Table hands_players -======================== -player_name:Player_1 player_startcash:75 position:Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_2 player_startcash:59 position:SB cards:?? ?? winnings:0 rake:0 -player_name:Player_3 player_startcash:147 position:BB cards:?? ?? winnings:0 rake:0 -player_name:Player_4 player_startcash:198 position:4 off Btn cards:?? ?? winnings:31 rake:1 -player_name:Player_5 player_startcash:122 position:3 off Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_6 player_startcash:48 position:2 off Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_7 player_startcash:139 position:1 off Btn cards:Ts Jh winnings:0 rake:0 +From Table HandsPlayers +======================= +playerName:Player_1 playerStartcash:75 position:Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_2 playerStartcash:59 position:SB cards:?? ?? winnings:0 rake:0 +playerName:Player_3 playerStartcash:147 position:BB cards:?? ?? winnings:0 rake:0 +playerName:Player_4 playerStartcash:198 position:4 off Btn cards:?? ?? winnings:31 rake:1 +playerName:Player_5 playerStartcash:122 position:3 off Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_6 playerStartcash:48 position:2 off Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_7 playerStartcash:139 position:1 off Btn cards:Ts Jh winnings:0 rake:0 -From Table hands_actions -======================== -player_name:Player_1 street:Preflop streetActionNo:6 action:call amount:4 -player_name:Player_1 street:Flop streetActionNo:2 action:call amount:2 -player_name:Player_1 street:Turn streetActionNo:2 action:call amount:4 -player_name:Player_1 street:River streetActionNo:2 action:fold amount:0 -player_name:Player_2 street:Preflop streetActionNo:0 action:blind amount:1 -player_name:Player_2 street:Preflop streetActionNo:7 action:call amount:3 -player_name:Player_2 street:Flop streetActionNo:0 action:check amount:0 -player_name:Player_2 street:Flop streetActionNo:3 action:call amount:2 -player_name:Player_2 street:Turn streetActionNo:0 action:check amount:0 -player_name:Player_2 street:Turn streetActionNo:3 action:call amount:4 -player_name:Player_2 street:River streetActionNo:0 action:check amount:0 -player_name:Player_2 street:River streetActionNo:3 action:fold amount:0 -player_name:Player_3 street:Preflop streetActionNo:1 action:blind amount:2 -player_name:Player_3 street:Preflop streetActionNo:8 action:fold amount:0 -player_name:Player_4 street:Preflop streetActionNo:2 action:bet amount:4 -player_name:Player_4 street:Flop streetActionNo:1 action:bet amount:2 -player_name:Player_4 street:Turn streetActionNo:1 action:bet amount:4 -player_name:Player_4 street:River streetActionNo:1 action:bet amount:4 -player_name:Player_5 street:Preflop streetActionNo:3 action:fold amount:0 -player_name:Player_6 street:Preflop streetActionNo:4 action:fold amount:0 -player_name:Player_7 street:Preflop streetActionNo:5 action:fold amount:0 +From Table HandsActions +======================= +playerName:Player_1 street:Preflop streetActionNo:6 action:call amount:4 +playerName:Player_1 street:Flop streetActionNo:2 action:call amount:2 +playerName:Player_1 street:Turn streetActionNo:2 action:call amount:4 +playerName:Player_1 street:River streetActionNo:2 action:fold amount:0 +playerName:Player_2 street:Preflop streetActionNo:0 action:blind amount:1 +playerName:Player_2 street:Preflop streetActionNo:7 action:call amount:3 +playerName:Player_2 street:Flop streetActionNo:0 action:check amount:0 +playerName:Player_2 street:Flop streetActionNo:3 action:call amount:2 +playerName:Player_2 street:Turn streetActionNo:0 action:check amount:0 +playerName:Player_2 street:Turn streetActionNo:3 action:call amount:4 +playerName:Player_2 street:River streetActionNo:0 action:check amount:0 +playerName:Player_2 street:River streetActionNo:3 action:fold amount:0 +playerName:Player_3 street:Preflop streetActionNo:1 action:blind amount:2 +playerName:Player_3 street:Preflop streetActionNo:8 action:fold amount:0 +playerName:Player_4 street:Preflop streetActionNo:2 action:bet amount:4 +playerName:Player_4 street:Flop streetActionNo:1 action:bet amount:2 +playerName:Player_4 street:Turn streetActionNo:1 action:bet amount:4 +playerName:Player_4 street:River streetActionNo:1 action:bet amount:4 +playerName:Player_5 street:Preflop streetActionNo:3 action:fold amount:0 +playerName:Player_6 street:Preflop streetActionNo:4 action:fold amount:0 +playerName:Player_7 street:Preflop streetActionNo:5 action:fold amount:0 diff --git a/regression-test/ps.14519420999.expected.txt b/regression-test/ps.14519420999.expected.txt index ba18560f..3f42bb0a 100644 --- a/regression-test/ps.14519420999.expected.txt +++ b/regression-test/ps.14519420999.expected.txt @@ -1,46 +1,49 @@ Connected to MySQL on localhost. Print Hand Utility -options.site: PokerStars site_id: 2 +options.site: PokerStars siteId: 2 -From Table gametypes +From Table Hands +================ +handId: 2 tableName: Merope siteHandNo: 14519420999 gametypeId: 1 handStart: 2008-01-13 05:23:43 seats: 7 maxSeats: 10 + +From Table Gametypes ==================== -type: ring category: holdem limit_type: fl +type: ring base: hold category: holdem limitType: fl hiLo: h sb: 1 bb: 2 sbet: 2 bbet: 4 -From Table hands -================ -site_hand_no: 14519420999 hand_start: 2008-01-13 05:23:43 seat_count: 7 +From Table BoardCards +===================== Board cards: Th Jd 3c 7c 4s -From Table hands_players -======================== -player_name:Player_1 player_startcash:65 position:2 off Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_2 player_startcash:49 position:1 off Btn cards:8s 9s winnings:35 rake:1 -player_name:Player_3 player_startcash:179 position:Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_4 player_startcash:205 position:SB cards:?? ?? winnings:0 rake:0 -player_name:Player_5 player_startcash:118 position:BB cards:Qh Js winnings:0 rake:0 -player_name:Player_6 player_startcash:34 position:4 off Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_7 player_startcash:135 position:3 off Btn cards:8d 5d winnings:0 rake:0 +From Table HandsPlayers +======================= +playerName:Player_1 playerStartcash:65 position:2 off Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_2 playerStartcash:49 position:1 off Btn cards:8s 9s winnings:35 rake:1 +playerName:Player_3 playerStartcash:179 position:Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_4 playerStartcash:205 position:SB cards:?? ?? winnings:0 rake:0 +playerName:Player_5 playerStartcash:118 position:BB cards:Qh Js winnings:0 rake:0 +playerName:Player_6 playerStartcash:34 position:4 off Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_7 playerStartcash:135 position:3 off Btn cards:8d 5d winnings:0 rake:0 -From Table hands_actions -======================== -player_name:Player_1 street:Preflop streetActionNo:4 action:fold amount:0 -player_name:Player_2 street:Preflop streetActionNo:5 action:call amount:2 -player_name:Player_2 street:Flop streetActionNo:2 action:call amount:2 -player_name:Player_2 street:Turn streetActionNo:2 action:bet amount:8 -player_name:Player_2 street:River streetActionNo:1 action:bet amount:4 -player_name:Player_3 street:Preflop streetActionNo:6 action:fold amount:0 -player_name:Player_4 street:Preflop streetActionNo:0 action:blind amount:1 -player_name:Player_4 street:Preflop streetActionNo:7 action:call amount:1 -player_name:Player_4 street:Flop streetActionNo:0 action:check amount:0 -player_name:Player_4 street:Flop streetActionNo:3 action:call amount:2 -player_name:Player_4 street:Turn streetActionNo:0 action:check amount:0 -player_name:Player_4 street:Turn streetActionNo:3 action:fold amount:0 -player_name:Player_5 street:Preflop streetActionNo:1 action:blind amount:2 -player_name:Player_5 street:Preflop streetActionNo:8 action:check amount:0 -player_name:Player_5 street:Flop streetActionNo:1 action:bet amount:2 -player_name:Player_5 street:Turn streetActionNo:1 action:bet amount:4 -player_name:Player_5 street:Turn streetActionNo:4 action:call amount:4 -player_name:Player_5 street:River streetActionNo:0 action:check amount:0 -player_name:Player_5 street:River streetActionNo:2 action:call amount:4 -player_name:Player_6 street:Preflop streetActionNo:2 action:fold amount:0 -player_name:Player_7 street:Preflop streetActionNo:3 action:fold amount:0 +From Table HandsActions +======================= +playerName:Player_1 street:Preflop streetActionNo:4 action:fold amount:0 +playerName:Player_2 street:Preflop streetActionNo:5 action:call amount:2 +playerName:Player_2 street:Flop streetActionNo:2 action:call amount:2 +playerName:Player_2 street:Turn streetActionNo:2 action:bet amount:8 +playerName:Player_2 street:River streetActionNo:1 action:bet amount:4 +playerName:Player_3 street:Preflop streetActionNo:6 action:fold amount:0 +playerName:Player_4 street:Preflop streetActionNo:0 action:blind amount:1 +playerName:Player_4 street:Preflop streetActionNo:7 action:call amount:1 +playerName:Player_4 street:Flop streetActionNo:0 action:check amount:0 +playerName:Player_4 street:Flop streetActionNo:3 action:call amount:2 +playerName:Player_4 street:Turn streetActionNo:0 action:check amount:0 +playerName:Player_4 street:Turn streetActionNo:3 action:fold amount:0 +playerName:Player_5 street:Preflop streetActionNo:1 action:blind amount:2 +playerName:Player_5 street:Preflop streetActionNo:8 action:check amount:0 +playerName:Player_5 street:Flop streetActionNo:1 action:bet amount:2 +playerName:Player_5 street:Turn streetActionNo:1 action:bet amount:4 +playerName:Player_5 street:Turn streetActionNo:4 action:call amount:4 +playerName:Player_5 street:River streetActionNo:0 action:check amount:0 +playerName:Player_5 street:River streetActionNo:2 action:call amount:4 +playerName:Player_6 street:Preflop streetActionNo:2 action:fold amount:0 +playerName:Player_7 street:Preflop streetActionNo:3 action:fold amount:0 diff --git a/regression-test/ps.14519433154.expected.txt b/regression-test/ps.14519433154.expected.txt index 6e739a5a..2754cd4d 100644 --- a/regression-test/ps.14519433154.expected.txt +++ b/regression-test/ps.14519433154.expected.txt @@ -1,55 +1,58 @@ Connected to MySQL on localhost. Print Hand Utility -options.site: PokerStars site_id: 2 +options.site: PokerStars siteId: 2 -From Table gametypes +From Table Hands +================ +handId: 3 tableName: Merope siteHandNo: 14519433154 gametypeId: 1 handStart: 2008-01-13 05:24:25 seats: 7 maxSeats: 10 + +From Table Gametypes ==================== -type: ring category: holdem limit_type: fl +type: ring base: hold category: holdem limitType: fl hiLo: h sb: 1 bb: 2 sbet: 2 bbet: 4 -From Table hands -================ -site_hand_no: 14519433154 hand_start: 2008-01-13 05:24:25 seat_count: 7 +From Table BoardCards +===================== Board cards: 4h 9s Ad Qc Ks -From Table hands_players -======================== -player_name:Player_1 player_startcash:65 position:3 off Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_2 player_startcash:68 position:2 off Btn cards:?? ?? winnings:0 rake:0 -player_name:Player_3 player_startcash:179 position:1 off Btn cards:Ah 9d winnings:92 rake:4 -player_name:Player_4 player_startcash:201 position:Btn cards:Ac Td winnings:0 rake:0 -player_name:Player_5 player_startcash:102 position:SB cards:?? ?? winnings:0 rake:0 -player_name:Player_6 player_startcash:34 position:BB cards:?? ?? winnings:0 rake:0 -player_name:Player_7 player_startcash:135 position:4 off Btn cards:7c Jh winnings:0 rake:0 +From Table HandsPlayers +======================= +playerName:Player_1 playerStartcash:65 position:3 off Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_2 playerStartcash:68 position:2 off Btn cards:?? ?? winnings:0 rake:0 +playerName:Player_3 playerStartcash:179 position:1 off Btn cards:Ah 9d winnings:92 rake:4 +playerName:Player_4 playerStartcash:201 position:Btn cards:Ac Td winnings:0 rake:0 +playerName:Player_5 playerStartcash:102 position:SB cards:?? ?? winnings:0 rake:0 +playerName:Player_6 playerStartcash:34 position:BB cards:?? ?? winnings:0 rake:0 +playerName:Player_7 playerStartcash:135 position:4 off Btn cards:7c Jh winnings:0 rake:0 -From Table hands_actions -======================== -player_name:Player_1 street:Preflop streetActionNo:3 action:fold amount:0 -player_name:Player_2 street:Preflop streetActionNo:4 action:fold amount:0 -player_name:Player_3 street:Preflop streetActionNo:5 action:call amount:2 -player_name:Player_3 street:Preflop streetActionNo:9 action:call amount:2 -player_name:Player_3 street:Flop streetActionNo:2 action:bet amount:2 -player_name:Player_3 street:Flop streetActionNo:6 action:bet amount:4 -player_name:Player_3 street:Flop streetActionNo:8 action:call amount:2 -player_name:Player_3 street:Turn streetActionNo:0 action:bet amount:4 -player_name:Player_3 street:Turn streetActionNo:2 action:bet amount:8 -player_name:Player_3 street:Turn streetActionNo:4 action:call amount:4 -player_name:Player_3 street:River streetActionNo:0 action:bet amount:4 -player_name:Player_3 street:River streetActionNo:2 action:bet amount:8 -player_name:Player_3 street:River streetActionNo:4 action:call amount:4 -player_name:Player_4 street:Preflop streetActionNo:6 action:call amount:2 -player_name:Player_4 street:Preflop streetActionNo:10 action:call amount:2 -player_name:Player_4 street:Flop streetActionNo:3 action:bet amount:4 -player_name:Player_4 street:Flop streetActionNo:7 action:bet amount:4 -player_name:Player_4 street:Turn streetActionNo:1 action:bet amount:8 -player_name:Player_4 street:Turn streetActionNo:3 action:bet amount:8 -player_name:Player_4 street:River streetActionNo:1 action:bet amount:8 -player_name:Player_4 street:River streetActionNo:3 action:bet amount:8 -player_name:Player_5 street:Preflop streetActionNo:0 action:blind amount:1 -player_name:Player_5 street:Preflop streetActionNo:7 action:bet amount:3 -player_name:Player_5 street:Flop streetActionNo:0 action:check amount:0 -player_name:Player_5 street:Flop streetActionNo:4 action:fold amount:0 -player_name:Player_6 street:Preflop streetActionNo:1 action:blind amount:2 -player_name:Player_6 street:Preflop streetActionNo:8 action:call amount:2 -player_name:Player_6 street:Flop streetActionNo:1 action:check amount:0 -player_name:Player_6 street:Flop streetActionNo:5 action:fold amount:0 -player_name:Player_7 street:Preflop streetActionNo:2 action:fold amount:0 +From Table HandsActions +======================= +playerName:Player_1 street:Preflop streetActionNo:3 action:fold amount:0 +playerName:Player_2 street:Preflop streetActionNo:4 action:fold amount:0 +playerName:Player_3 street:Preflop streetActionNo:5 action:call amount:2 +playerName:Player_3 street:Preflop streetActionNo:9 action:call amount:2 +playerName:Player_3 street:Flop streetActionNo:2 action:bet amount:2 +playerName:Player_3 street:Flop streetActionNo:6 action:bet amount:4 +playerName:Player_3 street:Flop streetActionNo:8 action:call amount:2 +playerName:Player_3 street:Turn streetActionNo:0 action:bet amount:4 +playerName:Player_3 street:Turn streetActionNo:2 action:bet amount:8 +playerName:Player_3 street:Turn streetActionNo:4 action:call amount:4 +playerName:Player_3 street:River streetActionNo:0 action:bet amount:4 +playerName:Player_3 street:River streetActionNo:2 action:bet amount:8 +playerName:Player_3 street:River streetActionNo:4 action:call amount:4 +playerName:Player_4 street:Preflop streetActionNo:6 action:call amount:2 +playerName:Player_4 street:Preflop streetActionNo:10 action:call amount:2 +playerName:Player_4 street:Flop streetActionNo:3 action:bet amount:4 +playerName:Player_4 street:Flop streetActionNo:7 action:bet amount:4 +playerName:Player_4 street:Turn streetActionNo:1 action:bet amount:8 +playerName:Player_4 street:Turn streetActionNo:3 action:bet amount:8 +playerName:Player_4 street:River streetActionNo:1 action:bet amount:8 +playerName:Player_4 street:River streetActionNo:3 action:bet amount:8 +playerName:Player_5 street:Preflop streetActionNo:0 action:blind amount:1 +playerName:Player_5 street:Preflop streetActionNo:7 action:bet amount:3 +playerName:Player_5 street:Flop streetActionNo:0 action:check amount:0 +playerName:Player_5 street:Flop streetActionNo:4 action:fold amount:0 +playerName:Player_6 street:Preflop streetActionNo:1 action:blind amount:2 +playerName:Player_6 street:Preflop streetActionNo:8 action:call amount:2 +playerName:Player_6 street:Flop streetActionNo:1 action:check amount:0 +playerName:Player_6 street:Flop streetActionNo:5 action:fold amount:0 +playerName:Player_7 street:Preflop streetActionNo:2 action:fold amount:0 diff --git a/regression-test/regression-test.sh b/regression-test/regression-test.sh index 0982958e..b72092b5 100755 --- a/regression-test/regression-test.sh +++ b/regression-test/regression-test.sh @@ -15,7 +15,7 @@ #In the "official" distribution you can find the license in #agpl-3.0.txt in the docs folder of the package. -echo "Please note for this to really work you need to work on an empty database" +echo "Please note for this to work you need to work on an empty database, otherwise some info (the id fields) will be off" rm *.found.txt ../pyfpdb/fpdb_import.py -p$1 --file=ps-lhe-ring-3hands.txt -x @@ -26,11 +26,11 @@ rm *.found.txt echo "it should've reported first that it stored 3, then that it had 3 duplicates" #echo " then 1 stored, then 5 stored" -./print_hand.py -p$1 --hand=14519394979 > ps.14519394979.found.txt && colordiff ps.14519394979.found.txt ps.14519394979.expected.txt -./print_hand.py -p$1 --hand=14519420999 > ps.14519420999.found.txt && colordiff ps.14519420999.found.txt ps.14519420999.expected.txt -./print_hand.py -p$1 --hand=14519433154 > ps.14519433154.found.txt && colordiff ps.14519433154.found.txt ps.14519433154.expected.txt +./PrintHand.py -p$1 --hand=14519394979 > ps.14519394979.found.txt && colordiff ps.14519394979.found.txt ps.14519394979.expected.txt +./PrintHand.py -p$1 --hand=14519420999 > ps.14519420999.found.txt && colordiff ps.14519420999.found.txt ps.14519420999.expected.txt +./PrintHand.py -p$1 --hand=14519433154 > ps.14519433154.found.txt && colordiff ps.14519433154.found.txt ps.14519433154.expected.txt -./PrintPlayerHudData.py -p$1 > ps-flags-3hands.found.txt && colordiff ps-flags-3hands.found.txt ps-flags-3hands.expected.txt +#./PrintPlayerHudData.py -p$1 > ps-flags-3hands.found.txt && colordiff ps-flags-3hands.found.txt ps-flags-3hands.expected.txt #./print_hand.py -p$1 --site="Full Tilt Poker" --hand=6367428246 > ftp.6367428246.found.txt && colordiff ftp.6367428246.found.txt ftp.6367428246.expected.txt