Finalizing demo

gsscoder · gsscoder · commit f5777f1f599c · 2015-07-08T19:42:44.000+02:00
diff --git a/demo/ReadText.Demo/Options.cs b/demo/ReadText.Demo/Options.cs
@@ -5,20 +5,21 @@ namespace ReadText.Demo
     interface IOptions
     {
         [Option('n', "lines",
-        SetName = "amount",
+            Default = 5U,
+            SetName = "amount",
             HelpText = "Lines to be printed from the beginning or end of the file.")]
         uint? Lines { get; set; }
 
         [Option('c', "bytes",
-                SetName = "amount",
-                HelpText = "Bytes to be printed from the beginning or end of the file.")]
+            SetName = "amount2",
+            HelpText = "Bytes to be printed from the beginning or end of the file.")]
         uint? Bytes { get; set; }
 
         [Option('q', "quiet",
             HelpText = "Supresses summary messages.")]
         bool Quiet { get; set; }
 
-        [Value(0)]
+        [Value(0, Required = true)]
         string FileName { get; set; } 
     }
 
diff --git a/demo/ReadText.Demo/Program.cs b/demo/ReadText.Demo/Program.cs
@@ -20,34 +20,36 @@ public static int Main(string[] args)
 		                : ReadBytes(opts.FileName, fromTop, (int)opts.Bytes);
 		        };
 		    Func<IOptions, string> header = opts =>
-		    {
-		        if (opts.Quiet)
 		        {
-		            return string.Empty;
-		        }
-                var fromTop = opts.GetType() == typeof(HeadOptions);
-		        var builder = new StringBuilder("Reading ");
-		        builder = opts.Lines.HasValue
-		            ? builder.Append(opts.Lines).Append(" lines")
-		            : builder.Append(opts.Bytes).Append(" bytes");
-		        builder = fromTop ? builder.Append(" from top") : builder.Append(" from bottom:");
-		        return builder.ToString();
-		    };
+		            if (opts.Quiet)
+		            {
+		                return string.Empty;
+		            }
+                    var fromTop = opts.GetType() == typeof(HeadOptions);
+		            var builder = new StringBuilder("Reading ");
+		            builder = opts.Lines.HasValue
+		                ? builder.Append(opts.Lines).Append(" lines")
+		                : builder.Append(opts.Bytes).Append(" bytes");
+		            builder = fromTop ? builder.Append(" from top:") : builder.Append(" from bottom:");
+		            return builder.ToString();
+		        };
+            Action<string> printIfNotEmpty = text =>
+                {
+                    if (text.Length == 0) { return; }
+                    Console.WriteLine(text);
+                };
 
             var result = Parser.Default.ParseArguments<HeadOptions, TailOptions>(args);
             var texts = result
                 .Return(
                     (HeadOptions opts) => Tuple.Create(header(opts), reader(opts)),
                     (TailOptions opts) => Tuple.Create(header(opts), reader(opts)),
-                    _ => Tuple.Create(string.Empty, string.Empty));
+                    _ => MakeError());
 
-		    if (texts.Item1.Length > 0)
-		    {
-                Console.WriteLine(texts.Item1);
-		    }
-            Console.WriteLine(texts.Item2);
+            printIfNotEmpty(texts.Item1);
+            printIfNotEmpty(texts.Item2);
 
-		    return 0;
+		    return texts.Equals(MakeError()) ? 1 : 0;
 		}
 
 	    private static string ReadLines(string fileName, bool fromTop, int count)
@@ -69,5 +71,10 @@ private static string ReadBytes(string fileName, bool fromTop, int count)
 	        }
             return Encoding.UTF8.GetString(bytes, bytes.Length - count, count);
 	    }
+
+	    private static Tuple<string, string> MakeError()
+	    {
+	        return Tuple.Create("\0", "\0");
+	    }
 	}
 }
