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

Fixed a re matching problem for sites (OnGame, Carbon) which include char after the newline in re_SplitHands

Browse Source
This commit is contained in:
Chaz 2010-10-12 22:47:22 -04:00
parent d517606a59
commit 6ce42df734
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pyfpdb/SplitHandHistory.py
View File

@ -44,6 +44,7 @@ class SplitHandHistory:
self.archive = archive self.archive = archive
self.re_SplitHands = None self.re_SplitHands = None
self.line_delimiter = None self.line_delimiter = None
self.line_addendum = None
self.filedone = False self.filedone = False
#Acquire re_SplitHands for this hh #Acquire re_SplitHands for this hh
@ -52,13 +53,18 @@ class SplitHandHistory:
mod = __import__(filter) mod = __import__(filter)
obj = getattr(mod, filter_name, None) obj = getattr(mod, filter_name, None)
self.re_SplitHands = obj.re_SplitHands self.re_SplitHands = obj.re_SplitHands
#Determine line delimiter type if any #Determine line delimiter type if any
if self.re_SplitHands.match('\n\n'): if self.re_SplitHands.match('\n\n'):
self.line_delimiter = '\n\n' self.line_delimiter = '\n\n'
elif self.re_SplitHands.match('\n\n\n'): if self.re_SplitHands.match('\n\n\n'):
self.line_delimiter = '\n\n\n' self.line_delimiter = '\n\n\n'
else:
pass #Add new line addendum for sites which match SplitHand to next line as well
if site == 'OnGame':
self.line_addendum = '*'
if site == 'Carbon':
self.line_addendum = '<game'
#Open the gargantuan file #Open the gargantuan file
try: try:
@ -72,6 +78,7 @@ class SplitHandHistory:
print 'File not found' print 'File not found'
sys.exit(2) sys.exit(2)
#Split with do_hands_per_file if archive and paragraphs if a regular hh
if self.archive: if self.archive:
nn = 0 nn = 0
while True: while True:
@ -86,7 +93,7 @@ class SplitHandHistory:
filenum += 1 filenum += 1
outfile = self.new_file(filenum) outfile = self.new_file(filenum)
handnum = 0 handnum = 0
for hand in self.paragraphs(infile): for hand in self.paragraphs(infile, None, self.line_addendum):
outfile.write(hand) outfile.write(hand)
if self.line_delimiter: if self.line_delimiter:
outfile.write(self.line_delimiter) outfile.write(self.line_delimiter)
@ -125,15 +132,15 @@ class SplitHandHistory:
return None return None
#Non-Archive Hand Splitter #Non-Archive Hand Splitter
def paragraphs(self, file, separator=None): def paragraphs(self, file, separator=None, addendum=None):
if not callable(separator) and self.line_delimiter: if not callable(separator) and self.line_delimiter:
def separator(line): return line == '\n' def separator(line): return line == '\n'
else: else:
def separator(sline): return self.re_SplitHands.search(line) def separator(line): return self.re_SplitHands.search(line)
file_str = StringIO() file_str = StringIO()
print file_str.getvalue() print file_str.getvalue()
for line in file: for line in file:
if separator(line): if separator(line+addendum):
if file_str.getvalue(): if file_str.getvalue():
if not self.line_delimiter: if not self.line_delimiter:
file_str.write(line) file_str.write(line)
@ -203,8 +210,6 @@ def main(argv=None):
config = Configuration.Config(file = "HUD_config.test.xml") config = Configuration.Config(file = "HUD_config.test.xml")
print options.archive
if not options.filename: if not options.filename:
pass pass
else: else: