Version 1.4

blogifierdotnet · Nov 12, 2017 · 0d1365d · 0d1365d
1 parent 427d0d6
commit 0d1365d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/samples/WebApp/appsettings.json b/samples/WebApp/appsettings.json
@@ -11,6 +11,7 @@
   "Blogifier": {
     "BlogRoute": "blog/",
     "SingleBlog": false,
+    "InitializeDatabase": false,
     "Title": "Blogifier.Core",
     "Description": "Blogifier.Core sample application",
     "AdminTheme": "Standard",

diff --git a/src/Blogifier.Core/Blogifier.Core.csproj b/src/Blogifier.Core/Blogifier.Core.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyVersion>1.3.5.0</AssemblyVersion>
-    <FileVersion>1.3.5.0</FileVersion>
-    <Version>1.3.5.0</Version>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
+    <Version>1.4.0.0</Version>
     <Authors>blogifierdotnet</Authors>
     <Company>Blogifier</Company>
     <Description>Blogifier.Core will add full-featured, multi-user blog to your ASP.NET Core application. Along with administration panel to create, update and publish posts, upload files and images, expose RSS feed to subscribers and more.</Description>

diff --git a/src/Blogifier.Core/Common/ApplicationSettings.cs b/src/Blogifier.Core/Common/ApplicationSettings.cs
@@ -16,6 +16,7 @@ public class ApplicationSettings
         public static bool SingleBlog { get; set; } = false;
         public static bool EnableLogging { get; set; }
         public static bool UseInMemoryDatabase { get; set; }
+        public static bool InitializeDatabase { get; set; } = true;
         public static string ConnectionString { get; set; } = @"Server=.\SQLEXPRESS;Database=Blogifier;Trusted_Connection=True;";
         public static string BlogStorageFolder { get; set; } = "blogifier/data";
         public static string SupportedStorageFiles { get; set; } = "zip,txt,mp3,mp4,pdf,doc,docx,xls,xlsx,xml";

diff --git a/src/Blogifier.Core/Configuration.cs b/src/Blogifier.Core/Configuration.cs
@@ -58,9 +58,26 @@ public static void InitApplication(IApplicationBuilder app, IHostingEnvironment
 
             ApplicationSettings.WebRootPath = env.WebRootPath;
 			ApplicationSettings.ContentRootPath = env.ContentRootPath;
+
+            if (!ApplicationSettings.UseInMemoryDatabase && ApplicationSettings.InitializeDatabase)
+            {
+                try
+                {
+                    using (var scope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope())
+                    {
+                        var db = scope.ServiceProvider.GetService<BlogifierDbContext>().Database;
+                        db.EnsureCreated();
+                        if (db.GetPendingMigrations() != null)
+                        {
+                            db.Migrate();
+                        }
+                    }
+                }
+                catch { }
+            }
         }
 
-		static void AddDatabase(IServiceCollection services)
+        static void AddDatabase(IServiceCollection services)
 		{
 			services.AddScoped<IUnitOfWork, UnitOfWork>();
             services.AddDbContext<BlogifierDbContext>(ApplicationSettings.DatabaseOptions);
@@ -109,6 +126,9 @@ static void LoadFromConfigFile(IConfiguration config)
                         if (section["UseInMemoryDatabase"] != null)
                             ApplicationSettings.UseInMemoryDatabase = section.GetValue<bool>("UseInMemoryDatabase");
 
+                        if (section["InitializeDatabase"] != null)
+                            ApplicationSettings.InitializeDatabase = section.GetValue<bool>("InitializeDatabase");
+
                         if (section["ConnectionString"] != null)
                             ApplicationSettings.ConnectionString = section.GetValue<string>("ConnectionString");
 

diff --git a/src/Blogifier.Core/Middleware/EmbeddedResources.cs b/src/Blogifier.Core/Middleware/EmbeddedResources.cs
@@ -2,15 +2,12 @@
 using Blogifier.Core.Extensions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Reflection;
 using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Blogifier.Core.Middleware
@@ -35,7 +32,6 @@ public EmbeddedResources(RequestDelegate next, ILogger<EmbeddedResources> logger
                     var path = name.ReplaceIgnoreCase("Blogifier.Core", "").ToLower();
                     var resource = GetResource(name, assembly);
 					_resources.Add(path, resource);
-                    _logger.LogInformation("EMBEDDED: " + path);
 				}
 			}
 		}