Added functions FormElementValidatorFile::[size|mime]_is_valid.

diff --git a/src/formelementvalidatorfile.c b/src/formelementvalidatorfile.c
index bdd8a4aec51dce74cb954c0fba0a737ebf92d48e..ad0093d2485c666d00cd7a4413ad7db362f44104 100644 (file)
--- a/src/formelementvalidatorfile.c
+++ b/src/formelementvalidatorfile.c
@@ -240,6 +240,76 @@ gchar
                }
 }
 
+gboolean
+zak_form_cgi_form_element_validator_file_size_is_valid (ZakFormCgiFormElementValidatorFile *validator, guint size)
+{
+       gboolean ret;
+
+       ZakFormCgiFormElementValidatorFilePrivate *priv = zak_form_cgi_form_element_validator_file_get_instance_private (validator);
+
+       ret = TRUE;
+
+       if (priv->size_min > 0
+           && size < priv->size_min)
+               {
+                       zak_form_element_validator_set_message (ZAK_FORM_ELEMENT_VALIDATOR (validator),
+                                                               g_strdup_printf (_("The size must be greater than %d."),
+                                                                                priv->size_min));
+                       ret = FALSE;
+               }
+       if (priv->size_max > 0
+           && size > priv->size_max)
+               {
+                       zak_form_element_validator_set_message (ZAK_FORM_ELEMENT_VALIDATOR (validator),
+                                                               g_strdup_printf (_("The size cannot be greater than %d."),
+                                                                                priv->size_max));
+                       ret = FALSE;
+               }
+
+       return ret;
+}
+
+gboolean
+zak_form_cgi_form_element_validator_file_mime_is_valid (ZakFormCgiFormElementValidatorFile *validator, const gchar *mime)
+{
+       gboolean ret;
+
+       gchar **splitted;
+       guint l;
+       guint i;
+       gboolean found;
+
+       ZakFormCgiFormElementValidatorFilePrivate *priv = zak_form_cgi_form_element_validator_file_get_instance_private (validator);
+
+       g_return_val_if_fail (mime != NULL, FALSE);
+
+       ret = TRUE;
+
+       found = FALSE;
+
+       splitted = g_strsplit (priv->mime_type, "|", -1);
+       l = g_strv_length (splitted);
+       for (i = 0; i < l; i++)
+               {
+                       if (g_strcmp0 (mime, splitted[i]) == 0)
+                               {
+                                       found = TRUE;
+                                       break;
+                               }
+               }
+       g_strfreev (splitted);
+
+       if (!found)
+               {
+                       zak_form_element_validator_set_message (ZAK_FORM_ELEMENT_VALIDATOR (validator),
+                                                               g_strdup_printf (_("The file must be of type «%s»."),
+                                                                                priv->mime_type_message != NULL ? priv->mime_type_message : priv->mime_type));
+                       ret = FALSE;
+               }
+
+       return ret;
+}
+
 /* PRIVATE */
 static void
 zak_form_cgi_form_element_validator_file_set_property (GObject *object,
@@ -323,32 +393,12 @@ zak_form_cgi_form_element_validator_file_validate (ZakFormElementValidator *vali
                            && cgi_file->name != NULL
                            && g_strcmp0 (cgi_file->name, "") != 0)
                                {
-                                       if (priv->size_min > 0
-                                               && cgi_file->size < priv->size_min)
-                                               {
-                                                       zak_form_element_validator_set_message (validator,
-                                                                                               g_strdup_printf (_("The size must be greater than %d."),
-                                                                                                                priv->size_min));
-                                                       ret = FALSE;
-                                               }
-                                       if (priv->size_max > 0
-                                           && cgi_file->size > priv->size_max)
-                                               {
-                                                       zak_form_element_validator_set_message (validator,
-                                                                                               g_strdup_printf (_("The size cannot be greater than %d."),
-                                                                                                                priv->size_max));
-                                                       ret = FALSE;
-                                               }
+                                       ret = zak_form_cgi_form_element_validator_file_size_is_valid (ZAK_FORM_CGI_FORM_ELEMENT_VALIDATOR_FILE (validator), cgi_file->size);
+
                                        if (priv->mime_type != NULL)
                                                {
-                                                       gchar **splitted;
-                                                       guint l;
-                                                       guint i;
-                                                       gboolean found;
                                                        gchar *mime;
 
-                                                       found = FALSE;
-
                                                        mime = g_content_type_get_mime_type (cgi_file->content_type);
 
                                                        if (mime == NULL)
@@ -356,30 +406,7 @@ zak_form_cgi_form_element_validator_file_validate (ZakFormElementValidator *vali
                                                                        mime = g_strdup (cgi_file->content_type);
                                                                }
 
-                                                       splitted = g_strsplit (priv->mime_type, "|", -1);
-                                                       l = g_strv_length (splitted);
-                                                       for (i = 0; i < l; i++)
-                                                               {
-                                                                       if (g_strcmp0 (mime, splitted[i]) == 0)
-                                                                               {
-                                                                                       found = TRUE;
-                                                                                       break;
-                                                                               }
-                                                               }
-                                                       g_strfreev (splitted);
-
-                                                       if (mime != NULL)
-                                                               {
-                                                                       g_free (mime);
-                                                               }
-
-                                                       if (!found)
-                                                               {
-                                                                       zak_form_element_validator_set_message (validator,
-                                                                                                               g_strdup_printf (_("The file must be of type «%s»."),
-                                                                                                                                priv->mime_type_message != NULL ? priv->mime_type_message : priv->mime_type));
-                                                                       ret = FALSE;
-                                                               }
+                                                       ret = zak_form_cgi_form_element_validator_file_mime_is_valid (ZAK_FORM_CGI_FORM_ELEMENT_VALIDATOR_FILE (validator), mime);
                                                }
                                }
                        else if (priv->size_min > 0)

diff --git a/src/formelementvalidatorfile.h b/src/formelementvalidatorfile.h
index 3cdfa3f808d652e4193aa33d94f409c2b1ead052..dd66bbbbe5de1f6342749293f7f7eabcc5fc1c54 100644 (file)
--- a/src/formelementvalidatorfile.h
+++ b/src/formelementvalidatorfile.h
@@ -49,6 +49,9 @@ gchar *zak_form_cgi_form_element_validator_file_get_mime_type (ZakFormElementVal
 void zak_form_cgi_form_element_validator_file_set_mime_type_message (ZakFormElementValidator *validator, const gchar *mime_type_message);
 gchar *zak_form_cgi_form_element_validator_file_get_mime_type_message (ZakFormElementValidator *validator);
 
+gboolean zak_form_cgi_form_element_validator_file_size_is_valid (ZakFormCgiFormElementValidatorFile *validator, guint size);
+gboolean zak_form_cgi_form_element_validator_file_mime_is_valid (ZakFormCgiFormElementValidatorFile *validator, const gchar *mime);
+
 
 G_END_DECLS
 

diff --git a/src/libzakformcgi.h b/src/libzakformcgi.h
index 0366774640179180ae6aca671e7ae80ff0a0224e..48a17ea9bf5638732560ce46a0b33c82e6224db2 100644 (file)
--- a/src/libzakformcgi.h
+++ b/src/libzakformcgi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2017 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2016-2020 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,6 +32,7 @@
 #include <libzakformcgi/formelementsubmit.h>
 #include <libzakformcgi/formelementtextarea.h>
 #include <libzakformcgi/formelementtext.h>
+#include <libzakformcgi/formelementvalidatorfile.h>
 #include <libzakformcgi/form.h>
 
 #endif /* __LIBZAKFORMCGI_H__ */