Turn lift date and time strings into struct Time

[beifahrer] / src / beifahrer-cli.vala

diff --git a/src/beifahrer-cli.vala b/src/beifahrer-cli.vala
index 9b5b1ef..74ad7c0 100644 (file)
--- a/src/beifahrer-cli.vala
+++ b/src/beifahrer-cli.vala
@@ -25,7 +25,10 @@ async void get_lifts (string city_from, string city_to, Date date) {
 
        var lift_list = yield adac.get_lift_list (city_from, city_to, date);
        foreach (Lift lift in lift_list) {
-               print ("%s\t%s\t%s\t%s\t%d\t%s\t", lift.city_from, lift.city_to, lift.date, lift.time, lift.places, lift.price);
+               string datetime = "%02d.%02d.%02d".printf (lift.time.day, lift.time.month, lift.time.year);
+               if (lift.time.hour >= 0)
+                       datetime += ", %d:%02d".printf (lift.time.hour, lift.time.minute);
+               print ("%s\t%s\t%s\t%d\t%s\t", lift.city_from, lift.city_to, datetime, lift.places, lift.price);
                if (LiftFlags.SMOKER in lift.flags)
                        print ("smoker ");
                else if (LiftFlags.NON_SMOKER in lift.flags)
@@ -46,7 +49,10 @@ async void get_details (string href) {
        lift.href = href;
        yield adac.update_lift_details (lift);
 
-       print ("%s\t%s\t%s\t%s\t%d\t%s\t", lift.city_from, lift.city_to, lift.date, lift.time, lift.places, lift.price);
+       string datetime = "%02d.%02d.%02d".printf (lift.time.day, lift.time.month, lift.time.year);
+       if (lift.time.hour >= 0)
+               datetime += ", %d:%02d".printf (lift.time.hour, lift.time.minute);
+       print ("%s\t%s\t%s\t%d\t%s\t", lift.city_from, lift.city_to, datetime, lift.places, lift.price);
        if (LiftFlags.SMOKER in lift.flags)
                print ("smoker ");
        else if (LiftFlags.NON_SMOKER in lift.flags)