From 4baa9835f9c96e7a7180a4a2affe1c6e9bcd2423 Mon Sep 17 00:00:00 2001 From: eblade Date: Sat, 21 Feb 2009 06:25:12 -0500 Subject: [PATCH 1/3] fix my last patch to use os.path.sep instead of hardcoded "\\" --- pyfpdb/EverleafToFpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 28c75aaf..9d438abe 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -79,7 +79,7 @@ class Everleaf(HandHistoryConverter): self.re_Board = re.compile(r"\[ (?P.+) \]") try: - self.ofile = os.path.join(self.hhdir, file.split("\\")[-2]+"-"+os.path.basename(file)) + self.ofile = os.path.join(self.hhdir, file.split(os.path.sep)[-2]+"-"+os.path.basename(file)) except: self.ofile = os.path.join(self.hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file)) From 89fde673e2dd9765df26d1c49e4f767ea2adc173 Mon Sep 17 00:00:00 2001 From: eblade Date: Sun, 22 Feb 2009 18:03:19 -0500 Subject: [PATCH 2/3] should detect FL games (need to implement way to actually not continue processing FL since we don't support it currently) --- pyfpdb/EverleafToFpdb.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index d3437bbc..0df5e440 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -73,6 +73,8 @@ class Everleaf(HandHistoryConverter): structure = "nl" elif m.group('LTYPE') == "PL": structure = "pl" + else: + structure = "fl" # we don't support it, but there should be how to detect it at least. if m.group('GAME') == "Hold\'em": game = "hold" From b2ee8fa0ce5cabb13a8c36c9df5e3d428671523a Mon Sep 17 00:00:00 2001 From: eblade Date: Mon, 23 Feb 2009 07:56:33 -0500 Subject: [PATCH 3/3] add a couple of missing commas --- pyfpdb/EverleafToFpdb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 0df5e440..4f8748f3 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -55,8 +55,8 @@ class Everleaf(HandHistoryConverter): self.re_SitsOut = re.compile(r"^%s sits out" % player_re, re.MULTILINE) def readSupportedGames(self): - return [["ring", "hold", "nl"] - ["ring", "hold", "pl"] + return [["ring", "hold", "nl"], + ["ring", "hold", "pl"], ["ring", "omaha", "pl"] ]