merged in from branch issue13

Common/PdfScribeSharedAssemblyInfo.cs

@@ -5,7 +5,7 @@
 // associated with an assembly.
 [assembly: AssemblyCompany("Black Telescope Workshop")]
 [assembly: AssemblyProduct("PDF Scribe")]
-[assembly: AssemblyCopyright("Copyright © S T Chan 2013-2018")]
+[assembly: AssemblyCopyright("Copyright © S T Chan 2013-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -22,4 +22,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.7.*")]

PdfScribe/App.config

@@ -32,12 +32,12 @@
       <setting name="OutputFile" serializeAs="String">
         <value>%UserProfile%\PDFSCRIBE.PDF</value>
       </setting>
-        <setting name="AskUserForOutputFilename" serializeAs="String">
-            <value>True</value>
-        </setting>
       <setting name="OpenAfterCreating" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="AskUserForOutputFilename" serializeAs="String">
+        <value>True</value>
+      </setting>
     </PdfScribe.Properties.Settings>
   </applicationSettings>
 </configuration>

PdfScribe/Program.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
@@ -23,6 +20,9 @@ namespace PdfScribe
         const string errorDialogInstructionCouldNotWrite = "Could not create the output file.";
         const string errorDialogInstructionUnexpectedError = "There was an internal error. Enable tracing for details.";
 
+        const string errorDialogOutputFilenameInvalid = "Output file path is not valid. Check the \"OutputFile\" setting in the config file.";
+        const string errorDialogOutputFilenameTooLong = "Output file path too long. Check the \"OutputFile\" setting in the config file.";
+        const string errorDialogOutputFileAccessDenied = "Access denied - check permissions on output folder.";
         const string errorDialogTextFileInUse = "{0} is being used by another process.";
         const string errorDialogTextGhostScriptConversion = "Ghostscript error code {0}.";
 
@@ -33,7 +33,7 @@ namespace PdfScribe
         #region Other constants
         const string traceSourceName = "PdfScribe";
 
-        const string defaultOutputFilename = "PDFSCRIBE.PDF";
+        //const string defaultOutputFilename = "PDFSCRIBE.PDF";
 
         #endregion
 
@@ -152,7 +152,7 @@ namespace PdfScribe
             bool filenameRetrieved = false;
             switch (Properties.Settings.Default.AskUserForOutputFilename)
             {
-                case (true) :
+                case (true):
                     using (SetOutputFilename dialogOwner = new SetOutputFilename())
                     {
                         dialogOwner.TopMost = true;
@@ -179,8 +179,47 @@ namespace PdfScribe
                     }
                     break;
                 default:
+                    try
+                    {
                         outputFile = GetOutputFilename();
+                        // Test if we can write to the destination
+                        using (FileStream newOutputFile = File.Create(outputFile))
+                        { }
+                        File.Delete(outputFile);
                         filenameRetrieved = true;
+                    }
+                    catch (Exception ex) when (ex is ArgumentException ||
+                                               ex is ArgumentNullException ||
+                                               ex is NotSupportedException ||
+                                               ex is DirectoryNotFoundException)
+                    {
+                        logEventSource.TraceEvent(TraceEventType.Error,
+                                                 (int)TraceEventType.Error,
+                                                 errorDialogOutputFilenameInvalid + Environment.NewLine +
+                                                 "Exception message: " + ex.Message);
+                        DisplayErrorMessage(errorDialogCaption,
+                                            errorDialogOutputFilenameInvalid);
+                    }
+                    catch (PathTooLongException ex)
+                    {
+                        // filename is greater than 260 characters
+                        logEventSource.TraceEvent(TraceEventType.Error,
+                                                 (int)TraceEventType.Error,
+                                                 errorDialogOutputFilenameTooLong + Environment.NewLine +
+                                                 "Exception message: " + ex.Message);
+                        DisplayErrorMessage(errorDialogCaption,
+                                            errorDialogOutputFilenameTooLong);
+                    }
+                    catch (UnauthorizedAccessException ex)
+                    {
+                        logEventSource.TraceEvent(TraceEventType.Error,
+                                                 (int)TraceEventType.Error,
+                                                 errorDialogOutputFileAccessDenied + Environment.NewLine +
+                                                 "Exception message: " + ex.Message);
+                        // Can't write to target dir
+                        DisplayErrorMessage(errorDialogCaption,
+                                            errorDialogOutputFileAccessDenied);
+                    }
                     break;
             }
             return filenameRetrieved;
@@ -189,58 +228,15 @@ namespace PdfScribe
 
         private static String GetOutputFilename()
         {
-
+            String outputFilename = Path.GetFullPath(Environment.ExpandEnvironmentVariables(Properties.Settings.Default.OutputFile));
-            String outputFilename = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), defaultOutputFilename);
+            // Check if there are any % characters -
-            if (!String.IsNullOrEmpty(Properties.Settings.Default.OutputFile) &&
+            // even though it's a legal Windows filename character,
-                !String.IsNullOrWhiteSpace(Properties.Settings.Default.OutputFile))
+            // it is a special character to Ghostscript
-            {
+            if (outputFilename.Contains("%"))
-                if (IsFilePathValid(Properties.Settings.Default.OutputFile))
+                throw new ArgumentException("OutputFile setting contains % character.");
-                {
-                    outputFilename = Properties.Settings.Default.OutputFile;
-                }
-                else
-                {
-                    if (IsFilePathValid(Environment.ExpandEnvironmentVariables(Properties.Settings.Default.OutputFile)))
-                    {
-                        outputFilename = Environment.ExpandEnvironmentVariables(Properties.Settings.Default.OutputFile);
-                    }
-                }
-            }
-            else
-            {
-                logEventSource.TraceEvent(TraceEventType.Warning,
-                                          (int)TraceEventType.Warning,
-                                          String.Format("Using default output filename {0}",
-                                                        outputFilename));
-            }
             return outputFilename;
         }
 
-        static bool IsFilePathValid(String filePath)
-        {
-            bool pathIsValid = false;
-
-            if (!String.IsNullOrEmpty(filePath) && filePath.Length <= 260)
-            {
-                String directoryName = Path.GetDirectoryName(filePath);
-                String filename = Path.GetFileName(filePath);
-
-                if (Directory.Exists(directoryName))
-                {
-                    // Check for invalid filename chars
-                    Regex containsABadCharacter = new Regex("["
-                                                    + Regex.Escape(new String(System.IO.Path.GetInvalidPathChars())) + "]");
-                    pathIsValid = !containsABadCharacter.IsMatch(filename);
-                }
-            }
-            else
-            {
-                logEventSource.TraceEvent(TraceEventType.Warning,
-                                          (int)TraceEventType.Warning,
-                                          "Output filename is longer than 260 characters, or blank.");
-            }
-            return pathIsValid;
-        }
 
         /// <summary>
         /// Opens the PDF in the default viewer

PdfScribe/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace PdfScribe.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -32,15 +32,6 @@ namespace PdfScribe.Properties {
             }
         }
         
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool AskUserForOutputFilename {
-            get {
-                return ((bool)(this["AskUserForOutputFilename"]));
-            }
-        }
-        
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -49,5 +40,14 @@ namespace PdfScribe.Properties {
                 return ((bool)(this["OpenAfterCreating"]));
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool AskUserForOutputFilename {
+            get {
+                return ((bool)(this["AskUserForOutputFilename"]));
+            }
+        }
     }
 }

PdfScribe/Properties/Settings.settings

@@ -5,11 +5,11 @@
     <Setting Name="OutputFile" Type="System.String" Scope="Application">
       <Value Profile="(Default)">%UserProfile%\PDFSCRIBE.PDF</Value>
     </Setting>
-    <Setting Name="AskUserForOutputFilename" Type="System.Boolean" Scope="Application">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="OpenAfterCreating" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="AskUserForOutputFilename" Type="System.Boolean" Scope="Application">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

PdfScribeInstall/Product.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"  xmlns:netfx ="http://schemas.microsoft.com/wix/NetFxExtension">
-	<Product Id="{AF5F6415-3DB9-4B88-B1AE-37D4A736AD3A}" Name="PDF Scribe" Language="1033" Version="1.0.6" Manufacturer="Black Telescope Workshop" UpgradeCode="409ff0d1-1c3a-4f8d-8a5a-350705977809">
+	<Product Id="{DE27E86D-0514-45DF-B0CC-CFF2C1DF7038}" Name="PDF Scribe" Language="1033" Version="1.0.7" Manufacturer="Black Telescope Workshop" UpgradeCode="409ff0d1-1c3a-4f8d-8a5a-350705977809">
 		<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" 
              Platform="x64"
              InstallPrivileges="elevated" 
              Description="PDF Scribe Virtual Printer"
-             Comments="PDF Scribe Virtual Printer 1.0.6 installation package"
+             Comments="PDF Scribe Virtual Printer 1.0.7 installation package"
              Id="*" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."

README.md

@@ -1,4 +1,4 @@
-# PdfScribe v1.0.6
+# PdfScribe v1.0.7
 
 PdfScribe is a PDF virtual printer. Check the [releases](https://github.com/stchan/PdfScribe/releases) page for this project to download a prebuilt MSI package.
 
@@ -19,8 +19,7 @@ PdfScribe links to, and distributes the following third party components:
 
 ## License
 
-Ghostscript is AGPL (more restrictive than GPLv3), so PdfScribe is bound by that license.
+PdfScribe is AGPL.
-
 
 
 ## Configuration
@@ -28,7 +27,7 @@ Ghostscript is AGPL (more restrictive than GPLv3), so PdfScribe is bound by that
 In the application config file (PdfScribe.exe.config), there are the following settings in the "applicationSettings" element:
 
 * ****AskUserForOutputFilename**** - set value to *true* if you want PdfScribe to ask the user where to save the PDF.
-* ****OutputFile**** - if there is a constant filename you want the PDF to be saved to, set its value here. Environment variables can be used. PdfScribe will overwrite each time. This setting is ignored if  **AskUserForOutputFilename** is set to *true*. 
+* ****OutputFile**** - if there is a constant filename you want the PDF to be saved to, set its value here. Environment variables can be used. PdfScribe will overwrite each time. This setting is ignored if  **AskUserForOutputFilename** is set to *true*. Note that a literal % character cannot be used even though it is legal in a Windows filename.
 * ****OpenAfterCreating**** - set value to *true* if you want the PDF automatically opened with the default viewer. This setting is ignored if the file extension is not .PDF
 
 ## To do
@@ -39,6 +38,3 @@ In the application config file (PdfScribe.exe.config), there are the following s
 * Allow selection of page sizes other than default
 * Watermarking output
 
- 
-
-