Small changes in messages and warnings!

jar0l · Aug 6, 2018 · df22c67 · df22c67
1 parent 8227dfe
commit df22c67
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/Messenger.cs b/Messenger.cs
@@ -206,8 +206,12 @@ private static int CheckDataFormat (ref char c, int i, string s)
 
         //-------------------------------------------------------------------------
 
-        private static Formated Format (string msg, int mbw = -1 /* MaxBufferWidth*/)
-        {
+        private static Formated Format 
+        (
+              string msg
+            , int    mbw    = -1 /* MaxBufferWidth*/
+            , int    offset = 0
+        ){
             Formated           r = new Formated();
             List<ConsoleColor> f = new List<ConsoleColor>();
             List<ConsoleColor> b = new List<ConsoleColor>();
@@ -222,7 +226,7 @@ private static Formated Format (string msg, int mbw = -1 /* MaxBufferWidth*/)
             b.Add(System.Console.BackgroundColor);
 
             if (mbw < 0)
-                mbw = MaxBufferWidth;
+                mbw = MaxBufferWidth - offset;
 
             msg += '\n';
             for (int n, l = mbw, i = 0, j = 0, k = 0, s = 0, t = 0, m = 0, p = 0; i < msg.Length; ++i)
@@ -557,7 +561,7 @@ Icon           icn
             , bool           bss	    											// System sounds ('\a').
             , bool           bnl												    // New line.
         ){
-            Formated _f = Messenger.Format("#### {t:5}" + msg);
+            Formated _f = Messenger.Format("#### {t:6}" + msg, -1, 1);
             bool     _b = Clean;
 
             Clean = true;
@@ -573,7 +577,7 @@ Icon           icn
             while ((i = msg.IndexOf(ColorChar)) != -1)
                 msg = msg.Remove(i, 1);
 
-            StringBuilder  sb = new StringBuilder("\n[");
+            StringBuilder  sb = new StringBuilder("\n [");
             ConsoleKeyInfo ki = new ConsoleKeyInfo();
             ConsoleColor[] cc;
 

diff --git a/Program.cs b/Program.cs
@@ -10085,11 +10085,29 @@ static void Main (string[] args)
                                 break;
 
                             default:
+                                saux = string.Empty;
+
+                                if (!string.IsNullOrEmpty(ifn))
+                                    saux = ifn;
+
                                 ifn = Program.CheckArg(args, i, false);
 
                                 if (ifn.Equals(BATCH, StringComparison.InvariantCultureIgnoreCase))
                                     ifn += Program.CheckArg(args, ++i, false);
 
+                                else if (!string.IsNullOrEmpty(saux))
+                                {
+                                    Program.ShowBanner();
+                                    Messenger.Print
+                                    (
+                                          Messenger.Icon.WARNING
+                                        , "Exchange in the input file:\n\nOld < " + 
+                                          saux + "\nNew > " + ifn
+                                        , false
+                                        , true
+                                    );
+                                }
+
                                 break;
                         }
                     }
@@ -10588,7 +10606,7 @@ static void Main (string[] args)
                             );
 
                             _private_key = _export_pvk;
-                            _public_key = _export_pbk;
+                            _public_key  = _export_pbk;
 
                             Program.PgpECKeyPairGen
                             (

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -35,8 +35,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.6.8")]
-[assembly: AssemblyFileVersion("1.1.6.8")]
+[assembly: AssemblyVersion("1.1.6.10")]
+[assembly: AssemblyFileVersion("1.1.6.10")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 
 #endif
diff --git a/core.csproj b/core.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <ApplicationIcon>Main.ico</ApplicationIcon>
-    <Version>1.1.6.5</Version>
+    <Version>1.1.6.10</Version>
     <Authors>José A. Rojo L.</Authors>
     <Company />
     <Description>console crypto tool</Description>
@@ -16,8 +16,8 @@
     <PackageReleaseNotes>.Net Core 2.0</PackageReleaseNotes>
     <AssemblyName>crypto</AssemblyName>
     <RootNamespace>crypto</RootNamespace>
-    <AssemblyVersion>1.1.6.8</AssemblyVersion>
-    <FileVersion>1.1.6.8</FileVersion>
+    <AssemblyVersion>1.1.6.10</AssemblyVersion>
+    <FileVersion>1.1.6.10</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">