From 549ba070b1bf4504fe7e1e9e504c1cd809265867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D1=83=D1=80=D0=B0=D1=88=D0=BE=D0=B2=20=D0=94=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=81=20=28Murashov=5FDA=29?=
 <Murashov_DA@directum.ru>
Date: Mon, 20 Jan 2025 14:22:22 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D1=8B=20MetadataB?=
 =?UTF-8?q?rowser=20=D0=B8=D0=B7=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D1=83=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RXInstanceManager/AppHandlers.cs     | 10 +++++++++-
 RXInstanceManager/MainWindow.xaml    |  1 +
 RXInstanceManager/MainWindow.xaml.cs | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/RXInstanceManager/AppHandlers.cs b/RXInstanceManager/AppHandlers.cs
index a57f772..1c4209c 100644
--- a/RXInstanceManager/AppHandlers.cs
+++ b/RXInstanceManager/AppHandlers.cs
@@ -236,7 +236,7 @@ public static void LaunchProcess(string fileName, bool asAdmin)
       LaunchProcess(fileName, null, asAdmin, false);
     }
 
-    public static void LaunchProcess(string fileName, string args, bool asAdmin, bool waitForExit)
+    public static void LaunchProcess(string fileName, string args, bool asAdmin, bool waitForExit, bool isHiddenCommandLine = false)
     {
       using (var process = new Process())
       {
@@ -253,6 +253,14 @@ public static void LaunchProcess(string fileName, string args, bool asAdmin, boo
         if (asAdmin)
           process.StartInfo.Verb = "runas";
 
+        if (isHiddenCommandLine)
+        {
+          process.StartInfo.CreateNoWindow = true;
+          process.StartInfo.UseShellExecute = false;
+          process.StartInfo.RedirectStandardOutput = true;
+          process.StartInfo.RedirectStandardError = true;
+        }
+
         try
         {
           process.Start();
diff --git a/RXInstanceManager/MainWindow.xaml b/RXInstanceManager/MainWindow.xaml
index df853b1..872e1b6 100644
--- a/RXInstanceManager/MainWindow.xaml
+++ b/RXInstanceManager/MainWindow.xaml
@@ -42,6 +42,7 @@
         <Button x:Name="ButtonDDSStart" Content="Development Studio" Style="{DynamicResource RecordActionButton}" Background="GreenYellow" Click="ButtonDDSStart_Click" />
         <Button x:Name="ButtonRXStart" Content="Веб-клиент" Style="{DynamicResource RecordActionButton}" Background="Violet" Click="ButtonRXStart_Click" />
         <Button x:Name="ButtonLogViewer" Content="Directum LogViewer" Style="{DynamicResource RecordActionButton}" Background="Gray" Click="RunDirectumLogViewer_Click" />
+        <Button x:Name="ButtonMetadataBrowser" Content="Metadata Browser" Style="{DynamicResource RecordActionButton}" Background="Yellow" Click="RunMetadataBrowser_Click" />
         <Button x:Name="ButtonSourcesFolder" Content="Папка исходников" Style="{DynamicResource RecordActionButton}" Background="#FFDCA3FF" Click="ButtonSourcesFolder_Click" />
       </StackPanel>
       <DataGrid x:Name="GridInstances" AutoGenerateColumns="False" Style="{DynamicResource DataGridStyle}" Grid.Row="1" SelectionChanged="GridInstances_SelectionChanged" >
diff --git a/RXInstanceManager/MainWindow.xaml.cs b/RXInstanceManager/MainWindow.xaml.cs
index e40ebb6..2cbfd16 100644
--- a/RXInstanceManager/MainWindow.xaml.cs
+++ b/RXInstanceManager/MainWindow.xaml.cs
@@ -443,6 +443,21 @@ private void RunDirectumLogViewer_Click(object sender, RoutedEventArgs e)
         System.Windows.MessageBox.Show($"Папка {_instance.LogFolder} не существует.", "", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
     }
 
+    private void RunMetadataBrowser_Click(object sender, RoutedEventArgs e)
+    {
+      if (_instance == null)
+        return;
+
+      try
+      {
+        Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), "map run_metadata_browser", true, false, true));
+      }
+      catch (Exception ex)
+      {
+        AppHandlers.ErrorHandler(_instance, ex);
+      }
+    }
+
     private void ButtonSourcesFolder_Click(object sender, RoutedEventArgs e)
     {
       if (Directory.Exists(_instance.WorkingRepositoryName))

From c69d3c23101f9867549be142674e83bcd1faf418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D1=83=D1=80=D0=B0=D1=88=D0=BE=D0=B2=20=D0=94=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=81=20=28Murashov=5FDA=29?=
 <Murashov_DA@directum.ru>
Date: Mon, 20 Jan 2025 15:51:38 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RXInstanceManager/Entities/Models/Config.cs |  4 ++++
 RXInstanceManager/MainWindow.xaml.cs        |  3 ++-
 RXInstanceManager/MainWindowHandlers.cs     | 25 ++++++++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/RXInstanceManager/Entities/Models/Config.cs b/RXInstanceManager/Entities/Models/Config.cs
index 6c073e5..7104628 100644
--- a/RXInstanceManager/Entities/Models/Config.cs
+++ b/RXInstanceManager/Entities/Models/Config.cs
@@ -27,6 +27,10 @@ public class Config
     public string LogViewer { get; set; }
     internal bool LogViewerExists { get; set; }
 
+    public string MetadataBrowser { get; set; }
+
+    internal bool MetadataBrowserExists { get; set; }
+
     public bool NeedCheckAfterSet { get; set; }
 
     public ContextMenuClass ContextMenu { get; set; }
diff --git a/RXInstanceManager/MainWindow.xaml.cs b/RXInstanceManager/MainWindow.xaml.cs
index 2cbfd16..507e1fc 100644
--- a/RXInstanceManager/MainWindow.xaml.cs
+++ b/RXInstanceManager/MainWindow.xaml.cs
@@ -448,9 +448,10 @@ private void RunMetadataBrowser_Click(object sender, RoutedEventArgs e)
       if (_instance == null)
         return;
 
+      if (File.Exists(_configRxInstMan.MetadataBrowser))
       try
       {
-        Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), "map run_metadata_browser", true, false, true));
+        Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), "map run_metadata_browser " + _configRxInstMan.MetadataBrowser, true, false, true));
       }
       catch (Exception ex)
       {
diff --git a/RXInstanceManager/MainWindowHandlers.cs b/RXInstanceManager/MainWindowHandlers.cs
index 580c218..c1f72ac 100644
--- a/RXInstanceManager/MainWindowHandlers.cs
+++ b/RXInstanceManager/MainWindowHandlers.cs
@@ -41,7 +41,8 @@ private void LoadConfig()
         contextMenu.OpenLogFolder = true;
 
         var config = new Config();
-        config.LogViewer = "";
+        config.LogViewer = "";
+        config.MetadataBrowser = "";
         config.NeedCheckAfterSet = false;
         config.ContextMenu = contextMenu;
         var serializer = new YamlDotNet.Serialization.SerializerBuilder()
@@ -66,6 +67,20 @@ private void LoadConfig()
           _configRxInstMan.LogViewerExists = File.Exists(_configRxInstMan.LogViewer);
           if (!_configRxInstMan.LogViewerExists)
             AppHandlers.logger.Error(string.Format("Файл LogViewer {0} не найден", _configRxInstMan.LogViewer));
+          try
+          {
+            _configRxInstMan.MetadataBrowser = ymlData.metadataBrowser;
+          }
+          catch (Exception e)
+          {
+            if (Environment.UserDomainName == "NT_WORK")
+              _configRxInstMan.MetadataBrowser = "\\\\orpihost\\MetadataBrowser\\MetadataBrowser.exe";
+            else
+              _configRxInstMan.MetadataBrowser = "";
+          }
+          _configRxInstMan.MetadataBrowserExists = File.Exists(_configRxInstMan.MetadataBrowser);
+          if (!_configRxInstMan.MetadataBrowserExists)
+            AppHandlers.logger.Error(string.Format("Файл MetadataBrowser {0} не найден", _configRxInstMan.MetadataBrowser));
           _configRxInstMan.NeedCheckAfterSet = (ymlData.needCheckAfterSet == "true") ? true : false;
 
           Func<string, bool> getContext = (contextMenuItem) => !ymlData.contextMenu.ContainsKey(contextMenuItem) || ymlData.contextMenu[contextMenuItem] == "true" ? true : false;
@@ -198,6 +213,10 @@ private void ActionButtonVisibleChanging(string status = null)
             ButtonLogViewer.Visibility = Visibility.Visible;
           else
             ButtonLogViewer.Visibility = Visibility.Collapsed;
+          if (_configRxInstMan.MetadataBrowserExists)
+            ButtonMetadataBrowser.Visibility = Visibility.Visible;
+          else
+            ButtonMetadataBrowser.Visibility = Visibility.Collapsed;
           ButtonSourcesFolder.Visibility = Visibility.Visible;
           break;
         case Constants.InstanceStatus.Working:
@@ -209,6 +228,10 @@ private void ActionButtonVisibleChanging(string status = null)
             ButtonLogViewer.Visibility = Visibility.Visible;
           else
             ButtonLogViewer.Visibility = Visibility.Collapsed;
+          if (_configRxInstMan.MetadataBrowserExists)
+            ButtonMetadataBrowser.Visibility = Visibility.Visible;
+          else
+            ButtonMetadataBrowser.Visibility = Visibility.Collapsed;
           ButtonSourcesFolder.Visibility = Visibility.Visible;
           break;
       }