Commit: 154f374257c8d9b73268853afff86e734a357f15 - magickd (git)

D bindings to the GraphicsMagick library.

Commit MetaInfo

• Revisión: 154f374257c8d9b73268853afff86e734a357f15 (tree)
• Tiempo: 2023-07-23 13:07:43
• Autor: Mio <stigma@disr...>
• Commiter: Mio

Log Message

[magickd] Update Exception classes

Future proofing by separating the API exceptions (from GraphicsMagick)
vs any errors that MagickD might throw itself.

Cambiar Resumen

• modified: source/magickd/exception.d
• modified: source/magickd/image.d

Diferencia incremental

--- a/source/magickd/exception.d
+++ b/source/magickd/exception.d
@@ -23,36 +23,115 @@
 */
 module magickd.exception;
 
-import core.stdc.string : strlen;
+import std.string : fromStringz;
 
-import std.algorithm.mutation : copy;
+import graphicsmagick_c.magick.error : ExceptionInfo;
 
-import graphicsmagick_c.magick.error;
+///
+/// Base exception class encompassing all MagickD exceptions.
+///
+/// Author: Mio
+/// See_Also: MagickAPIException
+///
+class MagickException : Exception
+{
+package(magickd):
 
-class MagickException : Exception {
-    public ExceptionType severity;
-    public string description;
+   ///
+   /// Construct an exception
+   ///
+   public this(string msg)
+   {
+      super(msg);
+   }
+}
+
+///
+/// Encapsulates a GraphicsMagick ExceptionInfo structure.
+///
+/// Used whenever a MagickWand/PixelWand/DrawingWand throw an
+/// exception in the C API.
+///
+/// Author: Mio
+///
+class MagickAPIException : MagickException
+{
+package(magickd):
+
+   ///
+   /// Descibes the exception that has occurred.
+   ///
+   private string m_description;
+
+   ///
+   /// Reason for the exception being thrown.
+   ///
+   private string m_reason;
 
-    this(ExceptionInfo ei) {
-        this.severity = ei.severity;
+   ///
+   /// Severity of the exception
+   ///
+   private int m_severity;
 
-        string msg;
-        string desc;
+   ///
+   /// Construct an API exception
+   ///
+   /// Params:
+   ///   exception = The ExceptionInfo structure from GraphicsMagick.
+   ///
+   this(ref ExceptionInfo exception)
+   {
+      m_severity = exception.severity;
+      m_reason = fromStringz(exception.reason).dup;
+      m_description = fromStringz(exception.description).dup;
+      super(m_reason);
+   }
 
-        size_t reasonLen = strlen(ei.reason);
-        size_t descLen = strlen(ei.description);
+   ///
+   /// Descibes the exception that has occurred.
+   ///
+   @property public string description() const
+   {
+      return m_description;
+   }
 
-        msg.reserve(reasonLen);
-        msg.length = reasonLen;
+   ///
+   /// Reason for the exception being thrown.
+   ///
+   @property public string reason() const
+   {
+      return m_reason;
+   }
 
-        desc.reserve(descLen);
-        desc.length = descLen;
+   ///
+   /// Severity of the exception
+   ///
+   @property public int severity() const
+   {
+      return m_severity;
+   }
 
-        copy(ei.reason[0..reasonLen], cast(char[])msg);
-        copy(ei.description[0..descLen], cast(char[])desc);
+   ///
+   /// Descibes the exception that has occurred.
+   ///
+   public string getDescription() const
+   {
+      return m_description;
+   }
 
-        this.description = desc;
+   ///
+   /// Reason for the exception being thrown.
+   ///
+   public string getReason() const
+   {
+      return m_reason;
+   }
 
-        super(msg);
-    }
+   ///
+   /// Severity of the exception
+   ///
+   public int getSeverity() const
+   {
+      return m_severity;
+   }
 }

--- a/source/magickd/image.d
+++ b/source/magickd/image.d
@@ -62,7 +62,7 @@ class Image {
         GetExceptionInfo(&exception);
         handle = ReadImage(info_.handle, &exception);
         if (UndefinedException != exception.severity) {
-            throw new MagickException(exception);
+            throw new MagickAPIException(exception);
         }
     }
 
@@ -71,7 +71,7 @@ class Image {
         GetExceptionInfo(&exception);
         handle = PingImage(info_.handle, &exception);
         if (UndefinedException != exception.severity) {
-            throw new MagickException(exception);
+            throw new MagickAPIException(exception);
         }
     }
 
@@ -177,7 +177,7 @@ class Image {
         cImage* repl = AddNoiseImage(orig, noiseType, &exception);
 
         if (UndefinedException != exception.severity) {
-            throw new MagickException(exception);
+            throw new MagickAPIException(exception);
         }
         this.handle = repl;
         DestroyImage(orig);
@@ -201,7 +201,7 @@ class Image {
         cImage* repl = BlurImage(orig, radius, stigma, &exception);
 
         if (UndefinedException != exception.severity) {
-            throw new MagickException(exception);
+            throw new MagickAPIException(exception);
         }
         this.handle = repl;
         DestroyImage(orig);