Always check for directory changes with sendfile auto completion
Instead of only checking for files when 'last_directory' has changed, do it every time. Add autocomplete_update function that updates the items while retaining last_found and search_str. Fixes #1099
This commit is contained in:
@@ -66,8 +66,10 @@ void
|
||||
autocomplete_clear(Autocomplete ac)
|
||||
{
|
||||
if (ac) {
|
||||
g_list_free_full(ac->items, free);
|
||||
ac->items = NULL;
|
||||
if (ac->items) {
|
||||
g_list_free_full(ac->items, free);
|
||||
ac->items = NULL;
|
||||
}
|
||||
|
||||
autocomplete_reset(ac);
|
||||
}
|
||||
@@ -101,6 +103,35 @@ autocomplete_length(Autocomplete ac)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
autocomplete_update(Autocomplete ac, char **items)
|
||||
{
|
||||
gchar *last_found = NULL;
|
||||
gchar *search_str = NULL;
|
||||
|
||||
if (ac->last_found) {
|
||||
last_found = strdup(ac->last_found->data);
|
||||
}
|
||||
|
||||
if (ac->search_str) {
|
||||
search_str = strdup(ac->search_str);
|
||||
}
|
||||
|
||||
autocomplete_clear(ac);
|
||||
autocomplete_add_all(ac, items);
|
||||
|
||||
if (last_found) {
|
||||
// NULL if last_found was removed on update.
|
||||
ac->last_found = g_list_find_custom(ac->items, last_found, (GCompareFunc)strcmp);
|
||||
free(last_found);
|
||||
}
|
||||
|
||||
if (search_str) {
|
||||
ac->search_str = strdup(search_str);
|
||||
free(search_str);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
autocomplete_add(Autocomplete ac, const char *item)
|
||||
{
|
||||
|
||||
@@ -51,6 +51,7 @@ void autocomplete_free(Autocomplete ac);
|
||||
|
||||
void autocomplete_add(Autocomplete ac, const char *item);
|
||||
void autocomplete_add_all(Autocomplete ac, char **items);
|
||||
void autocomplete_update(Autocomplete ac, char **items);
|
||||
void autocomplete_remove(Autocomplete ac, const char *const item);
|
||||
void autocomplete_remove_all(Autocomplete ac, char **items);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user