fixed an error condition when the source file creates and access viol…

…ation
asdfjkl · Nov 30, 2020 · ca1c269 · ca1c269
1 parent a454c0f
commit ca1c269
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/yahb/CopyModule.cs b/yahb/CopyModule.cs
@@ -431,9 +431,9 @@ public void doCopy()
                     {
                         if (makeCopy)
                         {
-                            File.Copy(x.sourceFile, x.destFile.driveTimeFilename);
                             try
                             {
+                                File.Copy(x.sourceFile, x.destFile.driveTimeFilename);
                                 FileInfo fi_dest = new FileInfo(x.destFile.driveTimeFilename);
                                 bool wasReadOnly = false;
                                 if (fi_dest.IsReadOnly)
@@ -444,18 +444,34 @@ public void doCopy()
                                 fi_dest.CreationTime = fi_source.CreationTime;
                                 fi_dest.LastWriteTime = fi_source.LastWriteTime;
                                 fi_dest.LastAccessTime = fi_source.LastAccessTime;
-                                if(wasReadOnly)
+                                if (wasReadOnly)
                                 {
                                     fi_dest.IsReadOnly = true;
                                 }
+                                if (cfg.verboseMode)
+                                {
+                                    cfg.addToLog(x.sourceFile + ": file copied");
+                                }
                             }
                             catch(UnauthorizedAccessException unauthEx)
                             {
-                                cfg.addToLog("ERR: " + x.sourceFile + ": couldn't change access and creation time of destiation file");
+                                cfg.addToLog("ERR: " + x.sourceFile + ": couldn't access file and/or set creation time of destination file");
+                            }
+                            catch (ArgumentException e)
+                            {
+                                cfg.addToLog("ERR: " + x.sourceFile + ": argument exception");
+                            }                            
+                            catch (PathTooLongException e)
+                            {
+                                cfg.addToLog("ERR: " + x.sourceFile + ": path too long exception");
+                            }
+                            catch (DirectoryNotFoundException e)
+                            {
+                                cfg.addToLog("ERR: " + x.sourceFile + ": directory not found exception");
                             }
-                            if (cfg.verboseMode)
+                            catch (FileNotFoundException e)
                             {
-                                cfg.addToLog(x.sourceFile + ": file copied");
+                                cfg.addToLog("ERR: " + x.sourceFile + ": file not found exception");
                             }
                         }
                     } else

diff --git a/yahb/Properties/AssemblyInfo.cs b/yahb/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]