mirrors
/
OpenLiveWriter
mirror of https://github.com/OpenLiveWriter/OpenLiveWriter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssg: WeblogConfigurationWizardPanelStaticSiteConfig: add basic validation

This commit is contained in:
Nick Vella 2019-07-01 20:09:02 +10:00
parent b4b14cac51
commit 7d02022ed1
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/managed/OpenLiveWriter.Localization/MessageId.cs
View File

@ -31,6 +31,7 @@ namespace OpenLiveWriter.Localization
FileInUse,
FileNotFound,
FinishedSearchingDocument,
FolderNotFound,
FtpServerUnavailable,
FtpSettingsRequired,
GoogleAuthTokenNotFound,
@ -100,6 +101,7 @@ namespace OpenLiveWriter.Localization
SpacesPublishingNotEnabled,
SpellCheckCancelledStillPost,
SpellCheckComplete,
SSGPublishCommandRequired,
TagConfirmDeleteProvider,
TagConfirmRestoreProviders,
TagFormatRequired,

12
src/managed/OpenLiveWriter.PostEditor/Configuration/Wizard/WeblogConfigurationWizardController.cs
View File

@ -487,19 +487,7 @@ namespace OpenLiveWriter.PostEditor.Configuration.Wizard
private void OnStaticSiteConfigCompleted(Object stepControl)
{
if (_authenticationRequired)
AddSharePointAuthenticationStep((IAccountBasicInfoProvider)stepControl);
else
OnBasicInfoAndAuthenticationCompleted((IAccountBasicInfoProvider)stepControl, new PerformBlogAutoDetection(PerformSharePointAutoDetectionSubStep));
}
private void OnStaticSiteConfigUndone(Object stepControl)
{
if (_authenticationRequired && !_authenticationStepAdded)
{
AddSharePointAuthenticationStep((IAccountBasicInfoProvider)stepControl);
next();
}
}
#endregion

38
src/managed/OpenLiveWriter.PostEditor/Configuration/Wizard/WeblogConfigurationWizardPanelStaticSiteConfig.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for details.
using System;
using System.IO;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
@ -112,19 +113,19 @@ namespace OpenLiveWriter.PostEditor.Configuration.Wizard
public string LocalSitePath
{
get => textBoxLocalSitePath.Text;
get => PathHelper.RemoveLeadingAndTrailingSlash(textBoxLocalSitePath.Text);
set { textBoxLocalSitePath.Text = value; }
}
public string PostsPath
{
get => textBoxPostsPath.Text;
get => PathHelper.RemoveLeadingAndTrailingSlash(textBoxPostsPath.Text);
set { textBoxPostsPath.Text = value; }
}
public string PagesPath
{
get => textBoxPagesPath.Text;
get => PathHelper.RemoveLeadingAndTrailingSlash(textBoxPagesPath.Text);
set { textBoxPagesPath.Text = value; }
}
@ -181,7 +182,36 @@ namespace OpenLiveWriter.PostEditor.Configuration.Wizard
public override bool ValidatePanel()
{
// TODO Check all paths and commands exist
if (!Directory.Exists(LocalSitePath))
{
ShowValidationError(textBoxLocalSitePath, MessageId.FolderNotFound, LocalSitePath);
return false;
}
var postsPathFull = $"{LocalSitePath}\\{PostsPath}";
var pagesPathFull = $"{LocalSitePath}\\{PagesPath}";
// If the Posts path is empty or doesn't exist, display an error
if (PagesPath.Trim().Length == 0 || !Directory.Exists(postsPathFull))
{
ShowValidationError(textBoxPostsPath, MessageId.FolderNotFound, postsPathFull);
return false;
}
// If the Pages path is over 0 (pages enabled) and the path doesn't exist, display an error
if (PagesPath.Trim().Length > 0 && !Directory.Exists(pagesPathFull))
{
ShowValidationError(textBoxPagesPath, MessageId.FolderNotFound, pagesPathFull);
return false;
}
// Publish commands are required
if(PublishCmd.Trim().Length == 0)
{
ShowValidationError(textBoxPublishCmd, MessageId.SSGPublishCommandRequired);
return false;
}
return true;
}