Debian packaging: 0.0.4-1

[beifahrer] / src / beifahrer-cli.vala

diff --git a/src/beifahrer-cli.vala b/src/beifahrer-cli.vala
index b7e118c..5ee78c8 100644 (file)
--- a/src/beifahrer-cli.vala
+++ b/src/beifahrer-cli.vala
@@ -16,23 +16,19 @@
  * along with Beifahrer. If not, see <http://www.gnu.org/licenses/>.
  */
 
-static int main (string[] args) {
-       var result = Curl.global_init (Curl.GLOBAL_DEFAULT);
-       if (result != Curl.Code.OK)
-               return 1;
-
-       if (args.length < 3) {
-               print ("usage: beifahrer-cli <city_from> <city_to> [date]\n");
-               print ("or:    beifahrer-cli details <lift_url>\n");
-               return 1;
-       }
-
-       var adac = new AdacMitfahrclub ();
+AdacMitfahrclub adac;
+MainLoop loop;
 
-       if (args[1] == "details") {
-               var lift = adac.get_lift_details (args[2]);
+async void get_lifts (string city_from, string city_to, Date date) {
+       print ("Lifts from %s to %s on %d.%d.%d\n", city_from, city_to,
+              date.get_day (), date.get_month (), date.get_year ());
 
-               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);
+       var lift_list = yield adac.get_lift_list (city_from, 0, city_to, 0, date);
+       foreach (Lift lift in lift_list) {
+               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)
@@ -41,14 +37,84 @@ static int main (string[] args) {
                        print ("adac ");
                if  (LiftFlags.WOMEN_ONLY in lift.flags)
                        print ("women ");
-                print ("\n");
-               foreach (string via in lift.city_via) {
-                       print ("\tvia %s\n", via);
+               print ("\n");
+               print ("%s\n", lift.href);
+       }
+
+       loop.quit ();
+}
+
+async void get_details (string href) {
+       var lift = new Lift ();
+       lift.href = href;
+       yield adac.update_lift_details (lift);
+
+       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)
+               print ("non_smoker ");
+       if (LiftFlags.ADAC_MEMBER in lift.flags)
+               print ("adac ");
+       if  (LiftFlags.WOMEN_ONLY in lift.flags)
+               print ("women ");
+               print ("\n");
+       foreach (string via in lift.city_via) {
+               print ("\tvia %s\n", via);
+       }
+
+       string phone;
+       if (lift.cell != null)
+               phone = lift.cell;
+       else if (lift.phone != null)
+               phone = lift.phone;
+       else if (lift.phone2 == null)
+               phone = lift.phone2;
+       else
+               phone = "";
+       print ("Driver: %s (%s)\n", lift.name, phone);
+       print ("Description:\n%s\n", lift.description);
+
+       loop.quit ();
+}
+
+void usage () {
+       print ("usage: beifahrer-cli <city_from> <city_to> [date]\n");
+       print ("or:    beifahrer-cli details <lift_url>\n");
+       print ("or:    beifahrer-cli login <username> <password>\n");
+       print ("or:    beifahrer-cli login <cookie>\n");
+}
+
+static int main (string[] args) {
+       loop = new MainLoop (null);
+
+       if (args.length < 3) {
+               usage ();
+               return 1;
+       }
+
+       Curl.global_init (Curl.GLOBAL_DEFAULT);
+
+       adac = new AdacMitfahrclub ();
+
+       if (args[1] == "login") {
+               if (args.length > 3) {
+                       adac.login (args[2], args[3]);
+               } else {
+                       adac.set_cookie (args[2]);
+                       adac.login (null, null);
                }
+               loop.run ();
+               return 0;
+       }
 
-               print ("Driver: %s (%s)\n", lift.name, lift.phone);
-               print ("Description:\n%s\n", lift.description);
+       if (args[1] == "details") {
+               get_details.begin (args[2]);
 
+               loop.run ();
                return 0;
        }
 
@@ -63,23 +129,9 @@ static int main (string[] args) {
                date.set_time_val (now);
        }
 
-       print ("Lifts from %s to %s on %d.%d.%d\n", city_from, city_to,
-              date.get_day (), date.get_month (), date.get_year ());
+       get_lifts.begin (city_from, city_to, date);
 
-       var lift_list = 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);
-               if (LiftFlags.SMOKER in lift.flags)
-                       print ("smoker ");
-               else if (LiftFlags.NON_SMOKER in lift.flags)
-                       print ("non_smoker ");
-               if (LiftFlags.ADAC_MEMBER in lift.flags)
-                       print ("adac ");
-               if  (LiftFlags.WOMEN_ONLY in lift.flags)
-                       print ("women ");
-               print ("\n");
-               print ("%s\n", lift.href);
-       }
+       loop.run ();
 
        Curl.global_cleanup ();