From de00dd55cb358388f35a6b950c95e68f48fa8192 Mon Sep 17 00:00:00 2001
From: Alasdair Colley <ac@brede.(none)>
Date: Tue, 1 Nov 2011 14:17:01 +0000
Subject: added more feedback when adding events

---
 perc     |  4 +++-
 perc.cfg | 76 ++++++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 46 insertions(+), 34 deletions(-)
 mode change 100644 => 100755 perc

diff --git a/perc b/perc
old mode 100644
new mode 100755
index b3b8d6b..0f8bdc5
--- a/perc
+++ b/perc
@@ -318,7 +318,9 @@ def addEvent(name, start, finish, format="{name} %Y"):
 		sys.exit(1)
 	
 	if name in CONFIG["CUSTOM_EVENTS"]:
-		print "Removing existing event with same name"
+		print "Replaced existing event with new info"
+	else:
+		print "Event added: '%s'" % name
 	
 	event = {
 		"start": start.strftime("%Y-%m-%d %H:%M"),
diff --git a/perc.cfg b/perc.cfg
index 2abf07e..041d2c9 100644
--- a/perc.cfg
+++ b/perc.cfg
@@ -5,10 +5,10 @@
             "hyphens": "%Y-%m-%d"
         }, 
         "time": {
-            "military": "%H%M", 
             "12hour": "%I:%M%p", 
+            "civilian": "%H:%M", 
             "12houronly": "%I%p", 
-            "civilian": "%H:%M"
+            "military": "%H%M"
         }
     }, 
     "RATIO_SIGFIGS": 3, 
@@ -32,124 +32,129 @@
     "DEFAULTS": {
         "daveg": {
             "start": "07:30", 
+            "format": "%H:%M", 
             "finish": "18:00", 
-            "output": "bar", 
             "lunch": {
                 "start": "12:30", 
                 "finish": "13:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
         "bikeman": {
             "start": "09:00", 
+            "format": "%I%p", 
             "finish": "17:00", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%I%p"
+            "output": "bar"
         }, 
         "wjoe": {
             "start": "09:00", 
+            "format": "%I%p", 
             "finish": "17:00", 
-            "output": "bar", 
             "lunch": {
                 "start": "12:00", 
                 "finish": "13:00"
             }, 
-            "format": "%I%p"
+            "output": "bar"
         }, 
         "default": {
             "start": "09:00", 
+            "format": "%H:%M", 
             "finish": "17:00", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
-        "jagw": {
-            "start": "09:00", 
-            "finish": "18:00", 
-            "output": "bar", 
+        "l_bratch": {
+            "start": "08:30", 
+            "format": "%H:%M", 
+            "finish": "17:00", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%I%p"
+            "output": "bar"
         }, 
         "bottlecap": {
             "start": "09:00", 
+            "format": "%H:%M", 
             "finish": "17:30", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
         "carpnet": {
             "start": "10:00", 
+            "format": "%H:%M", 
             "finish": "19:00", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
         "miniwork": {
             "start": "09:00", 
+            "format": "%H:%M", 
             "finish": "17:30", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
         "otherlw": {
             "start": "10:00", 
+            "format": "%H:%M", 
             "finish": "19:00", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
-        "l_bratch": {
-            "start": "08:30", 
-            "finish": "17:00", 
-            "output": "bar", 
+        "jagw": {
+            "start": "09:00", 
+            "format": "%I%p", 
+            "finish": "18:00", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }, 
         "sbeans": {
             "start": "09:00", 
+            "format": "%H:%M", 
             "finish": "17:30", 
-            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "format": "%H:%M"
+            "output": "bar"
         }
     }, 
     "OUTPUT": {
         "PERCENTAGE": "{ratio:.2%} {finish} ({start} start)", 
         "BAR": {
-            "length_mobile": 30, 
+            "character": "-", 
             "length": 40, 
-            "character": "-"
+            "length_mobile": 30
         }
     }, 
     "CUSTOM_EVENTS": {
+        "Test": {
+            "start": "1900-01-01 17:00", 
+            "finish": "1900-01-01 18:00", 
+            "format": "{name} %Y"
+        }, 
         "tg": {
             "start": "2010-04-24 10:00", 
             "finish": "2011-04-04 12:00", 
@@ -159,6 +164,11 @@
             "start": "2011-09-04 18:00", 
             "finish": "2011-11-11 20:00", 
             "format": "{name} (%y-%m-%d %H:%M)"
+        }, 
+        "Skyrim": {
+            "start": "2011-11-01 00:00", 
+            "finish": "2011-11-11 00:00", 
+            "format": "{name} %Y"
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3