Software Freedom Law Center

Changeset 175

Show
Ignore:
Timestamp:
07/09/08 16:17:13 (3 months ago)
Author:
landon
Message:

Entry API now connects correctly to the REST server and sends the proper types

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/antimatter/luke/myplugs/libtracker/entry.py

    r174 r175  
    44 
    55def add(user, adjustment): 
    6     restconn = TimeObj('http://localhost:8888/timedb') 
     6    restconn = TimeObj('http://localhost:8888/timedb/') 
    77    result = restconn.add(user.name,'default', adjustment.start, adjustment.duration) 
    8     print result 
    98    return result 
  • trunk/antimatter/luke/myplugs/libtracker/timeadjustment.py

    r169 r175  
     1import datetime as dt 
     2 
     3from calendar import timegm 
     4 
    15class TimeAdjustment(): 
    26    """This class goes between the IRC parser and the entry API""" 
     
    1418        # All of these should be datetime objects, except for duration which should be 
    1519        # a relativedelta object 
     20        if (not date == None): 
     21            adj_date = date 
    1622        if (not start == None): 
    17             self.start = start 
     23            self.start = timegm(start.timetuple()) 
    1824            waiting = 1 
    1925        if (not end == None): 
    20             self.end = end 
     26            self.end = timegm(end.timetuple()) 
    2127            waiting = 0 
    2228        if (not duration == None): 
    23             self.duration = duration 
     29            self.duration = (duration.days)*86400+(duration.hours)*3600+(duration.minutes)*60+int(duration.seconds) 
    2430            waiting = 0 
    25         if (not date == None): 
    26             adj_date = date 
    2731 
  • trunk/antimatter/luke/myplugs/libtracker/timeparser.py

    r174 r175  
    1212def msgparse(ievent): 
    1313    dtime = extractor(ievent) 
    14     ievent.reply(repr(dtime)) 
    1514    if (dtime): 
    1615        user = check_auth(ievent) 
     
    4443    last = r"(?: for (.*))?$" 
    4544    #setdate = re.findall(r"^on (\b\w+\b).?[,:](.*)", ievent.txt, re.I) 
    46     when = re.search(second + last, setdate['rest'], re.I).groupdict() 
     45    when = re.search(second + last, setdate['rest'], re.I) 
    4746    if (when): 
     47        when = when.groupdict() 
    4848        t_one = when['t_one'] 
    4949        t_two = when['t_two'] 
     
    5656        end = parse(t_two, fuzzy = True) 
    5757        time = relativedelta(end, start) 
     58        start = date + relativedelta(start, dt.datetime.today()) 
     59        end = date + relativedelta(end, dt.datetime.today()) 
    5860        reply = "Worked on: " + date.ctime() + " for " + repr(time) 
    5961        ievent.reply(reply) 

SFLC Main Page

[frdm] Support SFLC