From dbf7a5d8bab4c6c91772043ca0bc3216c9b50660 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 18 Apr 2014 11:40:20 +0200 Subject: [PATCH 01/13] #341 Orders are not cancellable --- changelog.md | 1 + .../Administration/Views/Order/Edit.cshtml | 8 +-- .../Order/_ProductAddGiftCardInfo.cshtml | 59 ++++++++++++++++--- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index b9a90c432a..165d9c92fa 100644 --- a/changelog.md +++ b/changelog.md @@ -7,6 +7,7 @@ * #336 Product bundle: Upper add-to-cart button label shows wrong text * #338 Serialization exception thrown when session state mode is _StateServer_ * #340 Admin: Header overlays TinyMCE in fullscreen mode +* #341 Orders are not cancellable ##SmartStore.NET 2.0.1## diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Order/Edit.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Order/Edit.cshtml index bf6672f058..f31d67010e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Order/Edit.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Order/Edit.cshtml @@ -186,7 +186,7 @@   @if (Model.CanCancelOrder) { - } @@ -612,7 +612,7 @@ - @@ -1711,7 +1711,7 @@ } - diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Order/_ProductAddGiftCardInfo.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Order/_ProductAddGiftCardInfo.cshtml index e32718e789..0a5d1e6d40 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Order/_ProductAddGiftCardInfo.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Order/_ProductAddGiftCardInfo.cshtml @@ -2,35 +2,78 @@ @if (Model.IsGiftCard) { //Actually just a copy of \Presentation\SmartStore.Web\Views\Catalog\_GiftCardInfo.cshtml -
-
-
@Html.LabelFor(model => model.RecipientName):
+

 

+
+ +
+ @Html.LabelFor(model => model.RecipientName, new { @class = "control-label required", @for = "RecipientName" }) +
+ @Html.EditorFor(model => model.RecipientName, "BlockInput") +
+
+ + @if (Model.GiftCardType == SmartStore.Core.Domain.Catalog.GiftCardType.Virtual) + { +
+ @Html.LabelFor(model => model.RecipientEmail, new { @class = "control-label required", @for = "RecipientEmail" }) +
+ @Html.EditorFor(model => model.RecipientEmail, "BlockInput") +
+
+ } + +
+ @Html.LabelFor(model => model.SenderName, new { @class = "control-label required", @for = "SenderName" }) +
+ @Html.EditorFor(model => model.SenderName, "BlockInput") +
+
+ + @if (Model.GiftCardType == SmartStore.Core.Domain.Catalog.GiftCardType.Virtual) + { +
+ @Html.LabelFor(model => model.SenderEmail, new { @class = "control-label required", @for = "SenderEmail" }) +
+ @Html.EditorFor(model => model.SenderEmail, "BlockInput") +
+
+ } + +
+ @Html.LabelFor(model => model.Message, new { @class = "control-label", @for = "Message" }) +
+ @Html.TextAreaFor(model => model.Message, new { @class = "message input-block-level" }) +
+
+ + @*
+
@Html.LabelFor(model => model.RecipientName)
@Html.TextBoxFor(model => model.RecipientName)
@if (Model.GiftCardType == SmartStore.Core.Domain.Catalog.GiftCardType.Virtual) { -
@Html.LabelFor(model => model.RecipientEmail):
+
@Html.LabelFor(model => model.RecipientEmail)
@Html.TextBoxFor(model => model.RecipientEmail)
}
- @Html.LabelFor(model => model.SenderName):
+ @Html.LabelFor(model => model.SenderName)
@Html.TextBoxFor(model => model.SenderName)
@if (Model.GiftCardType == SmartStore.Core.Domain.Catalog.GiftCardType.Virtual) { -
@Html.LabelFor(model => model.SenderEmail):
+
@Html.LabelFor(model => model.SenderEmail)
@Html.TextBoxFor(model => model.SenderEmail)
}
- @Html.LabelFor(model => model.Message):
+ @Html.LabelFor(model => model.Message)
@Html.TextAreaFor(model => model.Message, new { style = "Width: 300px; Height: 100px;" })
-
+
*@
} \ No newline at end of file From 081b680714c0ea1424a83b3c06c8aa3369050797 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 18 Apr 2014 11:47:12 +0200 Subject: [PATCH 02/13] #342 Backend: order total is not editable (see previous commit) --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 165d9c92fa..2e19a5ac17 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,7 @@ * #338 Serialization exception thrown when session state mode is _StateServer_ * #340 Admin: Header overlays TinyMCE in fullscreen mode * #341 Orders are not cancellable +* #342 Backend: order total is not editable ##SmartStore.NET 2.0.1## From 3be873cd40d3020bf7e80e6891cdd708e20c3523 Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Fri, 18 Apr 2014 20:09:22 +0200 Subject: [PATCH 03/13] Fixed a small bug in WorkingLanguage and WorkingCurrency that caused an exception in scheduled promotion feed file generation. --- src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs index cdbd876497..9c33604a3d 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs @@ -238,7 +238,7 @@ public Language WorkingLanguage } #region Get language from URL (if possible) - if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext != null) + if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext != null && _httpContext.Request != null) { var helper = new LocalizedUrlHelper(_httpContext.Request, true); string seoCode; @@ -361,7 +361,7 @@ public Currency WorkingCurrency } // find currency by domain ending - if (currency == null) + if (currency == null && _httpContext != null && _httpContext.Request != null && _httpContext.Request.Url != null) { currency = _currencyService .GetAllCurrencies(storeId: _storeContext.CurrentStore.Id) From c9d883a59e53a291d0643a10c4914412017fdbfb Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Sat, 19 Apr 2014 10:50:08 +0200 Subject: [PATCH 04/13] Minor changes --- .../Controllers/StoreClosedAttribute.cs | 2 +- .../SmartStore.Web/App_Data/Localization/App/de/all.smres.xml | 2 +- .../SmartStore.Web/App_Data/Localization/App/en/all.smres.xml | 2 +- src/Tests/SmartStore.Web.MVC.Tests/Admin/Readme.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/StoreClosedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/StoreClosedAttribute.cs index e8a1aeb250..5862f17732 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/StoreClosedAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/StoreClosedAttribute.cs @@ -46,7 +46,7 @@ public override void OnActionExecuting(ActionExecutingContext filterContext) //ensure it's not the store closed page !(controllerName.Equals("SmartStore.Web.Controllers.CommonController", StringComparison.InvariantCultureIgnoreCase) && actionName.Equals("StoreClosed", StringComparison.InvariantCultureIgnoreCase)) && //ensure it's not the change language page (request) - !(controllerName.Equals("Nop.Web.Controllers.CommonController", StringComparison.InvariantCultureIgnoreCase) && actionName.Equals("SetLanguage", StringComparison.InvariantCultureIgnoreCase))) + !(controllerName.Equals("SmartStore.Web.Controllers.CommonController", StringComparison.InvariantCultureIgnoreCase) && actionName.Equals("SetLanguage", StringComparison.InvariantCultureIgnoreCase))) { if (storeInformationSettings.StoreClosedAllowForAdmins && EngineContext.Current.Resolve().CurrentCustomer.IsAdmin()) { diff --git a/src/Presentation/SmartStore.Web/App_Data/Localization/App/de/all.smres.xml b/src/Presentation/SmartStore.Web/App_Data/Localization/App/de/all.smres.xml index e8cd3b9bcb..541db16f8a 100644 --- a/src/Presentation/SmartStore.Web/App_Data/Localization/App/de/all.smres.xml +++ b/src/Presentation/SmartStore.Web/App_Data/Localization/App/de/all.smres.xml @@ -11041,7 +11041,7 @@ Nutzungsvereinbarung - + Datum: älteste zuerst diff --git a/src/Presentation/SmartStore.Web/App_Data/Localization/App/en/all.smres.xml b/src/Presentation/SmartStore.Web/App_Data/Localization/App/en/all.smres.xml index 0747fd8109..600e2ff5fd 100644 --- a/src/Presentation/SmartStore.Web/App_Data/Localization/App/en/all.smres.xml +++ b/src/Presentation/SmartStore.Web/App_Data/Localization/App/en/all.smres.xml @@ -11429,7 +11429,7 @@ User agreement - + Date: Oldest first diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Admin/Readme.txt b/src/Tests/SmartStore.Web.MVC.Tests/Admin/Readme.txt index 2efb122ee7..ec2bb9d84a 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Admin/Readme.txt +++ b/src/Tests/SmartStore.Web.MVC.Tests/Admin/Readme.txt @@ -1 +1 @@ -This folder contains tests for Nop.Admin project (admin area) \ No newline at end of file +This folder contains tests for SmartStore.Admin project (admin area) \ No newline at end of file From 1a9893c459f6177e85fa6ebaaec360475060698e Mon Sep 17 00:00:00 2001 From: Marcus Gesing Date: Sat, 19 Apr 2014 17:59:05 +0200 Subject: [PATCH 05/13] Default value for plugin description not loaded into edit popup window --- changelog.md | 1 + .../Administration/Controllers/PluginController.cs | 8 ++++++-- .../SmartStore.Web/Themes/Alpha/Content/site.less | 1 + .../Views/Checkout/OpcPaymentMethods.cshtml | 2 +- .../SmartStore.Web/Views/Checkout/PaymentMethod.cshtml | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 2e19a5ac17..72a575a605 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,7 @@ * #340 Admin: Header overlays TinyMCE in fullscreen mode * #341 Orders are not cancellable * #342 Backend: order total is not editable +* Default value for plugin description not loaded into edit popup window ##SmartStore.NET 2.0.1## diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs index 987081a2fa..b957bed861 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs @@ -85,8 +85,12 @@ protected PluginModel PreparePluginModel(PluginDescriptor pluginDescriptor, bool var pluginModel = pluginDescriptor.ToModel(); pluginModel.Group = _localizationService.GetResource("Plugins.KnownGroup." + pluginDescriptor.Group); - pluginModel.FriendlyName = pluginDescriptor.GetLocalizedValue(_localizationService, "FriendlyName", 0, forList); - pluginModel.Description = pluginDescriptor.GetLocalizedValue(_localizationService, "Description", 0, forList); + + if (forList) + { + pluginModel.FriendlyName = pluginDescriptor.GetLocalizedValue(_localizationService, "FriendlyName"); + pluginModel.Description = pluginDescriptor.GetLocalizedValue(_localizationService, "Description"); + } //locales AddLocales(_languageService, pluginModel.Locales, (locale, languageId) => diff --git a/src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less b/src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less index 155151f2dd..5140b1c8ad 100644 --- a/src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less +++ b/src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less @@ -1093,6 +1093,7 @@ table.cart .cart-item-row .qty-input { .payment-method-desc { display: inline-block; + clear: left; } } .shipping-option-item.odd, diff --git a/src/Presentation/SmartStore.Web/Views/Checkout/OpcPaymentMethods.cshtml b/src/Presentation/SmartStore.Web/Views/Checkout/OpcPaymentMethods.cshtml index 1e1af76faa..c720c4b2fb 100644 --- a/src/Presentation/SmartStore.Web/Views/Checkout/OpcPaymentMethods.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Checkout/OpcPaymentMethods.cshtml @@ -66,7 +66,7 @@ }
-
-
- @if (Model.HideNewsletterBlock) + @if (!Model.HideNewsletterBlock) {

@T("Newsletter.Title")

From bb6de5a860ce598ec64c90544ab2db33c19fa527 Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Wed, 23 Apr 2014 20:07:51 +0200 Subject: [PATCH 07/13] Newsletter subscription and legal info weren't displayed according to their settings Zendesk ticket 892 & 888 --- src/Presentation/SmartStore.Web/Views/Common/Footer.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Presentation/SmartStore.Web/Views/Common/Footer.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Footer.cshtml index a7b9e25e7e..5907ef80a9 100644 --- a/src/Presentation/SmartStore.Web/Views/Common/Footer.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Common/Footer.cshtml @@ -128,7 +128,7 @@
- @if (!Model.ShowLegalInfo) + @if (Model.ShowLegalInfo) {
@Html.Raw(Model.LegalInfo) From 881dbaedb839759292eb582d1e3cd827ca11307b Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Fri, 25 Apr 2014 16:38:56 +0200 Subject: [PATCH 08/13] #355 solves SSL problem in mobile theme --- .../SmartStore.Web/Views/Shared/_Root.Head.Mobile.cshtml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Views/Shared/_Root.Head.Mobile.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/_Root.Head.Mobile.cshtml index 3c4b627f5a..0bbdaaf8c4 100644 --- a/src/Presentation/SmartStore.Web/Views/Shared/_Root.Head.Mobile.cshtml +++ b/src/Presentation/SmartStore.Web/Views/Shared/_Root.Head.Mobile.cshtml @@ -7,8 +7,7 @@ Html.AppendScriptParts(ResourceLocation.Head, "~/Scripts/jquery-{version}.js", "~/Scripts/jquery.validate.js", - "~/Scripts/jquery.validate.unobtrusive.js", - "~/Scripts/jquery.mobile-{version}.js"); + "~/Scripts/jquery.validate.unobtrusive.js"); } @@ -31,9 +30,11 @@ + + + @RenderBody() From 173db9a3c7797d97882f0be84ea840706ae160d6 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 26 Apr 2014 00:35:03 +0200 Subject: [PATCH 09/13] AutoUpdater: initial commit --- .../SmartStore.Core/Logging/TraceLogger.cs | 128 +++++++++++++++ .../Packaging/NuGet/NugetLogger.cs | 6 +- .../Packaging/PackageInstaller.cs | 9 +- .../Packaging/Updater/ApplicationUpdater.cs | 151 ++++++++++++++++++ .../SmartStore.Core/Plugins/PluginManager.cs | 9 +- .../SmartStore.Core/SmartStore.Core.csproj | 2 + .../SmartStore.Core/Utilities/CommonHelper.cs | 47 ++++-- src/Presentation/SmartStore.Web/Web.config | 3 + 8 files changed, 343 insertions(+), 12 deletions(-) create mode 100644 src/Libraries/SmartStore.Core/Logging/TraceLogger.cs create mode 100644 src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs diff --git a/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs b/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs new file mode 100644 index 0000000000..296ee8e931 --- /dev/null +++ b/src/Libraries/SmartStore.Core/Logging/TraceLogger.cs @@ -0,0 +1,128 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using SmartStore.Core.Domain.Logging; +using SmartStore.Core.Domain.Customers; +using System.Diagnostics; + +namespace SmartStore.Core.Logging +{ + public class TraceLogger : DisposableObject, ILogger + { + private readonly TraceSource _traceSource; + + public TraceLogger() : this("SmartStore.log") + { + } + + public TraceLogger(string fileName) + { + Guard.ArgumentNotEmpty(() => fileName); + + _traceSource = new TraceSource("SmartStore"); + _traceSource.Switch = new SourceSwitch("LogSwitch", "Error"); + _traceSource.Listeners.Remove("Default"); + + var console = new ConsoleTraceListener(false); + console.Filter = new EventTypeFilter(SourceLevels.All); + console.Name = "console"; + + var textListener = new TextWriterTraceListener(fileName); + textListener.Filter = new EventTypeFilter(SourceLevels.All); + textListener.TraceOutputOptions = TraceOptions.DateTime; + + _traceSource.Listeners.Add(console); + _traceSource.Listeners.Add(textListener); + + // Allow the trace source to send messages to + // listeners for all event types. Currently only + // error messages or higher go to the listeners. + // Messages must get past the source switch to + // get to the listeners, regardless of the settings + // for the listeners. + _traceSource.Switch.Level = SourceLevels.All; + } + + public bool IsEnabled(LogLevel level) + { + return true; + } + + public void DeleteLog(Log log) + { + // not supported + } + + public void ClearLog() + { + // not supported + } + + public void ClearLog(DateTime toUtc, LogLevel logLevel) + { + // not supported + } + + public IPagedList GetAllLogs(DateTime? fromUtc, DateTime? toUtc, string message, LogLevel? logLevel, int pageIndex, int pageSize, int minFrequency) + { + // not supported + return null; + } + + public Log GetLogById(int logId) + { + // not supported + return null; + } + + public IList GetLogByIds(int[] logIds) + { + // not supported + return null; + } + + public Log InsertLog(LogContext context) + { + var type = LogLevelToEventType(context.LogLevel); + _traceSource.TraceEvent(type, (int)type, "{0}: {1}".FormatCurrent(type.ToString().ToUpper(), context.ShortMessage)); + return null; + } + + public Log InsertLog(LogLevel logLevel, string shortMessage, string fullMessage = "", Customer customer = null) + { + var context = new LogContext() + { + LogLevel = logLevel, + ShortMessage = shortMessage, + FullMessage = fullMessage, + Customer = customer + }; + + return InsertLog(context); + } + + private TraceEventType LogLevelToEventType(LogLevel level) + { + switch (level) + { + case LogLevel.Debug: + return TraceEventType.Verbose; + case LogLevel.Error: + return TraceEventType.Error; + case LogLevel.Fatal: + return TraceEventType.Critical; + case LogLevel.Warning: + return TraceEventType.Warning; + default: + return TraceEventType.Information; + } + } + + protected override void OnDispose(bool disposing) + { + _traceSource.Flush(); + _traceSource.Close(); + } + } +} diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs index 4936076516..52ed0bddb7 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs @@ -19,6 +19,10 @@ public void Log(MessageLevel level, string message, params object[] args) switch (level) { case MessageLevel.Debug: + //_logger.Debug(String.Format(message, args)); + //break; + case MessageLevel.Error: + _logger.Error(String.Format(message, args)); break; case MessageLevel.Info: _logger.Information(String.Format(message, args)); @@ -31,7 +35,7 @@ public void Log(MessageLevel level, string message, params object[] args) public FileConflictResolution ResolveFileConflict(string message) { - return FileConflictResolution.Ignore; + return FileConflictResolution.OverwriteAll; } } } diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs b/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs index 0d76c7c43b..b97e4e1423 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs @@ -78,6 +78,14 @@ public PackageInfo Install(Stream packageStream, string location, string applica return InstallPackage(package, packageRepository, location, applicationPath); } + /// + /// Tries to install the package + /// + /// The package to install + /// The repository + /// The virtual location of the package file, usually ~/App_Data + /// The virtual app root path, usually ~/ + /// An instance of type protected PackageInfo InstallPackage(IPackage package, IPackageRepository packageRepository, string location, string applicationPath) { @@ -145,7 +153,6 @@ protected PackageInfo InstallPackage(IPackage package, IPackageRepository packag /// The package information. protected PackageInfo ExecuteInstall(IPackage package, IPackageRepository packageRepository, string sourceLocation, string targetPath) { - // this logger is used to render NuGet's log on the notifier var logger = new NugetLogger(_logger); var project = new FileBasedProjectSystem(targetPath) { Logger = logger }; diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs new file mode 100644 index 0000000000..2a159cc207 --- /dev/null +++ b/src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs @@ -0,0 +1,151 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.IO; +using SmartStore.Utilities; +using SmartStore.Utilities.Threading; +using SmartStore.Core.Logging; +using Log = SmartStore.Core.Logging; +using NuGet; +using NuGetPackageManager = NuGet.PackageManager; +using SmartStore.Core.Data; + +namespace SmartStore.Core.Packaging +{ + + internal sealed class ApplicationUpdater : DisposableObject + { + private const string UpdatePackagePath = "~/App_Data/Update"; + + private static readonly ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); + private TraceLogger _logger; + + public bool TryUpdate() + { + //if (!DataSettings.DatabaseIsInstalled()) + // return false; + + // NEVER EVER (!!!) make an attempt to auto-update in a dev environment!!!!!!! + if (CommonHelper.IsDevEnvironment) + return false; + + using (_rwLock.GetUpgradeableReadLock()) + { + var package = FindPackage(); + + if (package == null) + return false; + + if (!ValidatePackage(package)) + return false; + + if (!CheckEnvironment()) + return false; + + using (_rwLock.GetWriteLock()) + { + var info = ExecuteUpdate(package); + + FinalizeUpdate(); + + return true; + } + } + } + + private TraceLogger CreateLogger(IPackage package) + { + var logFile = Path.Combine(CommonHelper.MapPath(UpdatePackagePath, false), "Updater.{0}.log".FormatInvariant(package.Version.ToString())); + return new TraceLogger(logFile); + } + + private IPackage FindPackage() + { + var dir = CommonHelper.MapPath(UpdatePackagePath, false); + var files = Directory.GetFiles(dir, "SmartStore.*.nupkg", SearchOption.TopDirectoryOnly); + + // TODO: allow more than one package in folder and return newest + if (files == null || files.Length == 0 || files.Length > 1) + return null; + + IPackage package = null; + + try + { + package = new ZipPackage(files[0]); + _logger = CreateLogger(package); + _logger.Information("Found update package '{0}'".FormatInvariant(package.GetFullName())); + return package; + } + catch { } + + return null; + } + + private bool ValidatePackage(IPackage package) + { + if (package.Id != "SmartStore") + return false; + + var currentVersion = new SemanticVersion(SmartStoreVersion.FullVersion); + return package.Version > currentVersion; + } + + private bool CheckEnvironment() + { + return true; + } + + private PackageInfo ExecuteUpdate(IPackage package) + { + var appPath = CommonHelper.MapPath("~/"); + //var appPath = "D:\\_temp\\AppUpdater"; + + var logger = new NugetLogger(_logger); + + var project = new FileBasedProjectSystem(appPath) { Logger = logger }; + + var nullRepository = new NullSourceRepository(); + + var projectManager = new ProjectManager( + nullRepository, + new DefaultPackagePathResolver(appPath), + project, + nullRepository + ) { Logger = logger }; + + // Perform the update + projectManager.AddPackageReference(package, true, false); + + return new PackageInfo + { + Id = package.Id, + Name = package.Title ?? package.Id, + Version = package.Version.ToString(), + Type = "App", + Path = appPath + }; + } + + private void FinalizeUpdate() + { + } + + + protected override void OnDispose(bool disposing) + { + if (disposing) + { + if (_logger != null) + { + _logger.Dispose(); + _logger = null; + } + } + } + } + +} diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs index e31e9aa5ba..142cf090bc 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -16,6 +16,7 @@ using SmartStore.Core.ComponentModel; using SmartStore.Core.Infrastructure.DependencyManagement; using SmartStore.Core.Plugins; +using SmartStore.Core.Packaging; using SmartStore.Utilities; using SmartStore.Utilities.Threading; @@ -84,6 +85,13 @@ public static IEnumerable IncompatiblePlugins /// public static void Initialize() { + var updater = new ApplicationUpdater(); + if (updater.TryUpdate()) + { + // [...] + } + updater.Dispose(); + // adding a process-specific environment path (either bin/x86 or bin/amd64) // ensures that unmanaged native dependencies can be resolved successfully. SetPrivateEnvPath(); @@ -97,7 +105,6 @@ public static void Initialize() var pluginFolderPath = CommonHelper.MapPath(_pluginsPath); _shadowCopyFolder = new DirectoryInfo(CommonHelper.MapPath(_shadowCopyPath)); - //var referencedPlugins = new List(); var incompatiblePlugins = new List(); _clearShadowDirectoryOnStartup = !String.IsNullOrEmpty(ConfigurationManager.AppSettings["ClearPluginsShadowDirectoryOnStartup"]) && diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 9824345db5..796bf3301f 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -240,6 +240,7 @@ + @@ -551,6 +552,7 @@ + diff --git a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs index 96756bdf2c..a41650e535 100644 --- a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs +++ b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs @@ -66,21 +66,14 @@ public static string MapPath(string path, bool findAppRoot = true) // not hosted. For example, running in unit tests or EF tooling string baseDirectory = AppDomain.CurrentDomain.BaseDirectory; path = path.Replace("~/", "").TrimStart('/').Replace('/', '\\'); - + var testPath = Path.Combine(baseDirectory, path); if (findAppRoot /* && !Directory.Exists(testPath)*/) { // most likely we're in unit tests or design-mode (EF migration scaffolding)... // find solution root directory first - var dir = Directory.GetParent(baseDirectory); - while (true) - { - if (dir == null || IsSolutionRoot(dir)) - break; - - dir = dir.Parent; - } + var dir = FindSolutionRoot(baseDirectory); // concat the web root if (dir != null) @@ -94,6 +87,42 @@ public static string MapPath(string path, bool findAppRoot = true) } } + public static bool IsDevEnvironment + { + get + { + if (!HostingEnvironment.IsHosted) + return true; + + if (HostingEnvironment.IsDevelopmentEnvironment) + return true; + + if (System.Diagnostics.Debugger.IsAttached) + return true; + + // if there's a 'SmartStore.NET.sln' in one of the parent folders, + // then we're likely in a dev environment + if (FindSolutionRoot(HostingEnvironment.MapPath("~/")) != null) + return true; + + return false; + } + } + + private static DirectoryInfo FindSolutionRoot(string currentDir) + { + var dir = Directory.GetParent(currentDir); + while (true) + { + if (dir == null || IsSolutionRoot(dir)) + break; + + dir = dir.Parent; + } + + return dir; + } + private static bool IsSolutionRoot(DirectoryInfo dir) { return File.Exists(Path.Combine(dir.FullName, "SmartStoreNET.sln")); diff --git a/src/Presentation/SmartStore.Web/Web.config b/src/Presentation/SmartStore.Web/Web.config index 4ede09be18..47c2725f4d 100644 --- a/src/Presentation/SmartStore.Web/Web.config +++ b/src/Presentation/SmartStore.Web/Web.config @@ -167,6 +167,9 @@ + + + From cbbefc7d2503c99eb3d4f6cbede1c600bbb19b92 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Fri, 2 May 2014 16:37:20 +0200 Subject: [PATCH 10/13] Renamed AppUpdater --- .../Packaging/Updater/{ApplicationUpdater.cs => AppUpdater.cs} | 2 +- src/Libraries/SmartStore.Core/Plugins/PluginManager.cs | 2 +- src/Libraries/SmartStore.Core/SmartStore.Core.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/Libraries/SmartStore.Core/Packaging/Updater/{ApplicationUpdater.cs => AppUpdater.cs} (98%) diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs similarity index 98% rename from src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs rename to src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs index 2a159cc207..b3c34a06ca 100644 --- a/src/Libraries/SmartStore.Core/Packaging/Updater/ApplicationUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs @@ -16,7 +16,7 @@ namespace SmartStore.Core.Packaging { - internal sealed class ApplicationUpdater : DisposableObject + internal sealed class AppUpdater : DisposableObject { private const string UpdatePackagePath = "~/App_Data/Update"; diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs index 142cf090bc..2536a4a931 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -85,7 +85,7 @@ public static IEnumerable IncompatiblePlugins /// public static void Initialize() { - var updater = new ApplicationUpdater(); + var updater = new AppUpdater(); if (updater.TryUpdate()) { // [...] diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index 796bf3301f..8d4f3589ee 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -552,7 +552,7 @@ - + From 049e0545b7fdd2739f5ecb5ba198fe3c94989059 Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Sat, 3 May 2014 00:32:53 +0200 Subject: [PATCH 11/13] Added Backup to AppUpdater --- .../Packaging/FolderUpdater.cs | 28 +++++++++----- .../Packaging/Updater/AppUpdater.cs | 37 ++++++++++++++++--- 2 files changed, 51 insertions(+), 14 deletions(-) diff --git a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs index f37d06f7e6..314eb5d61c 100644 --- a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs @@ -3,13 +3,14 @@ using System.Linq; using System.IO; using SmartStore.Core.Logging; +using SmartStore.Utilities; namespace SmartStore.Core.Packaging { public interface IFolderUpdater { - void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder); + void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder, params string[] ignorePatterns); void Restore(DirectoryInfo backupfolder, DirectoryInfo existingFolder); } @@ -28,14 +29,15 @@ public FolderUpdater(ILogger logger) _logger = logger; } - public void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder) + public void Backup(DirectoryInfo existingFolder, DirectoryInfo backupfolder, params string[] ignorePatterns) { - CopyFolder(GetFolderContent(existingFolder), backupfolder); + var ignores = ignorePatterns.Select(x => new Wildcard(x)); + CopyFolder(GetFolderContent(existingFolder, ignores), backupfolder); } public void Restore(DirectoryInfo backupfolder, DirectoryInfo existingFolder) { - CopyFolder(GetFolderContent(backupfolder), existingFolder); + CopyFolder(GetFolderContent(backupfolder, Enumerable.Empty()), existingFolder); } private void CopyFolder(FolderContent source, DirectoryInfo dest) @@ -74,26 +76,34 @@ private void CopyFile(DirectoryInfo sourceFolder, string fileName, DirectoryInfo File.Copy(sourceFile.FullName, destFile.FullName, true); } - private FolderContent GetFolderContent(DirectoryInfo folder) + private FolderContent GetFolderContent(DirectoryInfo folder, IEnumerable ignores) { var files = new List(); - GetFolderContent(folder, "", files); + GetFolderContent(folder, "", files, ignores); return new FolderContent { Folder = folder, Files = files }; } - private void GetFolderContent(DirectoryInfo folder, string prefix, List files) + private void GetFolderContent(DirectoryInfo folder, string prefix, List files, IEnumerable ignores) { if (!folder.Exists) return; + if (ignores.Any(w => w.IsMatch(prefix))) + return; + foreach (var file in folder.GetFiles()) { - files.Add(Path.Combine(prefix, file.Name)); + var path = Path.Combine(prefix, file.Name); + var ignore = ignores.Any(w => w.IsMatch(path)); + if (!ignore) + { + files.Add(path); + } } foreach (var child in folder.GetDirectories()) { - GetFolderContent(child, Path.Combine(prefix, child.Name), files); + GetFolderContent(child, Path.Combine(prefix, child.Name), files, ignores); } } diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs index b3c34a06ca..0eea83e8b6 100644 --- a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs @@ -25,9 +25,6 @@ internal sealed class AppUpdater : DisposableObject public bool TryUpdate() { - //if (!DataSettings.DatabaseIsInstalled()) - // return false; - // NEVER EVER (!!!) make an attempt to auto-update in a dev environment!!!!!!! if (CommonHelper.IsDevEnvironment) return false; @@ -96,13 +93,43 @@ private bool ValidatePackage(IPackage package) private bool CheckEnvironment() { + // TODO: Check it :-) return true; } + private void Backup() + { + var source = new DirectoryInfo(CommonHelper.MapPath("~/")); + + var tempPath = "~/App_Data/_Backup/App/SmartStore"; + string localTempPath = null; + for (int i = 0; i < 50; i++) + { + localTempPath = CommonHelper.MapPath(tempPath) + (i == 0 ? "" : "." + i.ToString()); + if (!Directory.Exists(localTempPath)) + { + Directory.CreateDirectory(localTempPath); + break; + } + localTempPath = null; + } + + if (localTempPath == null) + { + var exception = new SmartException("Too many backups in '{0}'.".FormatInvariant(tempPath)); + _logger.Error(exception.Message, exception); + throw exception; + } + + var backupFolder = new DirectoryInfo(localTempPath); + var folderUpdater = new FolderUpdater(_logger); + folderUpdater.Backup(source, backupFolder, "App_Data", "Media"); + } + private PackageInfo ExecuteUpdate(IPackage package) { - var appPath = CommonHelper.MapPath("~/"); - //var appPath = "D:\\_temp\\AppUpdater"; + //var appPath = CommonHelper.MapPath("~/"); + var appPath = "D:\\_temp\\AppUpdater\\Restore"; var logger = new NugetLogger(_logger); From 90bc3b6d60095e86bb65dbe92936e1d8546563ef Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 5 May 2014 19:28:36 +0200 Subject: [PATCH 12/13] Admin: added area 'Admin' to NavBar route values --- .../Administration/Views/Shared/Navbar.cshtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Shared/Navbar.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Shared/Navbar.cshtml index fbe9453c79..30169a1173 100644 --- a/src/Presentation/SmartStore.Web/Administration/Views/Shared/Navbar.cshtml +++ b/src/Presentation/SmartStore.Web/Administration/Views/Shared/Navbar.cshtml @@ -32,7 +32,7 @@ {
- + @userName @@ -41,7 +41,7 @@
  • - + Account @@ -77,14 +77,14 @@
  • }
  • - - + + @T("Admin.Header.ClearCache")
  • - - + + @T("Admin.Header.RestartApplication")
    • From bbbe5e44d7d6926dd0fb0cc8a7b68a82e79214dd Mon Sep 17 00:00:00 2001 From: Murat Cakir Date: Mon, 5 May 2014 23:02:01 +0200 Subject: [PATCH 13/13] Finalized AppUpdater --- SmartStoreNET.Tasks.Targets | 4 +- .../Packaging/NuGet/NugetLogger.cs | 2 +- .../Packaging/Updater/AppUpdater.cs | 80 ++++++++++++------- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/SmartStoreNET.Tasks.Targets b/SmartStoreNET.Tasks.Targets index c9547c7eca..317cce21ad 100644 --- a/SmartStoreNET.Tasks.Targets +++ b/SmartStoreNET.Tasks.Targets @@ -148,8 +148,8 @@ - - + diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs index 52ed0bddb7..325ad372c6 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs @@ -20,7 +20,7 @@ public void Log(MessageLevel level, string message, params object[] args) { case MessageLevel.Debug: //_logger.Debug(String.Format(message, args)); - //break; + break; case MessageLevel.Error: _logger.Error(String.Format(message, args)); break; diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs index 0eea83e8b6..dc09f0428c 100644 --- a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs @@ -31,24 +31,46 @@ public bool TryUpdate() using (_rwLock.GetUpgradeableReadLock()) { - var package = FindPackage(); - - if (package == null) - return false; - - if (!ValidatePackage(package)) - return false; - - if (!CheckEnvironment()) - return false; - - using (_rwLock.GetWriteLock()) + try { - var info = ExecuteUpdate(package); - - FinalizeUpdate(); - - return true; + string packagePath = null; + var package = FindPackage(out packagePath); + + if (package == null) + return false; + + if (!ValidatePackage(package)) + return false; + + if (!CheckEnvironment()) + return false; + + using (_rwLock.GetWriteLock()) + { + Backup(); + + var info = ExecuteUpdate(package); + + if (info != null) + { + var newPath = packagePath + ".applied"; + if (File.Exists(newPath)) + { + File.Delete(packagePath); + } + else + { + File.Move(packagePath, newPath); + } + } + + return info != null; + } + } + catch (Exception ex) + { + _logger.Error("An error occured while updating the application: {0}".FormatCurrent(ex.Message), ex); + return false; } } } @@ -59,8 +81,9 @@ private TraceLogger CreateLogger(IPackage package) return new TraceLogger(logFile); } - private IPackage FindPackage() + private IPackage FindPackage(out string path) { + path = null; var dir = CommonHelper.MapPath(UpdatePackagePath, false); var files = Directory.GetFiles(dir, "SmartStore.*.nupkg", SearchOption.TopDirectoryOnly); @@ -72,6 +95,7 @@ private IPackage FindPackage() try { + path = files[0]; package = new ZipPackage(files[0]); _logger = CreateLogger(package); _logger.Information("Found update package '{0}'".FormatInvariant(package.GetFullName())); @@ -101,11 +125,11 @@ private void Backup() { var source = new DirectoryInfo(CommonHelper.MapPath("~/")); - var tempPath = "~/App_Data/_Backup/App/SmartStore"; + var tempPath = CommonHelper.MapPath("~/App_Data/_Backup/App/SmartStore"); string localTempPath = null; for (int i = 0; i < 50; i++) { - localTempPath = CommonHelper.MapPath(tempPath) + (i == 0 ? "" : "." + i.ToString()); + localTempPath = tempPath + (i == 0 ? "" : "." + i.ToString()); if (!Directory.Exists(localTempPath)) { Directory.CreateDirectory(localTempPath); @@ -113,7 +137,7 @@ private void Backup() } localTempPath = null; } - + if (localTempPath == null) { var exception = new SmartException("Too many backups in '{0}'.".FormatInvariant(tempPath)); @@ -124,12 +148,13 @@ private void Backup() var backupFolder = new DirectoryInfo(localTempPath); var folderUpdater = new FolderUpdater(_logger); folderUpdater.Backup(source, backupFolder, "App_Data", "Media"); + + _logger.Information("Backup successfully created in folder '{0}'.".FormatInvariant(localTempPath)); } private PackageInfo ExecuteUpdate(IPackage package) { - //var appPath = CommonHelper.MapPath("~/"); - var appPath = "D:\\_temp\\AppUpdater\\Restore"; + var appPath = CommonHelper.MapPath("~/"); var logger = new NugetLogger(_logger); @@ -147,7 +172,7 @@ private PackageInfo ExecuteUpdate(IPackage package) // Perform the update projectManager.AddPackageReference(package, true, false); - return new PackageInfo + var info = new PackageInfo { Id = package.Id, Name = package.Title ?? package.Id, @@ -155,12 +180,11 @@ private PackageInfo ExecuteUpdate(IPackage package) Type = "App", Path = appPath }; - } - private void FinalizeUpdate() - { - } + _logger.Information("Update '{0}' successfully executed.".FormatInvariant(info.Name)); + return info; + } protected override void OnDispose(bool disposing) {