X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-metadata-manager.c;h=63ef5e7381ee4c581729fc8fb08c974a5d98dac0;hb=21f638ab8e3ddb81ce7979939defcdb7f49ad376;hp=196f3408638adff16442c7a867017ec001a302cb;hpb=96b7b39d956756ad5e354b67e7da4d2a73415cb3;p=evince.git diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index 196f3408..63ef5e73 100644 --- a/shell/ev-metadata-manager.c +++ b/shell/ev-metadata-manager.c @@ -87,6 +87,17 @@ item_free (gpointer data) g_free (item); } +void ev_metadata_arm_timeout(void) +{ + if (ev_metadata_manager->timeout_id) + return; + ev_metadata_manager->timeout_id = + g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, + 2000, /* 2 sec */ + (GSourceFunc)ev_metadata_manager_save, + NULL, + NULL); +} void ev_metadata_manager_init (void) { @@ -101,12 +112,6 @@ ev_metadata_manager_init (void) 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,7 +121,8 @@ ev_metadata_manager_shutdown (void) if (ev_metadata_manager == NULL) return; - g_source_remove (ev_metadata_manager->timeout_id); + if (ev_metadata_manager->timeout_id) + g_source_remove (ev_metadata_manager->timeout_id); ev_metadata_manager_save (NULL); @@ -127,6 +133,15 @@ ev_metadata_manager_shutdown (void) ev_metadata_manager = NULL; } +static void +value_free (gpointer data) +{ + GValue *value = (GValue *)data; + + g_value_unset (value); + g_free (value); +} + static GValue * parse_value (xmlChar *value, xmlChar *type) { @@ -142,13 +157,13 @@ parse_value (xmlChar *value, xmlChar *type) g_value_set_string (ret, (char *)value); break; case G_TYPE_INT: - g_value_set_int (ret, atoi ((char *)value)); + g_value_set_int (ret, g_ascii_strtoull ((char *)value, NULL, 0)); break; case G_TYPE_DOUBLE: g_value_set_double (ret, g_ascii_strtod ((char *)value, NULL)); break; case G_TYPE_BOOLEAN: - g_value_set_boolean (ret, atoi ((char *)value)); + g_value_set_boolean (ret, g_ascii_strtoull ((char *)value, NULL, 0)); break; } @@ -179,12 +194,12 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur) item = g_new0 (Item, 1); - item->atime = atol ((char *)atime); + item->atime = g_ascii_strtoull((char*)atime, NULL, 0); item->values = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, - g_free); + value_free); cur = cur->xmlChildrenNode; @@ -195,7 +210,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur) xmlChar *key; xmlChar *xml_value; xmlChar *type; - GValue *value; + GValue *value; key = xmlGetProp (cur, (const xmlChar *)"key"); xml_value = xmlGetProp (cur, (const xmlChar *)"value"); @@ -209,6 +224,8 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur) if (key != NULL) xmlFree (key); + if (type != NULL) + xmlFree (type); if (xml_value != NULL) xmlFree (xml_value); } @@ -257,7 +274,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; @@ -265,7 +282,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; @@ -286,16 +303,6 @@ load_values () return TRUE; } -static void -value_free (gpointer data) -{ - GValue *value = (GValue *)data; - - g_value_unset (value); - g_free (value); -} - - #define LAST_URI "last-used-value" static gboolean @@ -375,9 +382,21 @@ 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: + * @uri: Uri to set data for, if @NULL, we return default value + * @key: Key to set uri + * @value: GValue struct filled up with value + * @ignore_last: if @TRUE, default value is ignored + * + * Retrieve value for uri in metadata database + * + * Returns: @TRUE if value was taken. + **/ gboolean ev_metadata_manager_get (const gchar *uri, const gchar *key, @@ -427,6 +446,14 @@ ev_metadata_manager_get (const gchar *uri, return ev_metadata_manager_get_last (key, value, ignore_last); } +/** + * ev_metadata_manager_set: + * @uri: Uri to set data for, if @NULL, we set default value + * @key: Key to set uri + * @value: GValue struct containing value + * + * Set value for key in metadata database + **/ void ev_metadata_manager_set (const gchar *uri, const gchar *key, @@ -491,6 +518,7 @@ ev_metadata_manager_set (const gchar *uri, item->atime = time (NULL); ev_metadata_manager->modified = TRUE; + ev_metadata_arm_timeout(); } static void @@ -519,8 +547,12 @@ save_values (const gchar *key, GValue *value, xmlNodePtr parent) 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_printf ("%s", buf); + } + break; case G_TYPE_BOOLEAN: string_value = g_strdup_printf ("%d", g_value_get_boolean (value)); break; @@ -550,10 +582,8 @@ save_item (const gchar *key, const gpointer *data, xmlNodePtr parent) xmlSetProp (xml_node, (const xmlChar *)"uri", (const xmlChar *)key); - /* FIXME: is the cast right? - Paolo */ - atime = g_strdup_printf ("%d", (int)item->atime); - xmlSetProp (xml_node, (const xmlChar *)"atime", (const xmlChar *)atime); - + atime = g_strdup_printf ("%ld", item->atime); + xmlSetProp (xml_node, (const xmlChar *)"atime", (const xmlChar *)atime); g_free (atime); g_hash_table_foreach (item->values, @@ -609,8 +639,10 @@ ev_metadata_manager_save (gpointer data) xmlNodePtr root; gchar *file_name; + ev_metadata_manager->timeout_id = 0; + if (!ev_metadata_manager->modified) - return TRUE; + return FALSE; resize_items (); @@ -636,7 +668,7 @@ ev_metadata_manager_save (gpointer data) ev_metadata_manager->modified = FALSE; - return TRUE; + return FALSE; } void