X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-metadata-manager.c;h=ce164ad56a3284f85e1ad80653d5221f4cc1b62e;hb=682db64b43ff4985fbd6000251b42a051d42b071;hp=f5ab0407b62fee42f21ea874c5f60e745f05a628;hpb=6003391d261ef7940bbc14683f60b242fe347adb;p=evince.git diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index f5ab0407..ce164ad5 100644 --- a/shell/ev-metadata-manager.c +++ b/shell/ev-metadata-manager.c @@ -59,9 +59,6 @@ struct _EvMetadataManager gboolean values_loaded; /* It is true if the file has been read */ - gboolean modified; /* It is true if the file - has top be written */ - guint timeout_id; GHashTable *items; @@ -72,41 +69,63 @@ static gboolean ev_metadata_manager_save (gpointer data); static EvMetadataManager *ev_metadata_manager = NULL; +/** + * item_free: + * @data: a pointer to a #Item data + * + * It does free the values on the #GHashTable where data points. + */ static void item_free (gpointer data) { - Item *item; - - g_return_if_fail (data != NULL); - - item = (Item *)data; + Item *item = (Item *) data; if (item->values != NULL) g_hash_table_destroy (item->values); - g_free (item); + g_slice_free (Item, item); } +/** + * ev_metadata_arm_timeout + * + * Setup a timeout for saving the metadata to disk. + */ +static void +ev_metadata_arm_timeout(void) +{ + if (ev_metadata_manager->timeout_id) + return; + + ev_metadata_manager->timeout_id = + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE, + 2, + (GSourceFunc)ev_metadata_manager_save, + NULL, + NULL); +} + +/** + * ev_metadata_manager_init: + * + * Creates an EvMetadataManager with default values. + * + * values_loaded -> %FALSE. + * timeout_id -> the id of the event source. + * items -> a new full empty #GHashTable. + */ void ev_metadata_manager_init (void) { - ev_metadata_manager = g_new0 (EvMetadataManager, 1); + ev_metadata_manager = g_slice_new0 (EvMetadataManager); ev_metadata_manager->values_loaded = FALSE; - ev_metadata_manager->modified = FALSE; ev_metadata_manager->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, item_free); - - ev_metadata_manager->timeout_id = - g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, - 2000, /* 2 sec */ - (GSourceFunc)ev_metadata_manager_save, - NULL, - NULL); } /* This function must be called before exiting ev */ @@ -116,14 +135,16 @@ ev_metadata_manager_shutdown (void) if (ev_metadata_manager == NULL) return; - g_source_remove (ev_metadata_manager->timeout_id); - - ev_metadata_manager_save (NULL); + if (ev_metadata_manager->timeout_id) { + g_source_remove (ev_metadata_manager->timeout_id); + ev_metadata_manager->timeout_id = 0; + ev_metadata_manager_save (NULL); + } if (ev_metadata_manager->items != NULL) g_hash_table_destroy (ev_metadata_manager->items); - g_free (ev_metadata_manager); + g_slice_free (EvMetadataManager, ev_metadata_manager); ev_metadata_manager = NULL; } @@ -133,7 +154,7 @@ value_free (gpointer data) GValue *value = (GValue *)data; g_value_unset (value); - g_free (value); + g_slice_free (GValue, value); } static GValue * @@ -143,7 +164,7 @@ parse_value (xmlChar *value, xmlChar *type) GValue *ret; ret_type = g_type_from_name ((char *)type); - ret = g_new0 (GValue, 1); + ret = g_slice_new0 (GValue); g_value_init (ret, ret_type); switch (ret_type) { @@ -186,7 +207,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur) return; } - item = g_new0 (Item, 1); + item = g_slice_new0 (Item); item->atime = g_ascii_strtoull((char*)atime, NULL, 0); @@ -268,7 +289,7 @@ load_values () cur = xmlDocGetRootElement (doc); if (cur == NULL) { - g_message ("The metadata file '%s' is empty", METADATA_FILE); + g_message ("The metadata file “%s” is empty", METADATA_FILE); xmlFreeDoc (doc); return FALSE; @@ -276,7 +297,7 @@ load_values () if (xmlStrcmp (cur->name, (const xmlChar *) "metadata")) { - g_message ("File '%s' is of the wrong type", METADATA_FILE); + g_message ("File “%s” is of the wrong type", METADATA_FILE); xmlFreeDoc (doc); return FALSE; @@ -347,7 +368,7 @@ ev_metadata_manager_set_last (const gchar *key, if (item == NULL) { - item = g_new0 (Item, 1); + item = g_slice_new0 (Item); g_hash_table_insert (ev_metadata_manager->items, g_strdup (LAST_URI), @@ -362,7 +383,7 @@ ev_metadata_manager_set_last (const gchar *key, if (value != NULL) { GValue *new; - new = g_new0 (GValue, 1); + new = g_slice_new0 (GValue); g_value_init (new, G_VALUE_TYPE (value)); g_value_copy (value, new); @@ -375,12 +396,12 @@ ev_metadata_manager_set_last (const gchar *key, } item->atime = time (NULL); - ev_metadata_manager->modified = TRUE; + ev_metadata_arm_timeout (); return; } /** - * ev_metadata_manager_set: + * ev_metadata_manager_get: * @uri: Uri to set data for, if @NULL, we return default value * @key: Key to set uri * @value: GValue struct filled up with value @@ -480,7 +501,7 @@ ev_metadata_manager_set (const gchar *uri, if (item == NULL) { - item = g_new0 (Item, 1); + item = g_slice_new0 (Item); g_hash_table_insert (ev_metadata_manager->items, g_strdup (uri), @@ -495,7 +516,7 @@ ev_metadata_manager_set (const gchar *uri, if (value != NULL) { GValue *new; - new = g_new0 (GValue, 1); + new = g_slice_new0 (GValue); g_value_init (new, G_VALUE_TYPE (value)); g_value_copy (value, new); @@ -510,7 +531,7 @@ ev_metadata_manager_set (const gchar *uri, item->atime = time (NULL); - ev_metadata_manager->modified = TRUE; + ev_metadata_arm_timeout (); } static void @@ -533,14 +554,18 @@ save_values (const gchar *key, GValue *value, xmlNodePtr parent) switch (G_VALUE_TYPE (value)) { case G_TYPE_STRING: - string_value = g_strdup (g_value_get_string (value)); + string_value = g_value_dup_string (value); break; case G_TYPE_INT: string_value = g_strdup_printf ("%d", g_value_get_int (value)); break; case G_TYPE_DOUBLE: - string_value = g_strdup_printf ("%f", g_value_get_double (value)); - break; + { + gchar buf[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, g_value_get_double (value)); + string_value = g_strdup (buf); + } + break; case G_TYPE_BOOLEAN: string_value = g_strdup_printf ("%d", g_value_get_boolean (value)); break; @@ -627,8 +652,7 @@ ev_metadata_manager_save (gpointer data) xmlNodePtr root; gchar *file_name; - if (!ev_metadata_manager->modified) - return TRUE; + ev_metadata_manager->timeout_id = 0; resize_items (); @@ -652,9 +676,7 @@ ev_metadata_manager_save (gpointer data) xmlFreeDoc (doc); - ev_metadata_manager->modified = FALSE; - - return TRUE; + return FALSE; } void