From ad22cd561910a4da6fd4d8e7383d3b00e526c289 Mon Sep 17 00:00:00 2001
From: Loïc Guégan <manzerbredes@mailbox.org>
Date: Thu, 24 Jul 2025 20:50:31 +0200
Subject: Minor changes

---
 main.py | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'main.py')

diff --git a/main.py b/main.py
index dcaa6d8..b3ce9fd 100755
--- a/main.py
+++ b/main.py
@@ -48,7 +48,7 @@ def getevents(d):
             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:]):
+    if not i["output"]["defrag"] or any(len(x) > 0 for x in row[1:]):
         t.add_row(row,divider=True)
         return 1
     return 0
@@ -68,6 +68,7 @@ while d <= send:
     t = PrettyTable(min_width=i["output"]["min_col_width"])
     week=i["output"]["labels"]["weeks"].format(w) if i["output"]["show_weeks"] else ""
     t.field_names = [week, "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]
+    rcount=0
     if i["output"]["show_dates"]:
         add_row(t,[i["output"]["labels"]["dates"],
                    formatday(getnextdayn(d, 0)),
@@ -76,27 +77,27 @@ while d <= send:
                    formatday(getnextdayn(d, 3)),
                    formatday(getnextdayn(d, 4))])
     if i["output"]["show_assigments"]:
-        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))])
-    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))])
+        rcount+=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))])
+    rcount+=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))])
     if i["output"]["show_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))])
-#        t.add_row(,divider=True)
+        rcount+=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))])
     print(t)
-    print()
+    for j in range(0,i["output"]["week_line_skip"]):
+        print("")
     d=getnextmonday(d)
     w+=1
-- 
cgit v1.2.3