fix bug

输出到新位置时，对不同文件夹内的同名文件做重命名
lucifersun · Aug 3, 2019 · 80aefe2 · 80aefe2
1 parent 71aaaaa
commit 80aefe2
Show file tree

Hide file tree

Showing 25 changed files with 24 additions and 10 deletions.
diff --git a/.vs/ImageOptimize/v16/.suo b/.vs/ImageOptimize/v16/.suo
diff --git a/.vs/ImageOptimize/v16/Server/sqlite3/storage.ide b/.vs/ImageOptimize/v16/Server/sqlite3/storage.ide
diff --git a/.vs/ImageOptimize/v16/Server/sqlite3/storage.ide-shm b/.vs/ImageOptimize/v16/Server/sqlite3/storage.ide-shm
diff --git a/.vs/ImageOptimize/v16/Server/sqlite3/storage.ide-wal b/.vs/ImageOptimize/v16/Server/sqlite3/storage.ide-wal
diff --git a/ImageOptimize/MainWindow.xaml.cs b/ImageOptimize/MainWindow.xaml.cs
@@ -132,6 +132,20 @@ private void Button_Click(object sender, RoutedEventArgs e)
             //如果选择使用新文件夹
             if (radioButton1.IsChecked==true)
             {
+                //检查文件名是否有重复，避免不同文件夹内有同名文件
+                string tempFileName = null;
+                for(int i = 0; i<Fileslist.SrcName.Count; i++)
+                {
+                    tempFileName = Fileslist.SrcName[i];
+                    Fileslist.SrcName[i] = "";
+                    if (Fileslist.SrcName.Contains(tempFileName))
+                    {
+                        tempFileName = System.IO.Path.GetFileNameWithoutExtension(tempFileName) + "_"+i.ToString() + System.IO.Path.GetExtension(Fileslist.SrcPath[i]);
+                    }
+                    Fileslist.SrcName[i] = tempFileName;
+                }
+
+
                 string NewFold = newfoldBox.Text;
                 string preFileName = PrefixFileName.Text;
                 Parallel.For(0, Fileslist.SrcName.Count, i => Fileslist.NewPath[i] = NewFold + "\\" + preFileName + Fileslist.SrcName[i]);

diff --git a/ImageOptimize/bin/Debug/ImageOptimize.application b/ImageOptimize/bin/Debug/ImageOptimize.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>iouFMuH5PvRSQovus1p4WE4+8w0BRCWErOk7nVvN6Aw=</dsig:DigestValue>
+        <dsig:DigestValue>mnXc6lTxSKCwTLl074yqPBIn6wVMZye3JvosTZvr+Ao=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/bin/Debug/ImageOptimize.exe b/ImageOptimize/bin/Debug/ImageOptimize.exe
diff --git a/ImageOptimize/bin/Debug/ImageOptimize.exe.manifest b/ImageOptimize/bin/Debug/ImageOptimize.exe.manifest
@@ -50,7 +50,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>Vkr0xfPejJ4z2R1iAAFo4vaiqmZYmogPz2fItbhwKxc=</dsig:DigestValue>
+        <dsig:DigestValue>X0+NpTZThrbWOlPlPAPo5v07NUc5CrbNa0XmTR053cg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/bin/Debug/ImageOptimize.pdb b/ImageOptimize/bin/Debug/ImageOptimize.pdb
diff --git a/ImageOptimize/bin/Debug/app.publish/ImageOptimize.exe b/ImageOptimize/bin/Debug/app.publish/ImageOptimize.exe
diff --git a/ImageOptimize/bin/Release/ImageOptimize.application b/ImageOptimize/bin/Release/ImageOptimize.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>aHOrelHeQylZIQhBV/YUuTvwmub6Jvpw87DZ85vJZGc=</dsig:DigestValue>
+        <dsig:DigestValue>vvxkQb+V7HEM/XOwJ2an/QvyCCxM8sO1NDXDon7SJZ0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/bin/Release/ImageOptimize.exe b/ImageOptimize/bin/Release/ImageOptimize.exe
diff --git a/ImageOptimize/bin/Release/ImageOptimize.exe.manifest b/ImageOptimize/bin/Release/ImageOptimize.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ImageOptimize.exe" size="167352">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ImageOptimize.exe" size="167864">
       <assemblyIdentity name="ImageOptimize" version="1.0.0.0" language="neutral" processorArchitecture="amd64" />
       <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>YpocwsGhbh3caiPQM0jjlqgHTQeoCgJbHzfUs4pbnxE=</dsig:DigestValue>
+        <dsig:DigestValue>mg/ijYr7RN2mwnysEpASKfi69wGepl3TAmwj95xWiX4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/bin/Release/ImageOptimize.pdb b/ImageOptimize/bin/Release/ImageOptimize.pdb
diff --git a/ImageOptimize/bin/Release/app.publish/ImageOptimize.exe b/ImageOptimize/bin/Release/app.publish/ImageOptimize.exe
diff --git a/ImageOptimize/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ImageOptimize/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/ImageOptimize/obj/Debug/ImageOptimize.application b/ImageOptimize/obj/Debug/ImageOptimize.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>iouFMuH5PvRSQovus1p4WE4+8w0BRCWErOk7nVvN6Aw=</dsig:DigestValue>
+        <dsig:DigestValue>mnXc6lTxSKCwTLl074yqPBIn6wVMZye3JvosTZvr+Ao=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/obj/Debug/ImageOptimize.csprojAssemblyReference.cache b/ImageOptimize/obj/Debug/ImageOptimize.csprojAssemblyReference.cache
diff --git a/ImageOptimize/obj/Debug/ImageOptimize.exe b/ImageOptimize/obj/Debug/ImageOptimize.exe
diff --git a/ImageOptimize/obj/Debug/ImageOptimize.exe.manifest b/ImageOptimize/obj/Debug/ImageOptimize.exe.manifest
@@ -50,7 +50,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>Vkr0xfPejJ4z2R1iAAFo4vaiqmZYmogPz2fItbhwKxc=</dsig:DigestValue>
+        <dsig:DigestValue>X0+NpTZThrbWOlPlPAPo5v07NUc5CrbNa0XmTR053cg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/obj/Debug/ImageOptimize.pdb b/ImageOptimize/obj/Debug/ImageOptimize.pdb
diff --git a/ImageOptimize/obj/Release/ImageOptimize.application b/ImageOptimize/obj/Release/ImageOptimize.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>aHOrelHeQylZIQhBV/YUuTvwmub6Jvpw87DZ85vJZGc=</dsig:DigestValue>
+        <dsig:DigestValue>vvxkQb+V7HEM/XOwJ2an/QvyCCxM8sO1NDXDon7SJZ0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/obj/Release/ImageOptimize.exe b/ImageOptimize/obj/Release/ImageOptimize.exe
diff --git a/ImageOptimize/obj/Release/ImageOptimize.exe.manifest b/ImageOptimize/obj/Release/ImageOptimize.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ImageOptimize.exe" size="167352">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ImageOptimize.exe" size="167864">
       <assemblyIdentity name="ImageOptimize" version="1.0.0.0" language="neutral" processorArchitecture="amd64" />
       <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>YpocwsGhbh3caiPQM0jjlqgHTQeoCgJbHzfUs4pbnxE=</dsig:DigestValue>
+        <dsig:DigestValue>mg/ijYr7RN2mwnysEpASKfi69wGepl3TAmwj95xWiX4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/ImageOptimize/obj/Release/ImageOptimize.pdb b/ImageOptimize/obj/Release/ImageOptimize.pdb