From 4bc20854220c7fbfb655a6ed476d12cdafce2f2d Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Fri, 5 Oct 2012 23:35:32 +0200
Subject: fix --help and add --version

---
 Makefile      |  2 +-
 src/main.vala | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a858e44..e44a21e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRC=src/main.vala src/device.vala src/scannersession.vala  src/db.vala src/audio.vala src/web.vala src/graph-data.vala src/template.vala src/websession.vala src/admin.vala src/price.vapi
 DEPS=--pkg posix --pkg linux --pkg libsoup-2.4 --pkg sqlite3 --pkg gee-1.0 --pkg gio-2.0 --pkg gstreamer-0.10
-FLAGS=-X -w --enable-experimental
+FLAGS=-X -w --enable-experimental --thread
 
 barcode-scanner: $(SRC)
 	valac-0.16 --output $@ $(FLAGS) $(DEPS) $^
diff --git a/src/main.vala b/src/main.vala
index b1c91d8..aadafe7 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -20,11 +20,37 @@ public CSVMemberFile csvimport;
 public ScannerSession localsession;
 public MainLoop loop;
 
+const OptionEntry[] option_entries = {
+	{ "version", 'v', OptionFlags.IN_MAIN, OptionArg.NONE, ref opt_version, "output version information and exit", null },
+	{ "", 0, 0, OptionArg.FILENAME_ARRAY, ref files, "serial device", "DEVICE" },
+	{null}
+};
+
+/* parameters */
+static string[] files;
+static bool opt_version;
+
 public static int main(string[] args) {
-	Gst.init(ref args);
+	/* parse parameters from shell */
+	var context = new OptionContext("- KtT Shop System");
+	context.set_help_enabled(true);
+	context.add_main_entries(option_entries, "shop");
+	context.add_group(Gst.init_get_option_group());
+
+	try {
+		context.parse(ref args);
+	} catch(OptionError e) {
+		stderr.puts(e.message + "\n");
+		return 1;
+	}
+
+	if(opt_version) {
+		stdout.puts("Ktt Shop System 0.1\n");
+		return 0;
+	}
 
-	if(args.length < 2) {
-		stderr.printf("%s <device>\n", args[0]);
+	if(files == null || files[0] == null) {
+		stderr.puts("Please specify serial device!\n");
 		return 1;
 	}
 
@@ -32,7 +58,7 @@ public static int main(string[] args) {
 	Unix.signal_add(Posix.SIGTERM, handle_signals);
 	Unix.signal_add(Posix.SIGINT,  handle_signals);
 
-	dev   = new Device(args[1], 9600, 8, 1);
+	dev   = new Device(files[0], 9600, 8, 1);
 	db    = new Database("shop.db");
 	audio = new AudioPlayer();
 	loop  = new MainLoop();
-- 
cgit v1.2.3