feat: add esportal source detection

fix akiver#547
ConnySjoblom · Apr 1, 2022 · 309ea89 · 309ea89
1 parent ccdc551
commit 309ea89
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 2 deletions.
diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -127,6 +127,7 @@
     <Compile Include="Models\Serialization\SideToStringConverter.cs" />
     <Compile Include="Models\Side.cs" />
     <Compile Include="Models\Source\Esl.cs" />
+    <Compile Include="Models\Source\Esportal.cs" />
     <Compile Include="Models\Source\Wanmei.cs" />
     <Compile Include="Models\Steam\VanityUrlResponse.cs" />
     <Compile Include="Models\Stuff.cs" />
@@ -309,6 +310,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\Images\Logos\esl.png" />
+    <Content Include="Resources\Images\Logos\esportal.png" />
     <Content Include="Resources\Images\Logos\wanmei.png" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Core/Models/Source/Esportal.cs b/Core/Models/Source/Esportal.cs
@@ -0,0 +1,13 @@
+namespace Core.Models.Source
+{
+    public class Esportal : Source
+    {
+        public const string NAME = "esportal";
+
+        public Esportal()
+        {
+            Name = NAME;
+            Label = "Esportal";
+        }
+    }
+}
diff --git a/Core/Models/Source/Source.cs b/Core/Models/Source/Source.cs
@@ -31,6 +31,8 @@ public Image Logo
                         return Properties.Resources.popflash;
                     case Wanmei.NAME:
                         return Properties.Resources.wanmei;
+                    case Esportal.NAME:
+                        return Properties.Resources.esportal;
                     default:
                         return Properties.Resources.valve;
                 }
@@ -59,6 +61,8 @@ public static Source Factory(string name)
                     return new Esl();
                 case Wanmei.NAME:
                     return new Wanmei();
+                case Esportal.NAME:
+                    return new Esportal();
                 default:
                     return null;
             }
@@ -74,6 +78,7 @@ public static Source Factory(string name)
             new PopFlash(),
             new Valve(),
             new Wanmei(),
+            new Esportal(),
             new Pov(),
         };
     }

diff --git a/Core/Properties/Resources.Designer.cs b/Core/Properties/Resources.Designer.cs
diff --git a/Core/Properties/Resources.resx b/Core/Properties/Resources.resx
@@ -190,6 +190,9 @@
   <data name="esl" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\Logos\esl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="esportal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Images\Logos\esportal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="faceit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\Logos\faceit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

diff --git a/Core/Resources/Images/Logos/esportal.png b/Core/Resources/Images/Logos/esportal.png
diff --git a/Manager/Resources/DataGrids.xaml b/Manager/Resources/DataGrids.xaml
@@ -51,7 +51,7 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource MahApps.Colors.Highlight}" Opacity="0.7" />
+                <SolidColorBrush Color="{DynamicResource MahApps.Colors.BackgroundColor}" />
             </Setter.Value>
         </Setter>
     </Style>

diff --git a/Services/Concrete/Analyzer/DemoAnalyzer.cs b/Services/Concrete/Analyzer/DemoAnalyzer.cs
@@ -178,6 +178,7 @@ public static DemoAnalyzer Factory(Demo demo)
                     return new EseaAnalyzer(demo);
                 case Ebot.NAME:
                 case Faceit.NAME:
+                case Esportal.NAME:
                 case Esl.NAME:
                     return new EbotAnalyzer(demo);
                 case Cevo.NAME:
@@ -307,6 +308,11 @@ private static Source DetermineDemoSource(Demo demo, DemoHeader header)
                 return Source.Factory(Ebot.NAME);
             }
 
+            if (demo.Hostname.Contains(Esportal.NAME, StringComparison.OrdinalIgnoreCase))
+            {
+                return Source.Factory(Esportal.NAME);
+            }
+
             // Check for esea demos, appart filename or hostname, there is no magic to detect it
             if (demo.Name.Contains(Esea.NAME, StringComparison.OrdinalIgnoreCase)
                 || demo.Hostname.Contains(Esea.NAME, StringComparison.OrdinalIgnoreCase))