import time

def getname():
        fmtstr = '%Y-%m-%d-%H'
#       fmtstr = '%Y-%m-%d-%H-%M'
        fbase = "/var/www/meter/data/"
        fname = time.strftime(fbase + fmtstr, time.localtime())
        return fname

f = None

def getnew():
	global f
	if not f:
		f = open(getName(), 'r')
	new = []
	# get all new stuff
	lines = f.read()
	if (getname() != f.name):
		f.close()
		f = open(getname(), 'r')
		print "Opened new file %s" % f.name
		lines = lines + f.read()
	for l in lines.split():
		if (len(l) > 3 and l[0:4] == '#d,-'):
			ws = l.split(',')[3]
			new.append(int(ws))

	return new