Removed memory guard on sitemap generators

And updated static docs site
nazuke · Apr 16, 2018 · 84ea3d1 · 84ea3d1
1 parent 1139dcc
commit 84ea3d1
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 41 deletions.
diff --git a/SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs b/SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs
@@ -462,7 +462,7 @@ public static void SetDefaultValues ()
       ScanSitesInList = false;
       WarnAboutInsecureLinks = true;
 
-      EnableTextIndexing = true;
+      EnableTextIndexing = false;
       CaseSensitiveTextIndexing = false;
 
       DetectQrCodeInImage = false;

diff --git a/...roscopeSeriesOne/src/MacroscopeForms/MacroscopeMainForm/Generators/GeneratorsCallbacks.cs b/...roscopeSeriesOne/src/MacroscopeForms/MacroscopeMainForm/Generators/GeneratorsCallbacks.cs
@@ -59,16 +59,9 @@ private void CallbackSaveGeneratorSitemapXml ( object sender, EventArgs e )
 
         try
         {
-          if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
-          {
-            Cursor.Current = Cursors.WaitCursor;
-            SitemapGenerator.WriteSitemapXml( NewPath: Pathname );
-            Cursor.Current = Cursors.Default;
-          }
-        }
-        catch( MacroscopeInsufficientMemoryException ex )
-        {
-          this.DialogueBoxError( "Error saving Sitemap XML", ex.Message );
+          Cursor.Current = Cursors.WaitCursor;
+          SitemapGenerator.WriteSitemapXml( NewPath: Pathname );
+          Cursor.Current = Cursors.Default;
         }
         catch( XmlException ex )
         {
@@ -84,6 +77,10 @@ private void CallbackSaveGeneratorSitemapXml ( object sender, EventArgs e )
         }
 
       }
+      else
+      {
+        this.DialogueBoxError( "Error saving Sitemap XML", "Could not open file." );
+      }
 
       Dialog.Dispose();
 
@@ -115,27 +112,28 @@ private void CallbackSaveGeneratorSitemapXmlPerHost ( object sender, EventArgs e
 
         try
         {
-          if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
-          {
-            Cursor.Current = Cursors.WaitCursor;
-            SitemapGenerator.WriteSitemapXmlPerHost( NewPath: Pathname );
-            Cursor.Current = Cursors.Default;
-          }
+          Cursor.Current = Cursors.WaitCursor;
+          SitemapGenerator.WriteSitemapXmlPerHost( NewPath: Pathname );
+          Cursor.Current = Cursors.Default;
         }
-        catch( MacroscopeInsufficientMemoryException ex )
+        catch( XmlException ex )
         {
           this.DialogueBoxError( "Error saving Sitemap XML for one or more hosts", ex.Message );
         }
-        catch( XmlException ex )
+        catch( MacroscopeSitemapException ex )
         {
-          this.DialogueBoxError( "Error saving Sitemap XML for one or more hosts", ex.Message );
+          this.DialogueBoxError( "Error saving Sitemap XML", ex.Message );
         }
         catch( Exception ex )
         {
           this.DialogueBoxError( "Error saving Sitemap XML for one or more hosts", ex.Message );
         }
 
       }
+      else
+      {
+        this.DialogueBoxError( "Error saving Sitemap XML", "Could not open file." );
+      }
 
       Dialog.Dispose();
 
@@ -167,16 +165,9 @@ private void CallbackSaveGeneratorSitemapText ( object sender, EventArgs e )
 
         try
         {
-          if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
-          {
-            Cursor.Current = Cursors.WaitCursor;
-            SitemapGenerator.WriteSitemapText( NewPath: Pathname );
-            Cursor.Current = Cursors.Default;
-          }
-        }
-        catch( MacroscopeInsufficientMemoryException ex )
-        {
-          this.DialogueBoxError( "Error saving Sitemap Text", ex.Message );
+          Cursor.Current = Cursors.WaitCursor;
+          SitemapGenerator.WriteSitemapText( NewPath: Pathname );
+          Cursor.Current = Cursors.Default;
         }
         catch( MacroscopeSitemapException ex )
         {
@@ -219,16 +210,9 @@ private void CallbackSaveGeneratorSitemapTextPerHost ( object sender, EventArgs
 
         try
         {
-          if( Macroscope.MemoryGuard( RequiredMegabytes: 256 ) )
-          {
-            Cursor.Current = Cursors.WaitCursor;
-            SitemapGenerator.WriteSitemapTextPerHost( NewPath: Pathname );
-            Cursor.Current = Cursors.Default;
-          }
-        }
-        catch( MacroscopeInsufficientMemoryException ex )
-        {
-          this.DialogueBoxError( "Error saving Sitemap Text", ex.Message );
+          Cursor.Current = Cursors.WaitCursor;
+          SitemapGenerator.WriteSitemapTextPerHost( NewPath: Pathname );
+          Cursor.Current = Cursors.Default;
         }
         catch( Exception ex )
         {

diff --git a/...riesOne/src/MacroscopeGenerators/MacroscopeSitemapGenerator/MacroscopeSitemapGenerator.cs b/...riesOne/src/MacroscopeGenerators/MacroscopeSitemapGenerator/MacroscopeSitemapGenerator.cs
@@ -43,7 +43,7 @@ public class MacroscopeSitemapGenerator : Macroscope
 
     private const string XmlNamespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
 
-    MacroscopeDocumentCollection DocCollection;
+    private MacroscopeDocumentCollection DocCollection;
 
     /**************************************************************************/
 

diff --git a/docs/_collection_releases/v1.7.2.0.md b/docs/_collection_releases/v1.7.2.0.md
@@ -0,0 +1,7 @@
+---
+name: SEO Macrocope v1.7.2.0
+tag: v1.7.2.0
+arch: 64
+installer: SEO-Macroscope-Installer-1.7.2.0.msi
+published: true
+---
diff --git a/docs/_posts/2018-04-16-seo-macroscope-release-v1.7.2.0.md b/docs/_posts/2018-04-16-seo-macroscope-release-v1.7.2.0.md
@@ -0,0 +1,27 @@
+---
+layout: post
+title: "New v1.7.2 release of SEO Macroscope: Two to talk"
+date: "2018-04-16 18:00:00 -09:00"
+published: true
+description: "This release of SEO Macroscope primarily fixes a number of minor bugs."
+excerpt: "This release of SEO Macroscope primarily fixes a number of minor bugs."
+---
+
+This release of SEO Macroscope primarily fixes a number of minor bugs.
+{: .lead }
+
+Source code and an installer can be found on GitHub at:
+
+* [https://github.com/nazuke/SEOMacroscope/releases/tag/v1.7.2.0](https://github.com/nazuke/SEOMacroscope/releases/tag/v1.7.2.0)
+
+Please check the [downloads page]({{ "/downloads/" | relative_url }}) for more recent versions.
+
+## Bug fixes
+
+* Incorrect behaviour of progress dialogues.
+* Removed memory guard on sitemap generators, that may have prevented sitemap generation under certain circumstances.
+
+Please report issues at [https://github.com/nazuke/SEOMacroscope/issues](https://github.com/nazuke/SEOMacroscope/issues).
+
+![SEO Macroscope Application Window]({{ "/media/screenshots/seo-macroscope-main-window-v1.7.png" | relative_url }}){: .img-responsive .box-shadow }
+{: .screenshot }