MP1-5219: Add SQL Service Dependencies

MediaPortal · May 28, 2024 · cce1e11 · cce1e11
1 parent 2f824ae
commit cce1e11
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/Tools/MediaPortal.DeployTool/MediaPortal.DeployTool.csproj b/Tools/MediaPortal.DeployTool/MediaPortal.DeployTool.csproj
@@ -80,7 +80,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NO_TV_SERVER</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <WarningLevel>1</WarningLevel>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>

diff --git a/TvEngine3/TVLibrary/SetupTv/SetupDatabaseForm.cs b/TvEngine3/TVLibrary/SetupTv/SetupDatabaseForm.cs
@@ -792,6 +792,17 @@ public void CheckServiceName()
       // first try the quick method and assume the user is right or using defaults
       string ConfiguredServiceName = tbServiceDependency.Text;
       string DBSearchPattern = @"MySQL";
+
+      // MS SQL
+      if (rbSQLServer.Checked)
+      {
+        DBSearchPattern = @"SQLBrowser";
+      }
+      else if ( !(OSInfo.OSInfo.Win10OrLater() && Utils.Is64bitOS) )
+      {
+        DBSearchPattern = @"MySQL5";
+      }
+
       Color clAllOkay = Color.GreenYellow;
 
       if (ServiceHelper.IsInstalled(ConfiguredServiceName))
@@ -801,19 +812,25 @@ public void CheckServiceName()
       }
       else
       {
-        // MSSQL
-        if (rbSQLServer.Checked)
-          DBSearchPattern = @"SQLBrowser";
-
         if (ServiceHelper.GetDBServiceName(ref DBSearchPattern))
         {
           tbServiceDependency.Text = DBSearchPattern;
           tbServiceDependency.BackColor = clAllOkay;
         }
         else
         {
-          Log.Info("SetupDatabaseForm: DB service name not recognized - using defaults");
-          tbServiceDependency.BackColor = Color.Red;
+          // Maria DB
+          DBSearchPattern = @"MariaDB";
+          if (ServiceHelper.GetDBServiceName(ref DBSearchPattern))
+          {
+            tbServiceDependency.Text = DBSearchPattern;
+            tbServiceDependency.BackColor = clAllOkay;
+          }
+          else
+          {
+            Log.Info("SetupDatabaseForm: DB service name not recognized - using defaults [{0}]", DBSearchPattern);
+            tbServiceDependency.BackColor = Color.Red;
+          }
         }
       }