eio: migrate to the new efl.model API.

src/lib/eio/eio_model.eo

@@ -1,4 +1,13 @@
-type @extern Eio_Filter_Direct_Cb: __undefined_type; [[Eio filter direct callback type]]
+import eina_types;
+
+function EflIoFilter {
+  [[EflIoFilter function]]
+  params {
+    @in model: Eio.Model;
+    @in entry: ptr(Eina.File.Direct.Info);
+  }
+  return: int;
+};
 
 class Eio.Model (Efl.Object, Efl.Model)
 {
@@ -19,31 +28,30 @@ class Eio.Model (Efl.Object, Efl.Model)
             @since 1.11
           ]]
           params {
-             filter_cb: Eio_Filter_Direct_Cb; [[Filter callback]]
-             userdata: void_ptr; [[User's private data]]
+             filter: EflIoFilter; [[Filter callback]]
           }
        }
-       path_set {
-          [[Custom Eio_Model constructor.
+       @property path {
+          [[ Define the root path of a model.
 
             @since 1.11
           ]]
-          params {
-             @in path: string; [[Root path provided by caller]]
+	  set { [[ Only possible during construction. ]] }
+	  get { }
+	  values {
+             path: string; [[ Root path of the model. ]]
           }
        }
     }
     implements {
-      Efl.Object.constructor;
+      Efl.Object.finalize;
+      Efl.Object.invalidate;
       Efl.Object.destructor;
-      Efl.Object.parent { get; }
-      Efl.Object.provider_find;
       Efl.Model.properties { get; }
-      Efl.Model.property_set;
-      Efl.Model.property_get;
+      Efl.Model.property { set; get; }
       Efl.Model.child_add;
       Efl.Model.child_del;
       Efl.Model.children_slice_get;
-      Efl.Model.children_count_get;
+      Efl.Model.children_count { get; }
     }
 }

src/lib/eio/eio_model_private.h

@@ -4,8 +4,9 @@
 #define PROP_LIST_SIZE 8
 
 typedef struct _Eio_Model_Data                 Eio_Model_Data;
-typedef struct _Eio_Model_Monitor_Data         Eio_Model_Monitor_Data;
+typedef struct _Eio_Model_Info                 Eio_Model_Info;
 
+typedef struct _Eio_Model_Monitor_Data         Eio_Model_Monitor_Data;
 struct _Eio_Model_Monitor_Data
 {
    Ecore_Event_Handler *ecore_child_add_handler[3];
@@ -14,70 +15,60 @@ struct _Eio_Model_Monitor_Data
    int mon_event_child_del[3]; /**< plus EIO_MONITOR_ERROR */
 };
 
-typedef enum _Eio_Property_Name {
-   EIO_MODEL_PROP_FILENAME = 0,
-   EIO_MODEL_PROP_PATH,
-   EIO_MODEL_PROP_MTIME,
-   EIO_MODEL_PROP_IS_DIR,
-   EIO_MODEL_PROP_IS_LNK,
-   EIO_MODEL_PROP_SIZE,
-   EIO_MODEL_PROP_MIME_TYPE,
-   EIO_MODEL_PROP_LAST
-} _Eio_Property_Name;
+// FIXME: Would be more efficient to introduce an Eina_Path that assemble
+// an array of stringshare instead of using one mega stringshare directly.
 
-static const char* _eio_model_prop_names[] =
+struct _Eio_Model_Info
 {
-   [EIO_MODEL_PROP_FILENAME]  = "filename",
-   [EIO_MODEL_PROP_PATH]      = "path",
-   [EIO_MODEL_PROP_MTIME]     = "mtime",
-   [EIO_MODEL_PROP_IS_DIR]    = "is_dir",
-   [EIO_MODEL_PROP_IS_LNK]    = "is_lnk",
-   [EIO_MODEL_PROP_SIZE]      = "size",
-   [EIO_MODEL_PROP_MIME_TYPE] = "mime_type"
+   Eina_Stringshare *path;
+   Eo *object;
+
+   size_t path_length;
+   size_t name_length;
+   size_t name_start;
+
+   Eina_File_Type type;
+
+   Eina_Bool parent_ref : 1;
+   Eina_Bool child_ref : 1;
 };
 
-typedef struct _Eio_Property_Promise _Eio_Property_Promise;
-struct _Eio_Property_Promise
-{
-  _Eio_Property_Name property;
-  Efl_Promise* promise;
-};
-
-typedef struct _Eio_Children_Slice_Promise _Eio_Children_Slice_Promise;
-struct _Eio_Children_Slice_Promise
-{
-  unsigned start;
-  unsigned count;
-  Efl_Promise* promise;
-};
-
-typedef struct _Eio_Model_Data _Eio_Model_Data;
 struct _Eio_Model_Data
 {
-   Eo *obj;
-   Eina_Stringshare *path;
-   Eina_Array *properties_name;
-   Eina_Bool is_listed : 1;
-   Eina_Bool is_listing : 1;
-   Eina_List *children_list;
-   Eina_List *property_promises;
-   Eina_List *children_promises;
-   Eina_List *count_promises;
-   /**< EIO data */
-   Eio_File *stat_file;
-   Eio_File *listing_file;
-   Eio_File *move_file;
-   Eio_File *del_file;
-   Eio_Monitor *monitor;
-   Eio_Model_Monitor_Data mon;
-   int cb_count_child_add; /**< monitor reference counter for child add event */
-   int cb_count_child_del; /**< monitor reference counter for child del event*/
-   unsigned int count;
-   Eio_Filter_Direct_Cb filter_cb;
-   void *filter_userdata;
-   Eina_Spinlock filter_lock; /**< filter callback is called from another thread */
+   Efl_Loop *loop;
+   Eio_Model *self;
 
-   Eina_List *fetching_mime;
+   Eina_Stringshare *path;
+
+   Eio_Model_Info *info;
+   Eina_Stat *st;
+   const char *mime_type;
+
+   struct {
+      Eio_File *stat; // Move to use efl.io.manager.stat
+      Eina_Future *listing; // Move to use efl.io.manager.direct_ls
+      Eio_File *move;
+      Eio_File *del;
+      Eina_Future *mime;
+   } request;
+
+   struct {
+      EflIoFilter cb;
+      Eina_Free_Cb free;
+      void *data;
+   } filter;
+
+   Eio_Model_Monitor_Data mon;
+
+   Eio_Monitor *monitor; // Notification stuff
+   // FIXME: would be interesting to figure a more efficient structure for holding files
+   Eina_List *parent;
+   Eina_List *files; // Eio_Model_Info
+
+   Eina_Error error;
+
+   Eina_Bool listed : 1;
+   Eina_Bool delete_me : 1;
 };
 
 #endif