Merge pull request #19 from AngelsSoftwareOrg/develop

v1.0.7 - Cycle Release - OneClickZipSetup_v1.0.7_Release

Author: angelsburger90

.vs/OneClickZip/v16/.suo

@@ -17,7 +17,7 @@
                 <value>0</value>
             </setting>
             <setting name="app_version_patch" serializeAs="String">
-                <value>6</value>
+                <value>7</value>
             </setting>
             <setting name="app_version_revision" serializeAs="String">
                 <value>r1</value>

App.config

@@ -231,11 +231,14 @@ private void btnTargetDirBrowse_Click(object sender, EventArgs e)
         {
             folderBrowserDialog.SelectedPath = ApplicationSettings.GetLastOpenedDirectory();
             folderBrowserDialog.ShowNewFolderButton = true;
-            folderBrowserDialog.ShowDialog();
+            DialogResult dr = folderBrowserDialog.ShowDialog();
 
-            if (String.IsNullOrWhiteSpace(folderBrowserDialog.SelectedPath)) return;
-            txtBoxTargetDir.Text = folderBrowserDialog.SelectedPath;
-            ApplicationSettings.SaveLastOpenedDirectory(folderBrowserDialog.SelectedPath);
+            if(dr == DialogResult.OK)
+            {
+                if (String.IsNullOrWhiteSpace(folderBrowserDialog.SelectedPath)) return;
+                txtBoxTargetDir.Text = folderBrowserDialog.SelectedPath;
+                ApplicationSettings.SaveLastOpenedDirectory(folderBrowserDialog.SelectedPath);
+            }
         }
         private void comboBoxTimeSpanOption_SelectedValueChanged(object sender, EventArgs e)
         {

Forms/Options/FilterRuleFrm.cs

@@ -322,13 +322,13 @@ private void BeforeClosingForm()
         }
         private bool IsDirectoryValidAndAccessible(String dirPath)
         {
+            if (!FileSystemUtilities.isDriveReady(dirPath)) return false;
             if (!FileSystemUtilities.IsDirectoryExistInTheSystem(dirPath))
             {
                 if (!FileSystemUtilities.MakeDirectory(dirPath)) return false;
             }
             if (!FileSystemUtilities.IsDirectoryHasReadAndWritePermission(dirPath)) return false;
             return true;
         }
-    
     }
 }

Forms/Options/OneClickProcessorFrm.cs

@@ -58,7 +58,7 @@ private TreeNodeExtended GetSelectedTreeNodeExtended
             }
         }
 
-        public TargetOutputLocationModel TargetOutputLocationModelObj
+        private TargetOutputLocationModel TargetOutputLocationModelObj
         { 
             get 
             { 
@@ -138,7 +138,7 @@ private void listViewSearchDirExp_KeyDown(object sender, KeyEventArgs e)
             }
         }
 
-        #endregion
+#endregion
 
 #region ZIP Designer Controls and related functions
 
@@ -447,7 +447,7 @@ private void toolStripButtonRename_Click(object sender, EventArgs e)
 
         private void treeViewZipDesigner_DoubleClick(object sender, EventArgs e)
         {
-            TreeNodeExtended targetNode = (TreeNodeExtended)treeViewZipDesigner.SelectedNode;
+            TreeNodeExtended targetNode = GetSelectedTreeNodeExtended;
             if (targetNode == null) return;
             if (targetNode.IsFolderIsFilterRule) ModifyFilterRule();
         }
@@ -868,7 +868,7 @@ private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
 
         #endregion
 
-        #region Context Strip for Zip File Tree View
+#region Context Strip for Zip File Tree View
 
         private void expandToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -939,7 +939,7 @@ private void modifyFilterRuleToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void ModifyFilterRule(TreeNodeExtended targetNode = null)
         {
-            TreeNodeExtended treeNodeEx = (targetNode==null) ? (TreeNodeExtended)treeViewZipDesigner.SelectedNode : targetNode;
+            TreeNodeExtended treeNodeEx = (targetNode==null) ? GetSelectedTreeNodeExtended : targetNode;
             FilterRuleFrm filterFrm = new FilterRuleFrm(treeNodeEx.FolderFilterRuleObj);
             filterFrm.ShowDialog();
             treeNodeEx.FolderFilterRuleObj = (FolderFilterRule)filterFrm.FolderFilterRule.Clone();

Forms/ZipDesigner/ZipDesignerFrm.cs

@@ -163,7 +163,7 @@ private bool AddFileIntoZipArchive(ZipFile archiveFile, CustomFileItem customFil
                     archiveFile.Save();
                 }
             }
-            //just ignore if cannot accessed the file
+            //just ignore if cannot access the file
             catch (UnauthorizedAccessException) { return false; }
             catch (Exception) { return false; }
             return true;

Includes/Classes/ZipArchiving.cs

@@ -21,7 +21,8 @@ public class FileSystemUtilities
         private static readonly String SPECIAL_FOLDER_PATTERN = @".*?\{.*?\}";
         private static List<KeyValuePair<String, Environment.SpecialFolder>> SPECIAL_FOLDERS_MANUAL_MATCHMAKING;
         private static readonly List<char> INVALID_FILE_PATH_CHARACTERS;
-        static FileSystemUtilities() {
+        static FileSystemUtilities()
+        {
             SPECIAL_FOLDERS = new List<string>();
             SPECIAL_FOLDERS_MANUAL_MATCHMAKING = new List<KeyValuePair<string, Environment.SpecialFolder>>();
             SPECIAL_FOLDERS.AddRange(ClassReflectionUtilities.GetEnumerableOptions(typeof(Environment.SpecialFolder)));
@@ -41,7 +42,7 @@ public static bool IsFullPathIsDirectory(String fullPath)
                     return true;
                 }
             }
-            catch (Exception )
+            catch (Exception)
             {
                 return false;
             }
@@ -89,11 +90,11 @@ public static DirectoryInfo[] GetDirectories(String pathName)
         public static FileInfo[] GetFiles(String pathName)
         {
             DirectoryInfo dInfo = new DirectoryInfo(pathName);
-            FileInfo[] result=null;
+            FileInfo[] result = null;
             if (!dInfo.Exists) return result;
             try
             {
-                if(FileSystemUtilities.IsDirectoryAttribute(dInfo)) result = dInfo.GetFiles();
+                if (FileSystemUtilities.IsDirectoryAttribute(dInfo)) result = dInfo.GetFiles();
             }
             catch (UnauthorizedAccessException) { }
             return result;
@@ -163,7 +164,7 @@ public static String GetSpecialFolderFullPath(String fileName)
             }
             if (targetEnum == null) return null;
 
-            return System.Environment.GetFolderPath((Environment.SpecialFolder) targetEnum);
+            return System.Environment.GetFolderPath((Environment.SpecialFolder)targetEnum);
         }
         public static String SanitizeFileName(String fileName)
         {
@@ -227,5 +228,13 @@ public static bool IsDirectoryHasReadAndWritePermission(String directoryPath)
                 return false;
             }
         }
+        public static bool isDriveReady(String path)
+        {
+            foreach (DriveInfo removableDrive in DriveInfo.GetDrives().Where(d => d.IsReady))
+            {
+                if (path.StartsWith(removableDrive.RootDirectory.Name)) return true;
+            }
+            return false;
+        }
     }
 }

Includes/Utilities/FileSystemUtilities.cs

@@ -9,7 +9,7 @@
       <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="app_version_patch" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">6</Value>
+      <Value Profile="(Default)">7</Value>
     </Setting>
     <Setting Name="app_version_revision" Type="System.String" Scope="Application">
       <Value Profile="(Default)">r1</Value>