Skip to content

Commit 083b88d

Browse files
rxturrxtur
committed
Fixed issue with DB provider when uninstall package
1 parent 13b3e80 commit 083b88d

6 files changed

Lines changed: 42 additions & 39 deletions

File tree

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.4.8")]
22+
[assembly: AssemblyVersion("3.1.4.9")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2742,15 +2742,18 @@ public override List<PackageFile> FillPackageFiles(string packageId)
27422742
{
27432743
while (rdr.Read())
27442744
{
2745-
var f = new PackageFile()
2745+
if(packageId == rdr.GetString(0))
27462746
{
2747-
PackageId = rdr.GetString(0),
2748-
FileOrder = rdr.GetInt32(1),
2749-
FilePath = rdr.GetString(2),
2750-
IsDirectory = rdr.GetBoolean(3)
2751-
};
2747+
var f = new PackageFile()
2748+
{
2749+
PackageId = rdr.GetString(0),
2750+
FileOrder = rdr.GetInt32(1),
2751+
FilePath = rdr.GetString(2),
2752+
IsDirectory = rdr.GetBoolean(3)
2753+
};
27522754

2753-
files.Add(f);
2755+
files.Add(f);
2756+
}
27542757
}
27552758
}
27562759
}

‎BlogEngine/BlogEngine.Core/Services/Packaging/Installer.cs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
using System;
2-
using System.Linq;
32
using System.Web;
4-
using System.Collections.Generic;
53
using BlogEngine.Core.Providers;
64
using NuGet;
7-
using BlogEngine.Core.Data.Models;
85
using BlogEngine.Core.Data.Services;
96

107
namespace BlogEngine.Core.Packaging
@@ -30,12 +27,16 @@ public static bool InstallPackage(string pkgId)
3027
{
3128
try
3229
{
33-
if(BlogService.InstalledFromGalleryPackages() != null &&
34-
BlogService.InstalledFromGalleryPackages().Find(p => p.PackageId == pkgId) != null)
35-
UninstallPackage(pkgId);
36-
37-
var packageManager = new PackageManager(
38-
_repository,
30+
// if package already installed - uninstall it
31+
if (BlogService.InstalledFromGalleryPackages() != null)
32+
{
33+
if(BlogService.InstalledFromGalleryPackages().Find(p => p.PackageId == pkgId) != null)
34+
{
35+
UninstallPackage(pkgId);
36+
}
37+
}
38+
39+
var packageManager = new PackageManager( _repository,
3940
new DefaultPackagePathResolver(BlogConfig.GalleryFeedUrl),
4041
new PhysicalFileSystem(HttpContext.Current.Server.MapPath(Utils.ApplicationRelativeWebRoot + "App_Data/packages"))
4142
);
@@ -77,14 +78,14 @@ public static bool UninstallPackage(string pkgId)
7778
try
7879
{
7980
FileSystem.UninstallPackage(pkgId);
80-
Utils.Log(string.Format("Uninstalled package {0}: installed package files removed. ", pkgId));
81+
// Utils.Log(string.Format("Uninstalled package {0}: installed package files removed. ", pkgId));
8182

8283
// remove packagefiles.xml and packages.xml (or DB records)
8384
BlogService.DeletePackage(pkgId);
84-
Utils.Log(string.Format("Uninstalled package {0}: package records removed. ", pkgId));
85+
// Utils.Log(string.Format("Uninstalled package {0}: package records removed. ", pkgId));
8586

8687
UninstallGalleryPackage(pkgId);
87-
Utils.Log(string.Format("Uninstalled package {0}: NuGet file removed. ", pkgId));
88+
// Utils.Log(string.Format("Uninstalled package {0}: NuGet file removed. ", pkgId));
8889

8990
// reset cache
9091
Blog.CurrentInstance.Cache.Remove(Constants.CacheKey);

‎BlogEngine/BlogEngine.NET/Web.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<appSettings>
2222
<!-- Override default application settings here -->
2323
<!-- blog usage scenario: singleblog, multiusers or multiblogs -->
24-
<add key="BlogEngine.UsageScenario" value="multiusers" />
24+
<add key="BlogEngine.UsageScenario" value="singleblog" />
2525
</appSettings>
2626
<system.serviceModel>
2727
<services>

‎BlogEngine/BlogEngine.NET/setup/SQLServer/DbWeb.Config‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,17 @@
1616
<blogFileSystemProvider defaultProvider="XmlBlogProvider">
1717
<providers>
1818
<add description="Xml Blog Provider" name="XmlBlogProvider" type="BlogEngine.Core.Providers.XmlFileSystemProvider, BlogEngine.Core" />
19-
<add storageVariable="BlogEngine" description="Sql Database Provider" name="DbBlogProvider" type="BlogEngine.Core.Providers.DbFileSystemProvider, BlogEngine.Core" />
20-
<!--<add storageVariable="\\UNCPath\BlogFiles" description="UNC Path Provider" name="UNCBlogProvider" type="BlogEngine.Core.Providers.UNCFileSystemProvider, BlogEngine.Core"/>-->
2119
</providers>
2220
</blogFileSystemProvider>
2321
</BlogEngine>
2422
<connectionStrings>
2523
<clear />
2624
<add name="BlogEngine" connectionString="Server=.\SQLEXPRESS;Database=BlogEngine;Trusted_Connection=True;" providerName="System.Data.SqlClient" />
27-
<!--<add name="BlogEngine" connectionString="Data Source=localhost;User ID=usernmae;Password=password;persist security info=False;initial catalog=BlogEngineFileStore;" providerName="System.Data.SqlClient"/>-->
2825
</connectionStrings>
2926
<appSettings>
3027
<!-- Override default application settings here -->
28+
<!-- blog usage scenario: singleblog, multiusers or multiblogs -->
29+
<add key="BlogEngine.UsageScenario" value="singleblog" />
3130
</appSettings>
3231
<system.serviceModel>
3332
<services>
@@ -114,15 +113,13 @@
114113
<providers>
115114
<clear />
116115
<add name="XmlMembershipProvider" type="BlogEngine.Core.Providers.XmlMembershipProvider, BlogEngine.Core" description="XML membership provider" passwordFormat="Hashed" />
117-
<add name="SqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="BlogEngine" applicationName="BlogEngine" />
118116
<add name="DbMembershipProvider" type="BlogEngine.Core.Providers.DbMembershipProvider, BlogEngine.Core" passwordFormat="Hashed" connectionStringName="BlogEngine" />
119117
</providers>
120118
</membership>
121119
<roleManager defaultProvider="DbRoleProvider" enabled="true" cacheRolesInCookie="false">
122120
<providers>
123121
<clear />
124122
<add name="XmlRoleProvider" type="BlogEngine.Core.Providers.XmlRoleProvider, BlogEngine.Core" description="XML role provider" />
125-
<add name="SqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="BlogEngine" applicationName="BlogEngine" />
126123
<add name="DbRoleProvider" type="BlogEngine.Core.Providers.DbRoleProvider, BlogEngine.Core" connectionStringName="BlogEngine" />
127124
</providers>
128125
</roleManager>
@@ -153,15 +150,14 @@
153150
<add verb="*" path="pingback.axd" type="BlogEngine.Core.Web.HttpHandlers.PingbackHandler, BlogEngine.Core" validate="false" />
154151
<add verb="*" path="opensearch.axd" type="BlogEngine.Core.Web.HttpHandlers.OpenSearchHandler, BlogEngine.Core" validate="false" />
155152
<add verb="*" path="metaweblog.axd" type="BlogEngine.Core.API.MetaWeblog.MetaWeblogHandler, BlogEngine.Core" validate="false" />
156-
<add verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" validate="false" />
157-
<!--<add verb="*" path="css.axd" type="BlogEngine.Core.Web.HttpHandlers.CssHandler, BlogEngine.Core" validate="false"/>-->
158153
<add verb="*" path="*.js.axd" type="BlogEngine.Core.Web.HttpHandlers.JavaScriptHandler, BlogEngine.Core" validate="false" />
159154
<add verb="*" path="*.res.axd" type="BlogEngine.Core.Web.HttpHandlers.ResourceHandler, BlogEngine.Core" validate="false" />
160155
<add verb="*" path="rating.axd" type="BlogEngine.Core.Web.HttpHandlers.RatingHandler, BlogEngine.Core" validate="false" />
161-
<add verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" validate="false" />
162156
<add verb="*" path="blogml.axd" type="BlogEngine.Core.Web.HttpHandlers.BlogMLExportHandler, BlogEngine.Core" validate="false" />
163-
<add verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" validate="false" />
157+
<add verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" validate="false" />
164158
<add verb="*" path="apml.axd" type="BlogEngine.Core.Web.HttpHandlers.Apml, BlogEngine.Core" validate="false" />
159+
<add verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" validate="false" />
160+
<add verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" validate="false" />
165161
<add verb="*" path="foaf*.axd" type="BlogEngine.Core.Web.HttpHandlers.Foaf, BlogEngine.Core" validate="false" />
166162
<add verb="*" path="*.htm" type="System.Web.StaticFileHandler" />
167163
</httpHandlers>
@@ -194,25 +190,28 @@
194190
<add name="Pingback" verb="*" path="pingback.axd" type="BlogEngine.Core.Web.HttpHandlers.PingbackHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
195191
<add name="OpenSearch" verb="*" path="opensearch.axd" type="BlogEngine.Core.Web.HttpHandlers.OpenSearchHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
196192
<add name="MetaWeblog" verb="*" path="metaweblog.axd" type="BlogEngine.Core.API.MetaWeblog.MetaWeblogHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
197-
<add name="RSD" verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
198-
<!--<add name="CssHandler" verb="*" path="css.axd" type="BlogEngine.Core.Web.HttpHandlers.CssHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode"/>-->
199193
<add name="WebResource" path="*.js.axd" verb="*" type="BlogEngine.Core.Web.HttpHandlers.JavaScriptHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
200194
<add name="Resource" verb="*" path="*.res.axd" type="BlogEngine.Core.Web.HttpHandlers.ResourceHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
201195
<add name="Rating" verb="*" path="rating.axd" type="BlogEngine.Core.Web.HttpHandlers.RatingHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
202-
<add name="Opml" verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
203196
<add name="BlogML" verb="*" path="blogml.axd" type="BlogEngine.Core.Web.HttpHandlers.BlogMLExportHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
204-
<add name="SIOC" verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
197+
<add name="Opml" verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
205198
<add name="Apml" verb="*" path="apml.axd" type="BlogEngine.Core.Web.HttpHandlers.Apml, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
199+
<add name="RSD" verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
200+
<add name="SIOC" verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
206201
<add name="Foaf" verb="*" path="foaf*.axd" type="BlogEngine.Core.Web.HttpHandlers.Foaf, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
207202
<add name="Html" path="*.htm" verb="*" type="System.Web.StaticFileHandler" resourceType="Unspecified" preCondition="integratedMode" />
208203
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
209204
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
210205

211-
212-
213-
214-
215-
<remove name="ExtensionlessUrlHandler-Integrated-4.0" /><remove name="OPTIONSVerbHandler" /><remove name="TRACEVerbHandler" /><add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /></handlers>
206+
207+
208+
209+
210+
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
211+
<remove name="OPTIONSVerbHandler" />
212+
<remove name="TRACEVerbHandler" />
213+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
214+
</handlers>
216215
<!-- Enable the httpProtocol section below to manipulate some HTTP headers.
217216
Some hosting providers does not allow the httpProtocol section to be set. -->
218217
<!--

‎BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql‎

-108 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)