check user-defined mapping of user names to email addresses

Vss2Git/GitExporter.cs

@@ -20,6 +20,7 @@
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Xml.Linq;
 using System.Threading;
 using System.Windows.Forms;
 using Hpdi.VssLogicalLib;
@@ -40,6 +41,20 @@ class GitExporter : Worker
         private bool ignoreErrors = false;
         private string defaultComment = "";
 
+        private string emailMapFile = "emailmap.xml";
+        public string EmailMapFile
+        {
+            get { return emailMapFile; }
+            set { emailMapFile = value; }
+        }
+
+        private Dictionary<string, string> emailMap = new Dictionary<string, string>();
+        public System.Collections.Generic.Dictionary<string, string> EmailMap
+        {
+            get { return emailMap; }
+            set { emailMap = value; }
+        }
+
         private string emailDomain = "localhost";
         public string EmailDomain
         {
@@ -82,6 +97,23 @@ public GitExporter(WorkQueue workQueue, Logger logger,
             this.changesetBuilder = changesetBuilder;
         }
 
+        public bool ReadEmailMap()
+        {
+            try
+            {
+                XDocument xdoc = XDocument.Load(emailMapFile);
+                foreach (var map in xdoc.Elements("map"))
+                {
+                    emailMap.Add(map.Attribute("name").Value.ToLower(), map.Attribute("email").Value);
+                }
+            }
+            catch (FileNotFoundException)
+            {
+                return false;
+            }
+            return true;
+        }
+
         public void ExportToGit(string repoPath)
         {
             workQueue.AddLast(delegate(object work)
@@ -97,6 +129,19 @@ public void ExportToGit(string repoPath)
                     Directory.CreateDirectory(repoPath);
                 }
 
+                while(!ReadEmailMap())
+                {
+                    var button = MessageBox.Show("Email map file not found. ",
+                        "Error", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Error);
+                    if (button == DialogResult.Abort)
+                    {
+                        workQueue.Abort();
+                        return;
+                    }
+                    if (button == DialogResult.Ignore)
+                        break;
+                }
+
                 var git = new GitWrapper(repoPath, logger);
                 git.CommitEncoding = commitEncoding;
 
@@ -638,8 +683,16 @@ private bool AbortRetryIgnore(ThreadStart work, MessageBoxButtons buttons)
 
         private string GetEmail(string user)
         {
-            // TODO: user-defined mapping of user names to email addresses
-            return user.ToLower().Replace(' ', '.') + "@" + emailDomain;
+            // check user-defined mapping of user names to email addresses
+            string username = user.ToLower();
+            string email;
+            if (emailMap.TryGetValue(username, out email))
+            {
+                if (!email.Contains("@"))
+                    email += "@" + emailDomain;
+                return email;
+            }
+            return username.Replace(' ', '.') + "@" + emailDomain;
         }
 
         private string GetTagFromLabel(string label)

Vss2Git/MainForm.cs

@@ -113,6 +113,10 @@ private void goButton_Click(object sender, EventArgs e)
                     {
                         gitExporter.EmailDomain = domainTextBox.Text;
                     }
+                    if (!string.IsNullOrEmpty(emailMapFileTextBox.Text))
+                    {
+                        gitExporter.EmailMapFile = emailMapFileTextBox.Text;
+                    }
                     if (!string.IsNullOrEmpty(commentTextBox.Text))
                     {
                         gitExporter.DefaultComment = commentTextBox.Text;
@@ -234,6 +238,7 @@ private void ReadSettings()
             excludeTextBox.Text = settings.VssExcludePaths;
             outDirTextBox.Text = settings.GitDirectory;
             domainTextBox.Text = settings.DefaultEmailDomain;
+            emailMapFileTextBox.Text = settings.EmailMapFile;
             commentTextBox.Text = settings.DefaultComment;
             logTextBox.Text = settings.LogFile;
             transcodeCheckBox.Checked = settings.TranscodeComments;
@@ -250,6 +255,7 @@ private void WriteSettings()
             settings.VssExcludePaths = excludeTextBox.Text;
             settings.GitDirectory = outDirTextBox.Text;
             settings.DefaultEmailDomain = domainTextBox.Text;
+            settings.EmailMapFile = emailMapFileTextBox.Text;
             settings.LogFile = logTextBox.Text;
             settings.TranscodeComments = transcodeCheckBox.Checked;
             settings.ForceAnnotatedTags = forceAnnotatedCheckBox.Checked;

Vss2Git/Properties/Settings.settings

@@ -35,5 +35,8 @@
     <Setting Name="DefaultComment" Type="System.String" Scope="User">
       <Value Profile="(Default)"></Value>
     </Setting>
+    <Setting Name="EmailMapFile" Type="System.String" Scope="User">
+      <Value Profile="(Default)">emailmap.xml</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

Vss2Git/Vss2Git.csproj

@@ -61,6 +61,8 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AsyncLineReader.cs" />

Vss2Git/app.config

@@ -40,6 +40,9 @@
             <setting name="DefaultComment" serializeAs="String">
                 <value></value>
             </setting>
+            <setting name="EmailMapFile" serializeAs="String">
+                <value>emailmap.xml</value>
+            </setting>
         </Hpdi.Vss2Git.Properties.Settings>
     </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>