summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--infos.yaml3
-rwxr-xr-xmain.py22
2 files changed, 16 insertions, 9 deletions
diff --git a/infos.yaml b/infos.yaml
index 759b109..da0fe79 100644
--- a/infos.yaml
+++ b/infos.yaml
@@ -11,7 +11,8 @@ output:
show_dates: yes
show_weeks: yes
semester_dates_as_events: yes
- date_format: "%d.%m"
+ compact: yes
+ date_format: "%b %d"
text_wrap: 15
min_col_width: 12
labels:
diff --git a/main.py b/main.py
index f60a557..dcaa6d8 100755
--- a/main.py
+++ b/main.py
@@ -47,6 +47,11 @@ def getevents(d):
val+=","
val+=str(i["events"][e]["name"])
return textwrap.fill(val,i["output"]["text_wrap"])
+def add_row(t,row):
+ if not i["output"]["compact"] or any(len(x) > 0 for x in row[1:]):
+ t.add_row(row,divider=True)
+ return 1
+ return 0
sstart=parse_date(i["semester"]["start"])
send=parse_date(i["semester"]["end"])
@@ -64,32 +69,33 @@ while d <= send:
week=i["output"]["labels"]["weeks"].format(w) if i["output"]["show_weeks"] else ""
t.field_names = [week, "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]
if i["output"]["show_dates"]:
- t.add_row([i["output"]["labels"]["dates"],
+ add_row(t,[i["output"]["labels"]["dates"],
formatday(getnextdayn(d, 0)),
formatday(getnextdayn(d, 1)),
formatday(getnextdayn(d, 2)),
formatday(getnextdayn(d, 3)),
- formatday(getnextdayn(d, 4))],divider=True)
+ formatday(getnextdayn(d, 4))])
if i["output"]["show_assigments"]:
- t.add_row([i["output"]["labels"]["assignments"],
+ add_row(t,[i["output"]["labels"]["assignments"],
getassign(getnextdayn(d, 0)),
getassign(getnextdayn(d, 1)),
getassign(getnextdayn(d, 2)),
getassign(getnextdayn(d, 3)),
- getassign(getnextdayn(d, 4))],divider=True)
- t.add_row([i["output"]["labels"]["lectures"],
+ getassign(getnextdayn(d, 4))])
+ add_row(t,[i["output"]["labels"]["lectures"],
getlecture(getnextdayn(d, 0)),
getlecture(getnextdayn(d, 1)),
getlecture(getnextdayn(d, 2)),
getlecture(getnextdayn(d, 3)),
- getlecture(getnextdayn(d, 4))],divider=True)
+ getlecture(getnextdayn(d, 4))])
if i["output"]["show_events"]:
- t.add_row([i["output"]["labels"]["events"],
+ add_row(t,[i["output"]["labels"]["events"],
getevents(getnextdayn(d, 0)),
getevents(getnextdayn(d, 1)),
getevents(getnextdayn(d, 2)),
getevents(getnextdayn(d, 3)),
- getevents(getnextdayn(d, 4))],divider=True)
+ getevents(getnextdayn(d, 4))])
+# t.add_row(,divider=True)
print(t)
print()
d=getnextmonday(d)