Skip to content

Commit 84ea3d1

Browse files
committed
Removed memory guard on sitemap generators
And updated static docs site
1 parent 1139dcc commit 84ea3d1

File tree

5 files changed

+59
-41
lines changed

5 files changed

+59
-41
lines changed

SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ public static void SetDefaultValues ()
462462
ScanSitesInList = false;
463463
WarnAboutInsecureLinks = true;
464464

465-
EnableTextIndexing = true;
465+
EnableTextIndexing = false;
466466
CaseSensitiveTextIndexing = false;
467467

468468
DetectQrCodeInImage = false;

SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeMainForm/Generators/GeneratorsCallbacks.cs

+23-39
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,9 @@ private void CallbackSaveGeneratorSitemapXml ( object sender, EventArgs e )
5959

6060
try
6161
{
62-
if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
63-
{
64-
Cursor.Current = Cursors.WaitCursor;
65-
SitemapGenerator.WriteSitemapXml( NewPath: Pathname );
66-
Cursor.Current = Cursors.Default;
67-
}
68-
}
69-
catch( MacroscopeInsufficientMemoryException ex )
70-
{
71-
this.DialogueBoxError( "Error saving Sitemap XML", ex.Message );
62+
Cursor.Current = Cursors.WaitCursor;
63+
SitemapGenerator.WriteSitemapXml( NewPath: Pathname );
64+
Cursor.Current = Cursors.Default;
7265
}
7366
catch( XmlException ex )
7467
{
@@ -84,6 +77,10 @@ private void CallbackSaveGeneratorSitemapXml ( object sender, EventArgs e )
8477
}
8578

8679
}
80+
else
81+
{
82+
this.DialogueBoxError( "Error saving Sitemap XML", "Could not open file." );
83+
}
8784

8885
Dialog.Dispose();
8986

@@ -115,27 +112,28 @@ private void CallbackSaveGeneratorSitemapXmlPerHost ( object sender, EventArgs e
115112

116113
try
117114
{
118-
if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
119-
{
120-
Cursor.Current = Cursors.WaitCursor;
121-
SitemapGenerator.WriteSitemapXmlPerHost( NewPath: Pathname );
122-
Cursor.Current = Cursors.Default;
123-
}
115+
Cursor.Current = Cursors.WaitCursor;
116+
SitemapGenerator.WriteSitemapXmlPerHost( NewPath: Pathname );
117+
Cursor.Current = Cursors.Default;
124118
}
125-
catch( MacroscopeInsufficientMemoryException ex )
119+
catch( XmlException ex )
126120
{
127121
this.DialogueBoxError( "Error saving Sitemap XML for one or more hosts", ex.Message );
128122
}
129-
catch( XmlException ex )
123+
catch( MacroscopeSitemapException ex )
130124
{
131-
this.DialogueBoxError( "Error saving Sitemap XML for one or more hosts", ex.Message );
125+
this.DialogueBoxError( "Error saving Sitemap XML", ex.Message );
132126
}
133127
catch( Exception ex )
134128
{
135129
this.DialogueBoxError( "Error saving Sitemap XML for one or more hosts", ex.Message );
136130
}
137131

138132
}
133+
else
134+
{
135+
this.DialogueBoxError( "Error saving Sitemap XML", "Could not open file." );
136+
}
139137

140138
Dialog.Dispose();
141139

@@ -167,16 +165,9 @@ private void CallbackSaveGeneratorSitemapText ( object sender, EventArgs e )
167165

168166
try
169167
{
170-
if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
171-
{
172-
Cursor.Current = Cursors.WaitCursor;
173-
SitemapGenerator.WriteSitemapText( NewPath: Pathname );
174-
Cursor.Current = Cursors.Default;
175-
}
176-
}
177-
catch( MacroscopeInsufficientMemoryException ex )
178-
{
179-
this.DialogueBoxError( "Error saving Sitemap Text", ex.Message );
168+
Cursor.Current = Cursors.WaitCursor;
169+
SitemapGenerator.WriteSitemapText( NewPath: Pathname );
170+
Cursor.Current = Cursors.Default;
180171
}
181172
catch( MacroscopeSitemapException ex )
182173
{
@@ -219,16 +210,9 @@ private void CallbackSaveGeneratorSitemapTextPerHost ( object sender, EventArgs
219210

220211
try
221212
{
222-
if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
223-
{
224-
Cursor.Current = Cursors.WaitCursor;
225-
SitemapGenerator.WriteSitemapTextPerHost( NewPath: Pathname );
226-
Cursor.Current = Cursors.Default;
227-
}
228-
}
229-
catch( MacroscopeInsufficientMemoryException ex )
230-
{
231-
this.DialogueBoxError( "Error saving Sitemap Text", ex.Message );
213+
Cursor.Current = Cursors.WaitCursor;
214+
SitemapGenerator.WriteSitemapTextPerHost( NewPath: Pathname );
215+
Cursor.Current = Cursors.Default;
232216
}
233217
catch( Exception ex )
234218
{

SEOMacroscopeSeriesOne/src/MacroscopeGenerators/MacroscopeSitemapGenerator/MacroscopeSitemapGenerator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class MacroscopeSitemapGenerator : Macroscope
4343

4444
private const string XmlNamespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
4545

46-
MacroscopeDocumentCollection DocCollection;
46+
private MacroscopeDocumentCollection DocCollection;
4747

4848
/**************************************************************************/
4949

docs/_collection_releases/v1.7.2.0.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: SEO Macrocope v1.7.2.0
3+
tag: v1.7.2.0
4+
arch: 64
5+
installer: SEO-Macroscope-Installer-1.7.2.0.msi
6+
published: true
7+
---
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
layout: post
3+
title: "New v1.7.2 release of SEO Macroscope: Two to talk"
4+
date: "2018-04-16 18:00:00 -09:00"
5+
published: true
6+
description: "This release of SEO Macroscope primarily fixes a number of minor bugs."
7+
excerpt: "This release of SEO Macroscope primarily fixes a number of minor bugs."
8+
---
9+
10+
This release of SEO Macroscope primarily fixes a number of minor bugs.
11+
{: .lead }
12+
13+
Source code and an installer can be found on GitHub at:
14+
15+
* [https://github.com/nazuke/SEOMacroscope/releases/tag/v1.7.2.0](https://github.com/nazuke/SEOMacroscope/releases/tag/v1.7.2.0)
16+
17+
Please check the [downloads page]({{ "/downloads/" | relative_url }}) for more recent versions.
18+
19+
## Bug fixes
20+
21+
* Incorrect behaviour of progress dialogues.
22+
* Removed memory guard on sitemap generators, that may have prevented sitemap generation under certain circumstances.
23+
24+
Please report issues at [https://github.com/nazuke/SEOMacroscope/issues](https://github.com/nazuke/SEOMacroscope/issues).
25+
26+
![SEO Macroscope Application Window]({{ "/media/screenshots/seo-macroscope-main-window-v1.7.png" | relative_url }}){: .img-responsive .box-shadow }
27+
{: .screenshot }

0 commit comments

Comments
 (0)