Some more clean up

Author: rxtur

src/Core/Api/ThemesController.cs

@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Core.Api
@@ -160,23 +159,12 @@ public IActionResult Delete(string id)
         List<ThemeItem> GetThemes()
         {
             var themes = new List<ThemeItem>();
-            var combined = new List<string>();
+            var themeList = _store.GetThemes();
 
-            var storageThemes = _store.GetThemes();
-
-            if (storageThemes != null)
-                combined.AddRange(storageThemes);
-
-            if (AppConfig.EmbeddedThemes != null)
-                combined.AddRange(AppConfig.EmbeddedThemes);
-
-            combined = combined.Distinct().ToList();
-            combined.Sort();
-
-            if (combined != null && combined.Count > 0)
+            if (themeList != null && themeList.Count > 0)
             {
                 var current = new ThemeItem();
-                foreach (var themeTitle in combined)
+                foreach (var themeTitle in themeList)
                 {
                     var theme = themeTitle.ToLower();
                     var slash = Path.DirectorySeparatorChar.ToString();

src/Core/AppConfig.cs

@@ -8,8 +8,6 @@ namespace Core
 {
     public static class AppConfig
     {
-        public static IList<string> EmbeddedThemes { get; set; }
-
         public static IEnumerable<Assembly> GetAssemblies(bool includeApp = false)
         {
             var assemblies = new List<Assembly>();

src/Core/Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>2.4.1.4</Version>
+    <Version>2.4.1.5</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/Core/Extensions/ServiceCollectionExtensions.cs

@@ -53,30 +53,6 @@ static void AddFileProviders(IServiceCollection services)
                     foreach (var assembly in AppConfig.GetAssemblies(true))
                     {
                         var fileProvider = new EmbeddedFileProvider(assembly, assembly.GetName().Name);
-
-                        // load themes from embedded provider
-                        var content = fileProvider.GetDirectoryContents("");
-                        if (content.Exists)
-                        {
-                            foreach (var item in content)
-                            {
-                                if (item.Name.StartsWith("Views.Themes"))
-                                {
-                                    if (AppConfig.EmbeddedThemes == null)
-                                        AppConfig.EmbeddedThemes = new List<string>();
-
-                                    var ar = item.Name.Split('.');
-                                    if(ar.Length > 2 && !AppConfig.EmbeddedThemes.Contains(ar[2]))
-                                    {
-                                        if(assembly.GetName().Name.ToLower() != "app")
-                                        {
-                                            AppConfig.EmbeddedThemes.Add(ar[2]);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
                         options.FileProviders.Add(fileProvider);
                     }
                 });