debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adblock: use fs modification time to prevent unneded downloads

Browse source
This commit is contained in:
Paweł Forysiuk 2012-09-07 19:59:37 +02:00 committed by Christian Dywan
parent 9af985e7e8
commit f29318af7c
1 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
extensions/adblock.c
View file

@ -1568,6 +1568,7 @@ adblock_file_is_up_to_date (gchar* path)
gchar* timestamp = NULL; gchar* timestamp = NULL;
guint i; guint i;
gboolean found_meta = FALSE; gboolean found_meta = FALSE;
gint fs_days_elapsed, days_elapsed = 0, least_days;
for (i = 0; i <= 10; i++) for (i = 0; i <= 10; i++)
{ {
@ -1609,10 +1610,32 @@ adblock_file_is_up_to_date (gchar* path)
return FALSE; return FALSE;
} }
/* query filesystem about file change, maybe there is no update yet
* or there is no "modified" metadata to check, otherwise we will repeatedly
* download files that have no new updates */
{
GDate* current = g_date_new ();
GDate* fs_mod_date = g_date_new ();
GTimeVal mod_time;
GFile* filter_file = g_file_new_for_path (path);
GFileInfo* info = g_file_query_info (filter_file, "time:modified", 0, NULL, NULL);
g_file_info_get_modification_time (info, &mod_time);
g_date_set_time_t (current, time (NULL));
g_date_set_time_val (fs_mod_date, &mod_time);
fs_days_elapsed = g_date_days_between (fs_mod_date, current);
g_date_free (current);
g_date_free (fs_mod_date);
}
/* If there is no update metadata but file is valid, assume one week */
if ((!days_to_expire && !timestamp) && fs_days_elapsed < 7)
return TRUE;
if (days_to_expire && timestamp != NULL) if (days_to_expire && timestamp != NULL)
{ {
gint days_elapsed = 0;
GDate* current = g_date_new (); GDate* current = g_date_new ();
GDate* mod_date = g_date_new (); GDate* mod_date = g_date_new ();
gchar** parts; gchar** parts;
@ -1643,8 +1666,9 @@ adblock_file_is_up_to_date (gchar* path)
g_date_free (current); g_date_free (current);
g_date_free (mod_date); g_date_free (mod_date);
g_free (timestamp); g_free (timestamp);
}
/* File from the future? Assume up to date, not to loop */ /* File from the future? Assume up to date */
if (days_elapsed < 0) if (days_elapsed < 0)
{ {
g_print ("Adblock: file %s appears to be from the future," g_print ("Adblock: file %s appears to be from the future,"
@ -1652,13 +1676,12 @@ adblock_file_is_up_to_date (gchar* path)
return TRUE; return TRUE;
} }
if (days_elapsed < days_to_expire) least_days = days_elapsed < fs_days_elapsed ? days_elapsed : fs_days_elapsed;
if (least_days < days_to_expire)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
}
else
g_free (timestamp);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;