[EGIT] [core/efl] master 02/03: eio: Eio_Model parent_get return parent model

[Larry Jr]

felipealmeida pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c33caa86ab04fd32a32d6b7227c143343267fb56

commit c33caa86ab04fd32a32d6b7227c143343267fb56
Author: Larry Jr <larry....@gmail.com>
Date:   Sun Jun 5 20:52:52 2016 -0300

    eio: Eio_Model parent_get return parent model
---
 configure.ac             |  1 +
 src/lib/eio/eio_model.c  | 30 +++++++++++++++++++++++++++++-
 src/lib/eio/eio_model.eo |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9712945..7a27416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4667,6 +4667,7 @@ EFL_PLATFORM_DEPEND([EIO], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EIO], [ecore-file])
 EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
 EFL_INTERNAL_DEPEND_PKG([EIO], [eo])
 EFL_INTERNAL_DEPEND_PKG([EIO], [eina])
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 1bbdf11..258a7ce 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -7,6 +7,7 @@
 #include <Efl.h>
 #include <Eina.h>
 #include <Ecore.h>
+#include <Ecore_File.h>
 #include <Eo.h>
 
 #include "eio_private.h"
@@ -330,10 +331,17 @@ _eio_model_efl_model_property_set(Eo *obj EINA_UNUSED,
      }
 
    dest = eina_value_to_string(value);
-   if (priv->path == NULL)
+   if (priv->path == NULL || !ecore_file_exists(priv->path))
      {
+        free(priv->path);
         priv->path = dest;
 
+        if (!ecore_file_exists(dest))
+          {
+             eina_promise_owner_error_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
+             return;
+          }
+
         INF("path '%s' with filename '%s'.", priv->path, basename(priv->path));
 
         _eio_monitors_list_load(priv);
@@ -611,4 +619,24 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data 
*priv)
    eo_destructor(eo_super(obj, MY_CLASS));
 }
 
+
+static Eo *
+_eio_model_eo_base_parent_get(Eo *obj , Eio_Model_Data *priv)
+{
+   Eo *model = eo_parent_get(eo_super(obj, MY_CLASS));
+
+   if (model == NULL || !eo_isa(model, EFL_MODEL_INTERFACE))
+     {
+        char *path = ecore_file_dir_get(priv->path);
+        if (path != NULL && strcmp(priv->path, "/") != 0)
+          {
+             model = eo_add(MY_CLASS, NULL, eio_model_path_set(eo_self, path));
+          }
+        else
+          model = NULL;
+
+        free(path);
+     }
+   return model;
+}
 #include "eio_model.eo.c"
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index ca459f8..b730665 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -36,6 +36,7 @@ class Eio.Model (Eo.Base, Efl.Model)
     implements {
       Eo.Base.constructor;
       Eo.Base.destructor;
+      Eo.Base.parent.get;
       Efl.Model.properties.get;
       Efl.Model.property_set;
       Efl.Model.property_get;

--