Changeset 58:b24ccde3e229 in stamper

Timestamp:

Nov 10, 2014, 12:33:51 PM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Use a config file for the setup of certain parameters, instead of
hardcoded global variables (ugh!)

Files:

• bin/stamp (modified) (3 diffs)
• etc/stamper.conf (added)
• stamper/__init__.py (modified) (1 diff)
• stamper/config.py (added)
• stamper/stamper.py (modified) (11 diffs)

bin/stamp

@@ -3 +3 @@
 import sys
 from datetime import datetime
-from stamper import DATETIME_FORMAT, Stamper
+from stamper import Stamper
 
 
@@ -24 +24 @@
     if len(sys.argv) == 1:
         # stamp!
-        s.stamp(datetime.today().strftime(DATETIME_FORMAT), 
+        s.stamp(datetime.today().strftime(s.datetime_format),
                 None, None, None)
 
@@ -35 +35 @@
         customer = sys.argv[1]
         description = ' '.join(sys.argv[2:])
-        s.stamp(current_start, datetime.today().strftime(DATETIME_FORMAT),
+        s.stamp(current_start, datetime.today().strftime(s.datetime_format),
                 customer, description)
 

stamper/__init__.py

@@ -1 @@
-from stamper import DATETIME_FORMAT
 from stamper import Stamper

stamper/stamper.py

@@ -10 +10 @@
 
 from .http import HTTPClient
-
-
-STAMPS_FILE = os.path.expanduser('~/.workstamps.json')
-CHARTS_DIR = os.path.expanduser('~/.workstamps-charts')
-DATE_FORMAT = '%Y-%m-%d'
-TIME_FORMAT = '%H:%M:%S'
-DATETIME_FORMAT = '%Y-%m-%d %H:%M'
-HOURS_DAY = 8
-SECS_DAY = HOURS_DAY * 60 * 60
-REMOTE_BASE_URL = 'https://localhost'
-# IMPORTANT: keep the trailing / on these _URL variables
-REMOTE_LOGIN_URL = '/stamper/login/'
-REMOTE_PUSH_URL = '/stamper/listen/'
-REMOTE_USER = None
-REMOTE_PASSWORD = None
+from .config import Config
 
 
 class Stamper(object):
 
-    def __init__(self, stamps_file=STAMPS_FILE, charts_dir=CHARTS_DIR):
-        self.stamps_file = stamps_file
-        self.charts_dir = charts_dir
+    def __init__(self, config_file=None):
+        self.config = Config(config_file)
+        self.stamps_file = os.path.expanduser(
+            self.config.get('stamps', 'path'))
+        self.charts_dir = os.path.expanduser(
+            self.config.get('charts', 'path'))
+        self.date_format = self.config.get('stamps', 'date_format')
+        self.time_format = self.config.get('stamps', 'time_format')
+        self.datetime_format = self.config.get('stamps', 'datetime_format')
+        self.hours_day = int(self.config.get('sum', 'hours_day'))
+        self.collector = self.config.get('collector')
         self.ensure_stamps_file()
         self.ensure_charts_dir()
@@ -96 +90 @@
 
     def worktime(self, start, end):
-        worktime = (datetime.strptime(end, DATETIME_FORMAT) -
-                    datetime.strptime(start, DATETIME_FORMAT))
+        worktime = (datetime.strptime(end, self.datetime_format) -
+                    datetime.strptime(start, self.datetime_format))
         return worktime.seconds
 
@@ -126 +120 @@
         if '--' in stamp_filter:
             filter_from, filter_to = stamp_filter.split('--')
-            filter_from = datetime.strptime(filter_from, DATE_FORMAT)
-            filter_to = datetime.strptime(filter_to, DATE_FORMAT)
+            filter_from = datetime.strptime(filter_from, self.date_format)
+            filter_to = datetime.strptime(filter_to, self.date_format)
 
         elif stamp_filter.startswith('*'):
-            filter_to = datetime.strptime(stamp_filter, '*'+DATE_FORMAT)
+            filter_to = datetime.strptime(stamp_filter, '*'+self.date_format)
             filter_to = filter_to.replace(hour=0, minute=0, second=0)
 
         elif stamp_filter.endswith('*'):
-            filter_from = datetime.strptime(stamp_filter, DATE_FORMAT+'*')
+            filter_from = datetime.strptime(stamp_filter, self.date_format+'*')
             filter_from = filter_from.replace(hour=0, minute=0, second=0)
 
@@ -167 +161 @@
             # maybe they are giving us a fixed date
             try:
-                filter_from = datetime.strptime(stamp_filter, DATE_FORMAT)
+                filter_from = datetime.strptime(stamp_filter, self.date_format)
             except:
                 # nothing to be used as a filter, go on, printing a warning
@@ -192 +186 @@
             # customer will be None for "start" stamps, having no end time
             if customer:
-                start = datetime.strptime(stamp['start'], DATETIME_FORMAT)
-                end = datetime.strptime(stamp['end'], DATETIME_FORMAT)
+                start = datetime.strptime(stamp['start'], self.datetime_format)
+                end = datetime.strptime(stamp['end'], self.datetime_format)
                 if filter_from and start < filter_from:
                     # if there is a filter setting a starting date for the
@@ -219 +213 @@
                     # it
                     continue
-                start = datetime.strptime(stamp['start'], DATETIME_FORMAT)
+                start = datetime.strptime(stamp['start'], self.datetime_format)
                 start_day = start.strftime('%Y-%m-%d')
-                end = datetime.strptime(stamp['end'], DATETIME_FORMAT)
+                end = datetime.strptime(stamp['end'], self.datetime_format)
                 if filter_from and start < filter_from:
                     # if there is a filter setting a starting date for the
@@ -255 +249 @@
         filter_from, filter_to = self.validate_filter(stamp_filter)
         for stamp in self.stamps:
-            start = datetime.strptime(stamp['start'], DATETIME_FORMAT)
+            start = datetime.strptime(stamp['start'], self.datetime_format)
             start_day = start.strftime('%Y-%m-%d')
             if filter_from and start < filter_from:
@@ -284 +278 @@
         filter_from, filter_to = self.validate_filter(stamp_filter)
         chart = pygal.Bar(title='Work hours per day',
-                          range=(0, HOURS_DAY),
+                          range=(0, self.hours_day),
                           x_title='Days',
                           y_title='Work hours',
@@ -380 +374 @@
                 totalSecs, sec = divmod(seconds, 60)
                 hr, min = divmod(totalSecs, 60)
-                totalDays, remaining = divmod(seconds, SECS_DAY)
+                totalDays, remaining = divmod(seconds,
+                                              (self.hours_day * 60 * 60))
                 remainingMin, remainingSec = divmod(remaining, (60))
                 remainingHr, remainingMin = divmod(remainingMin, (60))
                 print('----- %d:%02d:%02d -----' % (hr, min, sec))
                 print('--- %d days, remaining: %d:%02d (%d hours/day) ---' % (
-                    totalDays, remainingHr, remainingMin, HOURS_DAY
+                    totalDays, remainingHr, remainingMin, self.hours_day
                 ))
 
@@ -444 +439 @@
                 if customer and customer != stamp['customer']:
                     continue
-                start = datetime.strptime(stamp['start'], DATETIME_FORMAT)
+                start = datetime.strptime(stamp['start'], self.datetime_format)
                 start_day = start.strftime('%Y-%m-%d')
-                end = datetime.strptime(stamp['end'], DATETIME_FORMAT)
+                end = datetime.strptime(stamp['end'], self.datetime_format)
                 if filter_from and start < filter_from:
                     # if there is a filter setting a starting date for the
@@ -458 +453 @@
 
         stamps = json.dumps(stamps, indent=4)
-        http_client = HTTPClient(REMOTE_BASE_URL)
-        http_client.post(REMOTE_LOGIN_URL, {'username': REMOTE_USER,
-                                            'password': REMOTE_PASSWORD})
-        http_client.post(REMOTE_PUSH_URL, {'stamps': stamps})
+        http_client = HTTPClient(self.collector['base_url'])
+        http_client.post(self.collector['login_path'],
+                         {'username': self.collector['user'],
+                          'password': self.collector['password']})
+        http_client.post(self.collector['listen_path'], {'stamps': stamps})