efl.file: improve api a bit

Summary:
the previous implementation/api had a number of issues:
* "file" property contained both "file" and "key" values
  - also performed file loading operation
* "load_error" property which was specific to image objects
* no methods for controlling file loading/unloading

this patch attempts the following changes:
* split "file" property into "file" and "key" properties
  - also remove "key" from existing "mmap" property
* remove "load_error"
* directly return error codes from operations
* add "load" and "unload" methods for directly controlling load state
* add implicit file loading if file/mmap is set during construction
* rewrite all efl.file implementations to move file loading into load() method
* rewrite all usage of efl.file api based on these changes
* add C extension functions to mimic previous behavior

ref T7577

Reviewers: segfaultxavi, bu5hm4n, cedric

Reviewed By: segfaultxavi

Subscribers: vitor.sousa, #reviewers, #committers

Tags: #efl_api

Maniphest Tasks: T7577

Differential Revision: https://phab.enlightenment.org/D8018

1 files changed, 23 insertions, 18 deletions

diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index ed5eb36f34..06c95bf15b 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -119,6 +119,7 @@ struct _Efl_Canvas_Video_Data
    Eina_Bool remember_play : 1;
    Eina_Bool seek : 1;
    Eina_Bool seeking : 1;
+   Eina_Bool loaded : 1;
 };
 
 struct _Emotion_Xattr_Data
@@ -344,21 +345,34 @@ _efl_canvas_video_engine_set(Eo *obj, Efl_Canvas_Video_Data *pd, const char *eng
 EAPI Eina_Bool
 emotion_object_file_set(Evas_Object *obj, const char *file)
 {
-   return efl_file_set(obj, file, NULL);
+   return efl_file_simple_load(obj, file, NULL);
 }
 
-EOLIAN static Eina_Bool
-_efl_canvas_video_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, const char *file, const char *key EINA_UNUSED)
+EOLIAN static Eina_Error
+_efl_canvas_video_efl_file_file_set(Eo *obj, Efl_Canvas_Video_Data *sd, const char *file)
 {
    DBG("file=%s", file);
 
-   if (!eina_stringshare_replace(&sd->file, file)) return EINA_TRUE;
+   eina_stringshare_replace(&sd->file, file);
+   sd->loaded = 0;
+   return efl_file_set(efl_super(obj, MY_CLASS), file);
+}
 
+EOLIAN static Eina_Bool
+_efl_canvas_video_efl_file_loaded_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
+{
+   return sd->open && sd->loaded;
+}
+
+EOLIAN static Eina_Error
+_efl_canvas_video_efl_file_load(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
+{
+   const char *file = sd->file;
    if (!sd->engine_instance) _engine_init(obj, sd);
    if (!sd->engine_instance)
      {
         WRN("No engine chosen. Please set an engine.");
-        return EINA_FALSE;
+        return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
      }
 
    sd->video.w = 0;
@@ -367,7 +381,6 @@ _efl_canvas_video_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *
      {
         char *file2 = NULL;
 
-        eina_stringshare_replace(&sd->file, file);
         emotion_engine_instance_file_close(sd->engine_instance);
         evas_object_image_data_set(sd->obj, NULL);
         evas_object_image_size_set(sd->obj, 1, 1);
@@ -382,7 +395,7 @@ _efl_canvas_video_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *
         if (!emotion_engine_instance_file_open(sd->engine_instance, file2))
           {
              WRN("Couldn't open file=%s", sd->file);
-             return EINA_FALSE;
+             return EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
           }
         free(file2);
         DBG("successfully opened file=%s", sd->file);
@@ -402,23 +415,15 @@ _efl_canvas_video_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *
    sd->anim = NULL;
 
    _xattr_data_cancel(sd->xattr);
+   sd->loaded = 1;
 
-   return EINA_TRUE;
+   return 0;
 }
 
 EAPI const char *
 emotion_object_file_get(const Evas_Object *obj)
 {
-   const char *file = NULL;
-   efl_file_get(obj, &file, NULL);
-   return file;
-}
-
-EOLIAN static void
-_efl_canvas_video_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, const char **file, const char **key)
-{
-   if (file) *file = sd->file;
-   if (key) *key = NULL;
+   return efl_file_get(obj);
 }
 
 static void