Skip to content

Commit

Permalink
initial upload
Browse files Browse the repository at this point in the history
  • Loading branch information
damaex17 committed Nov 29, 2011
1 parent 2bc5d05 commit 16c3258
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 0 deletions.
22 changes: 22 additions & 0 deletions epoch.py
@@ -0,0 +1,22 @@
#!/usr/bin/python
import time
import datetime
import sys
#
# script calculates the time sind epoch (1970-01-01 00:00am UTC)
#

if len(sys.argv) < 2:
print "Usage: %s 2011-10-25 [19:30:00]" % (sys.argv[0])
sys.exit(1)
elif len(sys.argv) !=3:
u_time = "00:00:00"
else:
u_time = sys.argv[2]

u_date = sys.argv[1]
u_input = "%s %s" % (u_date, u_time)
print "epoch for given time: \t %s" % (int(time.mktime(time.strptime(u_input, '%Y-%m-%d %H:%M:%S'))))
now = int( time.time() )
print "epoch timezone: \t %s" % (now)

72 changes: 72 additions & 0 deletions whisper-merge.py
@@ -0,0 +1,72 @@
#!/usr/bin/python

import sys, time
import whisper
from optparse import OptionParser

now = int( time.time() )
epoch = 0

option_parser = OptionParser(usage='''%prog [options] path1 path2''')
option_parser.add_option('--from', default=epoch, type='int', dest='_from',
help=("Unix epoch time of the beginning of "
"your requested interval (default: 24 hours ago)"))
option_parser.add_option('--until', default=now, type='int',
help="Unix epoch time of the end of your requested interval (default: now)")
#option_parser.add_option('--json', default=False, action='store_true',
# help="Output results in JSON form")
#option_parser.add_option('--pretty', default=False, action='store_true',
# help="Show human-readable timestamps instead of unix times")

(options, args) = option_parser.parse_args()

if len(args) != 2:
option_parser.print_usage()
sys.exit(1)

path1 = args[0]
path2 = args[1]

from_time = int( options._from )
until_time = int( options.until )


(timeInfo, values) = whisper.fetch(path1, from_time, until_time)
(start,end,step) = timeInfo

#if options.json:
# values_json = str(values).replace('None','null')
# print '''{
# "start" : %d,
# "end" : %d,
# "step" : %d,
# "values" : %s
# }''' % (start,end,step,values_json)
# sys.exit(0)

t = start
for value in values:
#if options.pretty:
# timestr = time.ctime(t)
#else:
timestr = str(t)
if value is None:
next
#valuestr = "None"
else:
valuestr = "%f" % value
datapoints = [timestr, valuestr]
print datapoints
#whisper.update(path2, valuestr, timestr)
#whisper.update_many(path2, datapoints)
t += step

#datapoints = [tuple(point.split(':')) for point in datapoint_strings]

#if len(datapoints) == 1:
# timestamp,value = datapoints[0]
# whisper.update(path, value, timestamp)
#else:
# print datapoints
# whisper.update_many(path, datapoints)

0 comments on commit 16c3258

Please sign in to comment.