Merge pull request #382 from MarkSummerville/25

Incremental update - 3x bug fix
TV-Rename · May 3, 2018 · 501156c · 501156c
2 parents f3e200f + b0d10dd
commit 501156c
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/TVRename#/App/ApplicationBase.cs b/TVRename#/App/ApplicationBase.cs
@@ -22,7 +22,7 @@ protected override void OnCreateSplashScreen()
             this.SplashScreen = new TVRenameSplash();
 
             CommandLineArgs clargs = new CommandLineArgs(this.CommandLineArgs);
-            if ((clargs.Unattended) || (clargs.Hide)) this.SplashScreen.Visible  = false;
+            if (clargs.Hide) this.SplashScreen.Visible  = false;
 
         }
 
@@ -33,7 +33,7 @@ protected override void OnCreateSplashScreen()
         protected override void OnCreateMainForm()
         {
             CommandLineArgs clargs = new CommandLineArgs(this.CommandLineArgs);
-            if ((clargs.Unattended) || (clargs.Hide))
+            if (clargs.Hide)
                 this.SplashScreen.SafeInvoke(
                     () => ((TVRenameSplash)this.SplashScreen).Visible = false,true);
 

diff --git a/TVRename#/App/CommandLineArgs.cs b/TVRename#/App/CommandLineArgs.cs
@@ -69,14 +69,15 @@ public CommandLineArgs(ReadOnlyCollection<string> args)
         public static string Helptext()
         {
             StringBuilder output = new StringBuilder();
+            output.AppendLine();
             output.AppendLine("/scan will Tell TV Rename to run a scan");
             output.AppendLine("/quickscan will scan shows most likely to need an update: http://www.tvrename.com/userguide#scan");
             output.AppendLine("/recentscan will scan recent shows: http://www.tvrename.com/userguide#scan");
             output.AppendLine("/doall Tell TV Rename execute all the actions it can.");
             output.AppendLine("/quit Tell a running TV Rename session to exit.");
             output.AppendLine("");
-            output.AppendLine("/hide will hide the UI");
-            output.AppendLine("/unattended same as /hide");
+            output.AppendLine("/hide will hide the UI for all UI elements");
+            output.AppendLine("/unattended will hide the UI for all blocking UI elements");
             output.AppendLine("");
             output.AppendLine("/recover will load a dialog box that enables the user to recover a prior TVDB.xml or TVRenameSettings.xml file");
             output.AppendLine("/userfilepath:BLAH  Sets a custom folder path for the settings files.");

diff --git a/TVRename#/App/Program.cs b/TVRename#/App/Program.cs
@@ -32,7 +32,19 @@ private static void Main(string[] args)
             if (args.Contains("/?", StringComparer.OrdinalIgnoreCase))
             {
                 Logger.Info(CommandLineArgs.Helptext());
-                Console.Out.WriteLine(CommandLineArgs.Helptext());
+
+                //redirect console output to parent process;
+                //must be before any calls to Console.WriteLine()
+                //MS: Never got this to work quite right - seems there is no simple way to output
+                //to the command line console if you are a winforms app
+                if (NativeMethods.AttachParentConsole())
+                {
+                    Console.WriteLine(CommandLineArgs.Helptext());
+                }
+                else
+                {
+                    Logger.Info("Could not attach to console");
+                }
                 return;
             } 
             // Check if an application instance is already running

diff --git a/TVRename#/ItemsAndActions/ActionDateTouch.cs b/TVRename#/ItemsAndActions/ActionDateTouch.cs
@@ -48,7 +48,7 @@ public ActionDateTouch(DirectoryInfo dir, ShowItem si, DateTime date)
 
         #region Action Members
 
-        public override string Name => "Touch Update Time";
+        public override string Name => "Update Timestamp";
 
         public override string ProgressText => this.WhereFile?.Name??this.WhereDirectory?.Name;
 

diff --git a/TVRename#/TVRename/TVDoc.cs b/TVRename#/TVRename/TVDoc.cs
@@ -2109,10 +2109,10 @@ public bool CheckAllFoldersExist(List<ShowItem> showlist)
                                 {
                                     try
                                     {
+                                        logger.Info("Creating directory as it is missing: {0}", folder);
                                         Directory.CreateDirectory(folder);
-                                        logger.Info("Creating directory as it is missing: {0}",folder);
                                     }
-                                    catch (System.IO.IOException ioe)
+                                    catch (Exception ioe)
                                     {
                                         logger.Info("Could not directory: {0}", folder);
                                         logger.Info(ioe);

diff --git a/TVRename#/Utility/Helpers.cs b/TVRename#/Utility/Helpers.cs
@@ -41,6 +41,35 @@ internal static partial class NativeMethods
         [return: MarshalAs(UnmanagedType.Bool)]
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool GetDiskFreeSpaceEx(string lpDirectoryName, out ulong lpFreeBytesAvailable, out ulong lpTotalNumberOfBytes, out ulong lpTotalNumberOfFreeBytes);
+
+        [DllImport("kernel32.dll")]
+        static extern bool AttachConsole(UInt32 dwProcessId);
+        private const UInt32 ATTACH_PARENT_PROCESS = 0xFFFFFFFF;
+
+        // Attach to console window – this may modify the standard handles
+        public static bool AttachParentConsole() =>AttachConsole(ATTACH_PARENT_PROCESS);
+
+
+        public static void NewConsoleOutput(string text)
+        {
+            if (AllocConsole())
+            {
+                Console.Out.WriteLine(text);
+                Console.In.ReadLine();
+
+                FreeConsole();
+            }
+        }
+
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool AllocConsole();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool FreeConsole();
+
     }