Version 0.143

Fixed minor bugs
derco0n · Nov 22, 2018 · e775a39 · e775a39
1 parent 2e948ff
commit e775a39
Show file tree

Hide file tree

Showing 19 changed files with 88 additions and 26 deletions.
diff --git a/Co0nSearchC/F_Main.Designer.cs b/Co0nSearchC/F_Main.Designer.cs
diff --git a/Co0nSearchC/F_Main.cs b/Co0nSearchC/F_Main.cs
@@ -23,13 +23,14 @@ public F_Main()
 
         public C_Settings settings;
         private List<C_FilesIndexer> indexers = new List<C_FilesIndexer>();
-        public Boolean ShouldReInitializeAfterSettingsChange = false; // Ween true, sollten die Sucher reinitialisiert werden. Einstellungen wurde geändert. Wird in anderer F_Settings gesetzt.
+        public Boolean ShouldReInitializeAfterSettingsChange = false; // Wenn true, sollten die Sucher reinitialisiert werden. Einstellungen wurde geändert. Wird in anderer F_Settings gesetzt.
 
         private System.DateTime SearchStarted, SearchEnded; // Für Benchmarking
 
         private int _items = 0;
         private int _runningthreads = 0;
 
+        // private List<C_FilesIndexerElement> filesfound = new List<C_FilesIndexerElement>(); //DEBUG
 
 
         private void HandleFolderProcessed(object sender)
@@ -54,9 +55,42 @@ private void HandleItemsFound(object sender, List<C_FilesIndexerElement> newitem
                 processedfolders += indexer.foldersProcessedsoFar;
             }
 
+            /*
+            //DEBUG
+            if (!this.alreadyInList(this.filesfound, newitems))
+            {
+                this.filesfound.AddRange(newitems);
+            }
+            else
+            {
+
+            }
+            //DEBUG ENDE
+            */
+
             this.updateFileListAndLabels(false, newitems, "Bisher " + processedfolders + " Ordner durchsucht -> " + this._items.ToString() + " Elemente gefunden...", "Suche läuft (in " + this._runningthreads.ToString() + " Basisordnern):");
         }
 
+        /// <summary>
+        /// DEBUG: Check for duplicates
+        /// </summary>
+        /// <param name="list1">list to check in</param>
+        /// <param name="list2">list to check for</param>
+        /// <returns></returns>
+        private bool alreadyInList(List<C_FilesIndexerElement> list1, List<C_FilesIndexerElement> list2)
+        {
+            foreach (C_FilesIndexerElement elem in list2)
+            {
+                bool exists= list1.Any(item => item.Name.Equals(elem.Name) && item.Type==item.Type);
+                if (exists)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private void HandleSearchAborted(object sender)
         {//Der Thread des Suchers wurde abgebrochen...            
                 this._runningthreads--;           
@@ -179,6 +213,7 @@ private void updateCountLabel(string msg)
 
         private void startSearch(String searchfor)
         {
+            //this.filesfound=new List<C_FilesIndexerElement>(); //DBEUG
             this.lstFiles.Items.Clear();
             this._items = 0;
 
@@ -291,15 +326,7 @@ private void DeRegisterEvents()
 
         private void txtSearch_TextChanged(object sender, EventArgs e)
         {
-            this.StopSeachers();
 
-
-            if (this.txtSearch.Text.Length >= 2)
-           {
-                this.updateCountLabel("Bisher keine Daten.");
-                this.updateStateLabel("Suche beginnt...");
-                this.startSearch(this.txtSearch.Text);
-            }
 
         }
 
@@ -426,6 +453,39 @@ private void lstFiles_MouseMove(object sender, MouseEventArgs e)
             */
         }
 
+        private void txtSearch_KeyPress(object sender, KeyPressEventArgs e)
+        {
+
+        }
+
+        private void txtSearch_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                //Enter pressed
+                this.StopSeachers();
+
+                //Wait for SearchThreads to stop
+                foreach (C_FilesIndexer indexer in this.indexers)
+                {
+                    if (indexer._SearchThread != null && indexer._SearchThread.ThreadState == System.Threading.ThreadState.Running)
+                    {
+                        indexer._SearchThread.Join();
+                    }
+
+                }
+
+                if (this.txtSearch.Text.Length >= 2)
+                {
+                    this.updateCountLabel("Bisher keine Daten.");
+                    this.updateStateLabel("Suche beginnt...");
+                    this.startSearch(this.txtSearch.Text);
+                }
+                e.Handled = true;
+                e.SuppressKeyPress = true;
+            }
+        }
+
         private void lblCount_Click(object sender, EventArgs e)
         {
 

diff --git a/Co0nSearchC/Program.cs b/Co0nSearchC/Program.cs
@@ -9,7 +9,7 @@ namespace Co0nSearchC
     public static class Program
     {
         public static String APPNAME = "CSearch";
-        public static float VERSION = 0.142f;
+        public static float VERSION = 0.143f;
         public static String VERSIONDATE = "20181122";
         /// <summary>
         /// Der Haupteinstiegspunkt für die Anwendung.

diff --git a/Co0nSearchC/Properties/AssemblyInfo.cs b/Co0nSearchC/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.4.2")]
-[assembly: AssemblyFileVersion("0.1.4.2")]
+[assembly: AssemblyVersion("0.1.4.3")]
+[assembly: AssemblyFileVersion("0.1.4.3")]
diff --git a/Co0nSearchC/bin/Release/CSearch.exe b/Co0nSearchC/bin/Release/CSearch.exe
diff --git a/Co0nSearchC/bin/Release/Co0nUtilZ.dll b/Co0nSearchC/bin/Release/Co0nUtilZ.dll
diff --git a/Co0nSearchC/obj/Debug/CSearch.application b/Co0nSearchC/obj/Debug/CSearch.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>QsLAnISwOwur6Bj5yg7IFhPxo21NJFQPWLwSgETTBhw=</dsig:DigestValue>
+        <dsig:DigestValue>QFDzOgsfFbJCJOCrY5NuuK5w5cxoYBE40KESQiPErLQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Co0nSearchC/obj/Debug/CSearch.csproj.GenerateResource.cache b/Co0nSearchC/obj/Debug/CSearch.csproj.GenerateResource.cache
diff --git a/Co0nSearchC/obj/Debug/CSearch.csprojAssemblyReference.cache b/Co0nSearchC/obj/Debug/CSearch.csprojAssemblyReference.cache
diff --git a/Co0nSearchC/obj/Debug/CSearch.exe b/Co0nSearchC/obj/Debug/CSearch.exe
diff --git a/Co0nSearchC/obj/Debug/CSearch.exe.manifest b/Co0nSearchC/obj/Debug/CSearch.exe.manifest
@@ -4,7 +4,7 @@
   <description asmv2:iconFile="logo_small.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="CSearch" version="0.1.2.0" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="CSearch" version="0.1.4.3" language="neutral" processorArchitecture="msil" />
     <commandLine file="CSearch.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -43,26 +43,26 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Co0nUtilZ.dll" size="64512">
-      <assemblyIdentity name="Co0nUtilZ" version="0.2.0.0" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Co0nUtilZ.dll" size="65024">
+      <assemblyIdentity name="Co0nUtilZ" version="0.3.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>XlDGempCoFHQ7qx6Jy3DQOHZwwd5yL6+RRWqNN6j8nw=</dsig:DigestValue>
+        <dsig:DigestValue>c1qqUilMhPsxqX3uLHh8f6mJMdEVcZRMJ3zjnhDQFNc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="CSearch.exe" size="65304">
-      <assemblyIdentity name="CSearch" version="0.1.2.0" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="CSearch.exe" size="66328">
+      <assemblyIdentity name="CSearch" version="0.1.4.3" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>++/PprPAp0ZhTMslw9ItJQCY5WcqVhsJo10N3JZmjFw=</dsig:DigestValue>
+        <dsig:DigestValue>7rtgi+bd/mW3Uyjo20bc/dgRDoMOufOuKEPbV/Xxyw0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Co0nSearchC/obj/Debug/CSearch.pdb b/Co0nSearchC/obj/Debug/CSearch.pdb
diff --git a/Co0nSearchC/obj/Release/CSearch.application b/Co0nSearchC/obj/Release/CSearch.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>A113nA5V9I37d+KLZizfdeJmFLKQoDOGHCtRefZQZz4=</dsig:DigestValue>
+        <dsig:DigestValue>PBSxswo/Hcphr+1jmZeQezkv++zrTkwjTa5QOqXfnKg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Co0nSearchC/obj/Release/CSearch.csproj.GenerateResource.cache b/Co0nSearchC/obj/Release/CSearch.csproj.GenerateResource.cache
diff --git a/Co0nSearchC/obj/Release/CSearch.csprojAssemblyReference.cache b/Co0nSearchC/obj/Release/CSearch.csprojAssemblyReference.cache
diff --git a/Co0nSearchC/obj/Release/CSearch.exe b/Co0nSearchC/obj/Release/CSearch.exe
diff --git a/Co0nSearchC/obj/Release/CSearch.exe.manifest b/Co0nSearchC/obj/Release/CSearch.exe.manifest
@@ -4,7 +4,7 @@
   <description asmv2:iconFile="logo_small.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="CSearch" version="0.1.4.2" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="CSearch" version="0.1.4.3" language="neutral" processorArchitecture="msil" />
     <commandLine file="CSearch.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -50,19 +50,19 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>BAdtnVSLwijNik2EMiM9zxYsaXaxmAy+C1RvBMuYK2k=</dsig:DigestValue>
+        <dsig:DigestValue>Zmq9ZUbcWEACWe5GsYeY+AHXFLV6ktvTdY2sGgcyQ6Y=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="CSearch.exe" size="64280">
-      <assemblyIdentity name="CSearch" version="0.1.4.2" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="CSearch.exe" size="65304">
+      <assemblyIdentity name="CSearch" version="0.1.4.3" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>Jzmc0A5u/MmZVXXXWFJXWrXs01LmrGYdHGBHxDGJ1nU=</dsig:DigestValue>
+        <dsig:DigestValue>tpp7orRJW5yHUeAjzgmsW3zbigZjgdxWWR1BPfYF5lg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Co0nSearchC/obj/Release/CSearch.pdb b/Co0nSearchC/obj/Release/CSearch.pdb
diff --git a/Co0nSearchC/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Co0nSearchC/obj/Release/DesignTimeResolveAssemblyReferences.cache