Disable rewrite file

savushkin-r-d · Oct 24, 2024 · 446d2c4 · 446d2c4
1 parent 668d8a6
commit 446d2c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/ProjectImportICP/ChannelBaseTransformer.cs b/src/ProjectImportICP/ChannelBaseTransformer.cs
@@ -97,16 +97,15 @@ public static string ModifyID(string newChannelDB, string oldChannelDB, IEnumera
                 .Where(t => t.NewID != null && t.OldID != null)
                 .ToDictionary(j => j.NewID, j => j.Enabled);
 
-
-            var replaceRegex = new Regex($@"(?<=<channels:id>){string.Join("|", IdToReplaced.Keys)}(?=<\/channels:id>)",
-                RegexOptions.None, TimeSpan.FromMilliseconds(10000));
-
             var replaceEnableRegex = new Regex($@"(?<=<channels:id>(?<id>{string.Join("|", IdEnable.Keys)})<\/channels:id>[\d\w\s</>:]*<channels:enabled>)0",
                 RegexOptions.None, TimeSpan.FromMilliseconds(10000));
 
             // enable used tags
             var chbaseWithEnabled = replaceEnableRegex.Replace(newChannelDB, m => IdEnable[m.Groups["id"].Value]);
 
+            var replaceRegex = new Regex($@"(?<=<channels:id>){string.Join("|", IdToReplaced.Keys)}(?=<\/channels:id>)",
+                RegexOptions.None, TimeSpan.FromMilliseconds(10000));
+
             return replaceRegex.Replace(chbaseWithEnabled, m => IdToReplaced[m.Value]);
         }
 

diff --git a/src/ProjectImportICP/ModifyChannelsDBDialog.cs b/src/ProjectImportICP/ModifyChannelsDBDialog.cs
@@ -137,11 +137,7 @@ private void ModifyBttn_Click(object sender, EventArgs e)
             // Проверка совпадения индексов
             ChannelBaseTransformer.CheckChbaseID(modifiedDstChbase);
 
-            // Смена названия файла для сохранения, если такой уже существует
-            var dstSavePath = needExport? 
-                dstPath : Path.Combine(Path.GetDirectoryName(dstPath), Path.GetFileNameWithoutExtension(dstPath) + "_reindex.cdbx");
-
-            using (var writer = new StreamWriter(dstSavePath, false, Encoding.UTF8))
+            using (var writer = new StreamWriter(dstPath, false, Encoding.UTF8))
                 writer.Write(modifiedDstChbase);
 
             Logs.SetProgress(100);