vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'everything' 

- improve the history sort
- cleanups


SVN revision: 42120
This commit is contained in:
Hannes Janetzek 2009-08-31 10:30:55 +00:00
parent 25b3f68249
commit 6d7d2889f5
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/everything/evry.c
View File

@ -415,7 +415,7 @@ evry_plugin_async_update(Evry_Plugin *p, int action)
if (s->plugin_auto_selected) if (s->plugin_auto_selected)
_evry_plugin_select(s, agg); _evry_plugin_select(s, agg);
} }
agg->fetch(agg, s->input); agg->fetch(agg, s->input[0] ? s->input : NULL);
} }
else else
{ {
@ -1592,10 +1592,12 @@ _evry_matches_update(Evry_Selector *sel, int async)
Eina_List *l; Eina_List *l;
const char *input; const char *input;
/* TODO cleanup plugins */
EINA_LIST_FREE(s->cur_plugins, p); EINA_LIST_FREE(s->cur_plugins, p);
if (strlen(s->input) > 0) /* if (strlen(s->input) > 0) */
input = s->input; if (s->input[0])
input = s->input;
else else
input = NULL; input = NULL;
@ -1636,7 +1638,7 @@ _evry_matches_update(Evry_Selector *sel, int async)
if (eina_list_count(s->cur_plugins) > 0) if (eina_list_count(s->cur_plugins) > 0)
{ {
s->cur_plugins = eina_list_prepend(s->cur_plugins, sel->aggregator); s->cur_plugins = eina_list_prepend(s->cur_plugins, sel->aggregator);
sel->aggregator->fetch(sel->aggregator, s->input); sel->aggregator->fetch(sel->aggregator, input);
if (s->plugin_auto_selected) if (s->plugin_auto_selected)
_evry_plugin_select(s, NULL); _evry_plugin_select(s, NULL);
} }

5
src/modules/everything/evry_history.c
View File

@ -281,7 +281,6 @@ evry_history_item_usage_set(Eina_Hash *hist, Evry_Item *it, const char *input)
Eina_List *l; Eina_List *l;
int cnt = 1; int cnt = 1;
int matched; int matched;
double now = ecore_time_get();
if (it->id) if (it->id)
id = it->id; id = it->id;
@ -296,7 +295,7 @@ evry_history_item_usage_set(Eina_Hash *hist, Evry_Item *it, const char *input)
{ {
if (hi->plugin == it->plugin->name) if (hi->plugin == it->plugin->name)
{ {
if ((!input[0]) || (!input[0] && !hi->input)) if ((!input) || (!input && !hi->input))
{ {
cnt++; cnt++;
it->usage = hi->last_used; it->usage = hi->last_used;
@ -319,7 +318,7 @@ evry_history_item_usage_set(Eina_Hash *hist, Evry_Item *it, const char *input)
if (matched) cnt++; if (matched) cnt++;
} }
it->usage += (double) hi->count * (hi->last_used / now); it->usage *= (double) hi->count;
} }
} }
if (it->usage) if (it->usage)

6
src/modules/everything/evry_plug_aggregator.c
View File

@ -109,7 +109,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
/* first is aggregator itself */ /* first is aggregator itself */
lp = s->cur_plugins->next; lp = s->cur_plugins->next;
if (input[0]) if (input)
{ {
EINA_LIST_FOREACH(lp, l, pp) EINA_LIST_FOREACH(lp, l, pp)
{ {
@ -129,7 +129,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
} }
/* always append items of action or object selector */ /* always append items of action or object selector */
if (!input[0] && if ((!input) &&
((p->selector == selectors[1]) || ((p->selector == selectors[1]) ||
(p->selector == selectors[2]))) (p->selector == selectors[2])))
{ {
@ -182,7 +182,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
if (items) eina_list_free(items); if (items) eina_list_free(items);
if (input[0]) if (input)
{ {
EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort); EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
} }