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

get rid of thread

Browse Source
This commit is contained in:
Matt Turnbull 2009-03-12 12:24:23 +00:00
parent cd3d4ef835
commit 76e467a5d4
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/EverleafToFpdb.py
View File

@ -51,6 +51,7 @@ debugging: if False, pass on partially supported game types. If true, have a go
self.debugging = debugging self.debugging = debugging
if autostart: if autostart:
self.start() self.start()
# otherwise you need to call start yourself.
def compilePlayerRegexs(self, hand): def compilePlayerRegexs(self, hand):
players = set([player[1] for player in hand.players]) players = set([player[1] for player in hand.players])

16
pyfpdb/HandHistoryConverter.py
View File

@ -18,7 +18,6 @@
import Hand import Hand
import re import re
import sys import sys
import threading
import traceback import traceback
import logging import logging
from optparse import OptionParser from optparse import OptionParser
@ -72,10 +71,9 @@ letter2names = {
import gettext import gettext
gettext.install('myapplication') gettext.install('myapplication')
class HandHistoryConverter(threading.Thread): class HandHistoryConverter():
READ_CHUNK_SIZE = 1000 # bytes to read at a time from file READ_CHUNK_SIZE = 1000 # bytes to read at a time from file
def __init__(self, in_path = '-', out_path = '-', sitename = None, follow=False): def __init__(self, in_path = '-', out_path = '-', sitename = None, follow=False):
threading.Thread.__init__(self)
logging.info("HandHistory init called") logging.info("HandHistory init called")
# default filetype and codepage. Subclasses should set these properly. # default filetype and codepage. Subclasses should set these properly.
@ -110,7 +108,7 @@ class HandHistoryConverter(threading.Thread):
#tmp = tmp + "\tsb/bb: '%s/%s'\n" % (self.gametype[3], self.gametype[4]) #tmp = tmp + "\tsb/bb: '%s/%s'\n" % (self.gametype[3], self.gametype[4])
return tmp return tmp
def run(self): def start(self):
"""process a hand at a time from the input specified by in_path. """process a hand at a time from the input specified by in_path.
If in follow mode, wait for more data to turn up. If in follow mode, wait for more data to turn up.
Otherwise, finish at eof...""" Otherwise, finish at eof..."""
@ -135,9 +133,9 @@ Otherwise, finish at eof..."""
def tailHands(self): def tailHands(self):
"""Generator of handTexts from a tailed file: """Generator of handTexts from a tailed file:
Tail the in_path file and yield handTexts separated by re_SplitHands""" Tail the in_path file and yield handTexts separated by re_SplitHands"""
if in_path == '-': raise StopIteration if self.in_path == '-': raise StopIteration
interval = 1.0 # seconds to sleep between reads for new data interval = 1.0 # seconds to sleep between reads for new data
fd = open(filename,'r') fd = codecs.open(self.in_path,'r', self.codepage)
data = '' data = ''
while 1: while 1:
where = fd.tell() where = fd.tell()
@ -145,15 +143,15 @@ Tail the in_path file and yield handTexts separated by re_SplitHands"""
if not newdata: if not newdata:
fd_results = os.fstat(fd.fileno()) fd_results = os.fstat(fd.fileno())
try: try:
st_results = os.stat(filename) st_results = os.stat(self.in_path)
except OSError: except OSError:
st_results = fd_results st_results = fd_results
if st_results[1] == fd_results[1]: if st_results[1] == fd_results[1]:
time.sleep(interval) time.sleep(interval)
fd.seek(where) fd.seek(where)
else: else:
print "%s changed inode numbers from %d to %d" % (filename, fd_results[1], st_results[1]) print "%s changed inode numbers from %d to %d" % (self.in_path, fd_results[1], st_results[1])
fd = open(filename, 'r') fd = codecs.open(self.in_path, 'r', self.codepage)
fd.seek(where) fd.seek(where)
else: else:
# yield hands # yield hands

2
pyfpdb/fpdb_import.py
View File

@ -241,7 +241,7 @@ class Importer:
out_path = os.path.join(hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file)) out_path = os.path.join(hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
#out_fh = open(ofile, 'w') # TODO: seek to previous place in input and append output #out_fh = open(ofile, 'w') # TODO: seek to previous place in input and append output
conv = EverleafToFpdb.Everleaf(in_path = file, out_path = out_path) conv = EverleafToFpdb.Everleaf(in_path = file, out_path = out_path)
conv.join() #~ conv.join()
elif filter == "FulltiltToFpdb": elif filter == "FulltiltToFpdb":
print "converting ", file print "converting ", file
conv = FulltiltToFpdb.FullTilt(in_fh = file, out_fh = out_fh) conv = FulltiltToFpdb.FullTilt(in_fh = file, out_fh = out_fh)