Skip to content

Commit 0d1365d

Browse files
committed
Version 1.4
1 parent 427d0d6 commit 0d1365d

File tree

5 files changed

+26
-8
lines changed

5 files changed

+26
-8
lines changed

samples/WebApp/appsettings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"Blogifier": {
1212
"BlogRoute": "blog/",
1313
"SingleBlog": false,
14+
"InitializeDatabase": false,
1415
"Title": "Blogifier.Core",
1516
"Description": "Blogifier.Core sample application",
1617
"AdminTheme": "Standard",

src/Blogifier.Core/Blogifier.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.0</TargetFramework>
5-
<AssemblyVersion>1.3.5.0</AssemblyVersion>
6-
<FileVersion>1.3.5.0</FileVersion>
7-
<Version>1.3.5.0</Version>
5+
<AssemblyVersion>1.4.0.0</AssemblyVersion>
6+
<FileVersion>1.4.0.0</FileVersion>
7+
<Version>1.4.0.0</Version>
88
<Authors>blogifierdotnet</Authors>
99
<Company>Blogifier</Company>
1010
<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>

src/Blogifier.Core/Common/ApplicationSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class ApplicationSettings
1616
public static bool SingleBlog { get; set; } = false;
1717
public static bool EnableLogging { get; set; }
1818
public static bool UseInMemoryDatabase { get; set; }
19+
public static bool InitializeDatabase { get; set; } = true;
1920
public static string ConnectionString { get; set; } = @"Server=.\SQLEXPRESS;Database=Blogifier;Trusted_Connection=True;";
2021
public static string BlogStorageFolder { get; set; } = "blogifier/data";
2122
public static string SupportedStorageFiles { get; set; } = "zip,txt,mp3,mp4,pdf,doc,docx,xls,xlsx,xml";

src/Blogifier.Core/Configuration.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,26 @@ public static void InitApplication(IApplicationBuilder app, IHostingEnvironment
5858

5959
ApplicationSettings.WebRootPath = env.WebRootPath;
6060
ApplicationSettings.ContentRootPath = env.ContentRootPath;
61+
62+
if (!ApplicationSettings.UseInMemoryDatabase && ApplicationSettings.InitializeDatabase)
63+
{
64+
try
65+
{
66+
using (var scope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope())
67+
{
68+
var db = scope.ServiceProvider.GetService<BlogifierDbContext>().Database;
69+
db.EnsureCreated();
70+
if (db.GetPendingMigrations() != null)
71+
{
72+
db.Migrate();
73+
}
74+
}
75+
}
76+
catch { }
77+
}
6178
}
6279

63-
static void AddDatabase(IServiceCollection services)
80+
static void AddDatabase(IServiceCollection services)
6481
{
6582
services.AddScoped<IUnitOfWork, UnitOfWork>();
6683
services.AddDbContext<BlogifierDbContext>(ApplicationSettings.DatabaseOptions);
@@ -109,6 +126,9 @@ static void LoadFromConfigFile(IConfiguration config)
109126
if (section["UseInMemoryDatabase"] != null)
110127
ApplicationSettings.UseInMemoryDatabase = section.GetValue<bool>("UseInMemoryDatabase");
111128

129+
if (section["InitializeDatabase"] != null)
130+
ApplicationSettings.InitializeDatabase = section.GetValue<bool>("InitializeDatabase");
131+
112132
if (section["ConnectionString"] != null)
113133
ApplicationSettings.ConnectionString = section.GetValue<string>("ConnectionString");
114134

src/Blogifier.Core/Middleware/EmbeddedResources.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
using Blogifier.Core.Extensions;
33
using Microsoft.AspNetCore.Http;
44
using Microsoft.Extensions.Logging;
5-
using Microsoft.Net.Http.Headers;
65
using System;
76
using System.Collections.Generic;
87
using System.IO;
98
using System.Linq;
10-
using System.Net;
119
using System.Reflection;
1210
using System.Security.Cryptography;
13-
using System.Text;
1411
using System.Threading.Tasks;
1512

1613
namespace Blogifier.Core.Middleware
@@ -35,7 +32,6 @@ public EmbeddedResources(RequestDelegate next, ILogger<EmbeddedResources> logger
3532
var path = name.ReplaceIgnoreCase("Blogifier.Core", "").ToLower();
3633
var resource = GetResource(name, assembly);
3734
_resources.Add(path, resource);
38-
_logger.LogInformation("EMBEDDED: " + path);
3935
}
4036
}
4137
}

0 commit comments

Comments
 (0)