Add FileName property to Message class

Author: Sicos2002

MsgReader/LanguageConsts.cs

@@ -82,7 +82,15 @@ internal static class LanguageConsts
         /// </summary>
         public const string CategoriesLabel = "Categories";
 
-        // The date format used for dates
+        /// <summary>
+        /// The format used for all date related items
+        /// </summary>
         public const string DataFormat = "dd-MM-yyyy HH:mm:ss";
+
+        /// <summary>
+        /// Normally Outlook will use the subject of a MSG object as it filename. Invalid characters
+        /// are replaced by spaces. When there is no subject outlook uses "Nameless" as default
+        /// </summary>
+        public const string NameLessFileName = "Nameless";
     }
 }

MsgReader/Outlook/Storage.cs

@@ -301,47 +301,43 @@ public class Attachment : Storage
         {
             #region Properties
             /// <summary>
-            /// Gets the filename.
+            /// Returns the filename of the attachment
             /// </summary>
-            /// <value> The filename. </value>
-            public string Filename
+            public string FileName
             {
                 get
                 {
-                    var filename = GetMapiPropertyString(Consts.PrAttachLongFilename);
+                    var fileName = GetMapiPropertyString(Consts.PrAttachLongFilename);
 
-                    if (string.IsNullOrEmpty(filename))
-                        filename = GetMapiPropertyString(Consts.PrAttachFilename);
+                    if (string.IsNullOrEmpty(fileName))
+                        fileName = GetMapiPropertyString(Consts.PrAttachFilename);
 
-                    if (string.IsNullOrEmpty(filename))
-                        filename = GetMapiPropertyString(Consts.PrDisplayName);
+                    if (string.IsNullOrEmpty(fileName))
+                        fileName = GetMapiPropertyString(Consts.PrDisplayName);
 
-                    return filename;
+                    return FileManager.RemoveInvalidFileNameChars(fileName);
                 }
             }
 
             /// <summary>
-            /// Gets the data.
+            /// Retuns the data
             /// </summary>
-            /// <value> The data. </value>
             public byte[] Data
             {
                 get { return GetMapiPropertyBytes(Consts.PrAttachData); }
             }
 
             /// <summary>
-            /// Gets the content id.
+            /// Returns the content id
             /// </summary>
-            /// <value> The content id. </value>
             public string ContentId
             {
                 get { return GetMapiPropertyString(Consts.PrAttachContentId); }
             }
 
             /// <summary>
-            /// Gets the rendering posisiton.
+            /// Returns the rendering posisiton
             /// </summary>
-            /// <value> The rendering posisiton. </value>
             public int RenderingPosisiton
             {
                 get { return GetMapiPropertyInt32(Consts.PrRenderingPosition); }
@@ -404,6 +400,24 @@ public string Type
                 get { return GetMapiPropertyString(Consts.PrMessageClass); }
             }
 
+            /// <summary>
+            /// Returns the filename of the message object. For MSG object Outlook uses the subject. It strips
+            /// invalid filename characters. When there is no filename the name from <see cref=" LanguageConsts.NameLessFileName"/>
+            /// will be used
+            /// </summary>
+            public string FileName
+            {
+                get
+                {
+                    var fileName = GetMapiPropertyString(Consts.PrSubject);
+
+                    if (string.IsNullOrEmpty(fileName))
+                        fileName = LanguageConsts.NameLessFileName;
+
+                    return FileManager.RemoveInvalidFileNameChars(fileName);
+                }
+            }
+
             /// <summary>
             /// Gets the list of recipients in the outlook message.
             /// </summary>
@@ -1078,7 +1092,7 @@ public Task(Storage message) : base(message._storage)
         }
         #endregion
 
-        #region Properties
+        #region Fields
         /// <summary>
         /// The statistics for all streams in the IStorage associated with this instance.
         /// </summary>
@@ -1103,7 +1117,9 @@ public Task(Storage message) : base(message._storage)
         /// The IStorage associated with this instance.
         /// </summary>
         private NativeMethods.IStorage _storage;
+        #endregion
 
+        #region Properties
         /// <summary>
         /// Gets the top level outlook message from a sub message at any level.
         /// </summary>

MsgReader/Reader.cs

@@ -136,9 +136,7 @@ private List<string> WriteEmail(Storage.Message message, string outputFolder, bo
                 if (attachment.GetType() == typeof (Storage.Attachment))
                 {
                     var attach = (Storage.Attachment) attachment;
-                    fileInfo = new FileInfo(
-                        FileManager.FileExistsMakeNew(outputFolder +
-                                                      FileManager.RemoveInvalidFileNameChars(attach.Filename)));
+                    fileInfo = new FileInfo(FileManager.FileExistsMakeNew(outputFolder + attach.FileName));
                     File.WriteAllBytes(fileInfo.FullName, attach.Data);
 
                     // When we find an inline attachment we have to replace the CID tag inside the html body
@@ -156,9 +154,8 @@ private List<string> WriteEmail(Storage.Message message, string outputFolder, bo
                 else if (attachment.GetType() == typeof (Storage.Message))
                 {
                     var msg = (Storage.Message) attachment;
-                    fileInfo = new FileInfo(
-                        FileManager.FileExistsMakeNew(outputFolder +
-                                                      FileManager.RemoveInvalidFileNameChars(msg.Subject) + ".msg"));
+
+                    fileInfo = new FileInfo(FileManager.FileExistsMakeNew(outputFolder + msg.FileName) + ".msg");
                     result.Add(fileInfo.FullName);
                     msg.Save(fileInfo.FullName);
                 }

MsgViewer/MsgViewer.csproj

@@ -28,6 +28,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

MsgViewer/ViewerForm.cs

@@ -52,12 +52,21 @@ private void SelectButton_Click(object sender, EventArgs e)
                     var msgReader = new Reader();
                     var files = msgReader.ExtractToFolder(openFileDialog1.FileName, tempFolder);
 
-                    webBrowser1.Navigate(files[0]);
+                    // Check if there was an error
+                    var error = msgReader.GetErrorMessage();
+
+                    if (!string.IsNullOrEmpty(error))
+                        throw new Exception(error);
+
+                    if (!string.IsNullOrEmpty(files[0]))
+                        webBrowser1.Navigate(files[0]);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
                     if (tempFolder != null && Directory.Exists(tempFolder))
                         Directory.Delete(tempFolder, true);
+
+                    MessageBox.Show(ex.Message);
                 }
             }
         }