Hi,
There are too may flags in elm_map. Most of them are duplicated and unnecessary.
I have removed "want", "download", "have" variables.
I use gi->job instead of "want" & "download".
I use ecore_file_exists() instead of "have" flags.
Please review attached patch file.
Index: src/lib/elm_map.c
===================================================================
--- src/lib/elm_map.c (리비전 65087)
+++ src/lib/elm_map.c (작업 사본)
@@ -250,9 +250,7 @@ struct _Grid_Item
struct {
int x, y, w, h;
} src, out;
- Eina_Bool want : 1;
- Eina_Bool download : 1;
- Eina_Bool have : 1;
+
Ecore_File_Download_Job *job;
int try_num;
};
@@ -1154,14 +1152,12 @@ grid_clear(Evas_Object *obj, Grid *g)
//evas_object_del(gi->txt);
wd->download_list = eina_list_remove(wd->download_list, gi);
- gi->want = EINA_FALSE;
if (gi->job)
{
DBG("DOWNLOAD abort %s", gi->file);
ecore_file_download_abort(gi->job);
ecore_file_remove(gi->file);
- gi->have = EINA_FALSE;
gi->job = NULL;
wd->try_num--;
}
@@ -1182,24 +1178,19 @@ grid_clear(Evas_Object *obj, Grid *g)
static void
_tile_update(Grid_Item *gi)
{
- gi->want = EINA_FALSE;
- gi->download = EINA_FALSE;
evas_object_image_file_set(gi->img, gi->file, NULL);
if (evas_object_image_load_error_get(gi->img) != EVAS_LOAD_ERROR_NONE)
{
ERR("Image loading error (%s)", gi->file);
ecore_file_remove(gi->file);
- gi->have = EINA_FALSE;
- return;
}
-
- obj_rotate_zoom(gi->wd->obj, gi->img);
- evas_object_show(gi->img);
-
- //evas_object_text_text_set(gi->txt, gi->file);
- //evas_object_show(gi->txt);
-
- gi->have = EINA_TRUE;
+ else
+ {
+ obj_rotate_zoom(gi->wd->obj, gi->img);
+ evas_object_show(gi->img);
+ //evas_object_text_text_set(gi->txt, gi->file);
+ //evas_object_show(gi->txt);
+ }
}
static void
@@ -1207,32 +1198,28 @@ _tile_downloaded(void *data, const char
{
Grid_Item *gi = data;
- gi->wd->download_num--;
- gi->download = EINA_FALSE;
gi->job = NULL;
- if ((gi->want) && (status == 200))
+ if (status == 200)
{
+ DBG("Download success from %s to %s", gi->source, gi->file);
_tile_update(gi);
- DBG("DOWNLOAD done %s", gi->file);
}
-
- if (status != 200)
+ else
{
- DBG("Download failed %s (%d) ", gi->file, status);
+ DBG("Download failed from %s to %s (%d) ", gi->source, gi->file, status);
ecore_file_remove(gi->file);
- gi->have = EINA_FALSE;
}
- else
- gi->wd->finish_num++;
+ gi->wd->finish_num++;
+ gi->wd->download_num--;
evas_object_smart_callback_call(gi->wd->obj, SIG_DOWNLOADED, NULL);
if (!gi->wd->download_num)
{
edje_object_signal_emit(elm_smart_scroller_edje_object_get(gi->wd->scr), "elm,state,busy,stop", "elm");
evas_object_smart_callback_call(gi->wd->obj, SIG_LOADED_DETAIL, NULL);
}
- _process_download_list(gi->wd->obj);
+ //_process_download_list(gi->wd->obj);
}
static void
@@ -1274,19 +1261,16 @@ _process_download_list(Evas_Object *obj)
ww, hh,
cvx, cvy, cvw, cvh))
{
- gi->download = EINA_FALSE;
wd->download_list = eina_list_remove(wd->download_list, gi);
}
}
EINA_LIST_REVERSE_FOREACH_SAFE(wd->download_list, l, ll, gi)
{
- if (gi->wd->download_num >= MAX_CONCURRENT_DOWNLOAD)
- break;
+ if (gi->wd->download_num >= MAX_CONCURRENT_DOWNLOAD) break;
Eina_Bool ret = ecore_file_download_full(gi->source, gi->file, _tile_downloaded, NULL, gi, &(gi->job), wd->ua);
- if (!ret || !gi->job)
- WRN("Can't start to download %s to %s", gi->source, gi->file);
+ if (!ret || !gi->job) ERR("Can't start to download from %s to %s", gi->source, gi->file);
else
{
gi->wd->download_num++;
@@ -1304,8 +1288,7 @@ _add_download_list(Evas_Object *obj, Gri
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
- wd->download_list = eina_list_remove(wd->download_list, gi);
- wd->download_list = eina_list_append(wd->download_list, gi);
+ if (!eina_list_data_find(wd->download_list, gi)) wd->download_list = eina_list_append(wd->download_list, gi);
_process_download_list(obj);
}
@@ -1393,33 +1376,20 @@ grid_load(Evas_Object *obj, Grid *g)
ww, hh,
cvx, cvy, cvw, cvh))
{
- if (gi->want)
+ if (ecore_file_exists(gi->file))
{
evas_object_hide(gi->img);
- //evas_object_hide(gi->txt);
evas_object_image_file_set(gi->img, NULL, NULL);
- gi->want = EINA_FALSE;
- gi->have = EINA_FALSE;
-
- if (gi->job)
- {
- DBG("DOWNLOAD abort %s", gi->file);
- ecore_file_download_abort(gi->job);
- ecore_file_remove(gi->file);
- gi->job = NULL;
- wd->try_num--;
- }
- gi->download = EINA_FALSE;
}
- else if (gi->have)
+ else if (gi->job)
{
- evas_object_hide(gi->img);
- //evas_object_hide(gi->txt);
- evas_object_image_preload(gi->img, 1);
- evas_object_image_file_set(gi->img, NULL, NULL);
- gi->have = EINA_FALSE;
- gi->want = EINA_FALSE;
+ DBG("DOWNLOAD abort %s", gi->file);
+ ecore_file_download_abort(gi->job);
+ ecore_file_remove(gi->file);
+ gi->job = NULL;
+ wd->try_num--;
}
+ //evas_object_hide(gi->txt);
}
}
eina_iterator_free(it);
@@ -1480,15 +1450,17 @@ grid_load(Evas_Object *obj, Grid *g)
evas_object_pass_events_set(gi->txt, EINA_TRUE);
*/
eina_matrixsparse_data_idx_set(g->grid, y, x, gi);
+
+ gi->job = NULL;
+ gi->file = NULL;
+ gi->source = NULL;
}
- if ((!gi->have) && (!gi->download))
+ if (!gi->job)
{
char buf[PATH_MAX], buf2[PATH_MAX];
char *source;
- gi->want = EINA_TRUE;
-
snprintf(buf, sizeof(buf), DEST_DIR_PATH, wd->id, g->zoom, x);
if (!ecore_file_exists(buf))
ecore_file_mkpath(buf);
@@ -1501,21 +1473,21 @@ grid_load(Evas_Object *obj, Grid *g)
eina_stringshare_replace(&gi->file, buf2);
eina_stringshare_replace(&gi->source, source);
- if ((ecore_file_exists(buf2)) || (g == eina_list_data_get(wd->grids)))
+ if ((ecore_file_exists(gi->file)) || (g == eina_list_data_get(wd->grids)))
{
- gi->download = EINA_TRUE;
- if (ecore_file_exists(buf2))
- _tile_update(gi);
+ if (ecore_file_exists(gi->file))
+ {
+ DBG("file exists: %s", gi->file);
+ _tile_update(gi);
+ }
else
- _add_download_list(obj, gi);
+ {
+ DBG("added to download list: %s", gi->file);
+ _add_download_list(obj, gi);
+ }
}
if (source) free(source);
}
- else if (gi->have)
- {
- obj_rotate_zoom(obj, gi->img);
- evas_object_show(gi->img);
- }
}
}
}
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
