phares3757/snap-2-html
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.14

Browse Source
This commit is contained in:
rlv-dan 2020-08-09 17:29:41 +02:00
parent 7cb819d401
commit 3044da0413
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Snap2HTML/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion( "2.13.0.0" )]
[assembly: AssemblyFileVersion( "2.13.0.0" )]
[assembly: AssemblyVersion( "2.14.0.0" )]
[assembly: AssemblyFileVersion( "2.14.0.0" )]

5
Snap2HTML/ReadMe.txt
View File

@ -241,6 +241,11 @@
v2.13 (2020-05-05)
Fixed an encoding issue causing EncoderFallbackException while saving
v2.14 (2020-08-09)
UNC paths work again (including linking)
Searches returning lots of items should be a bit faster now
And a few smaller fixes as usual
--- End User License Agreement -----------------------------------------------

15
Snap2HTML/frmMain.cs
View File

@ -61,6 +61,7 @@ namespace Snap2HTML
{
// parse command line
var commandLine = Environment.CommandLine;
commandLine = commandLine.Replace( "-output:", "-outfile:" ); // correct wrong parameter to avoid confusion
var splitCommandLine = Arguments.SplitCommandLine(commandLine);
var arguments = new Arguments(splitCommandLine);
@ -160,7 +161,7 @@ namespace Snap2HTML
}
catch( System.Exception ex )
{
MessageBox.Show( "Could not select folder: " + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
MessageBox.Show( "Could not select folder:\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
SetRootPath( "", false );
}
}
@ -214,13 +215,13 @@ namespace Snap2HTML
if( !settings.linkRoot.EndsWith( @"/" ) )
{
if( settings.linkRoot.ToLower().StartsWith( @"http" ) ) // web site
{
settings.linkRoot += @"/";
}
{
settings.linkRoot += @"/";
}
if( Utils.IsWildcardMatch( "?:*", settings.linkRoot, false ) ) // local disk
{
settings.linkRoot += @"\";
}
{
settings.linkRoot += @"\";
}
if( settings.linkRoot.StartsWith( @"\\" ) ) // unc path
{
settings.linkRoot += @"\";

4
Snap2HTML/frmMain_BackgroundWorker.cs
View File

@ -60,7 +60,7 @@ namespace Snap2HTML
}
catch( System.Exception ex )
{
MessageBox.Show( "Failed to open 'Template.html' for reading...", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
MessageBox.Show( "Failed to open 'Template.html' for reading:\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
backgroundWorker.ReportProgress( 0, "An error occurred..." );
return;
}
@ -136,7 +136,7 @@ namespace Snap2HTML
}
catch( Exception ex )
{
MessageBox.Show( "Failed to open file for writing:\n\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
MessageBox.Show( "Failed to open file for writing:\n\n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
backgroundWorker.ReportProgress( 0, "An error occurred..." );
return;
}