Changeset 13826

Timestamp:

Jan 21, 2013, 9:14:14 PM (8 years ago)

Author:

jordan

Message:

(libT) #4632 'custom blocklist generates 2x # of rules': add a fix, which causes r13825's test to pass

Location:

trunk/libtransmission

Files:

• ptrarray.h (modified) (1 diff)
• session.c (modified) (5 diffs)

trunk/libtransmission/ptrarray.h

@@ -37 +37 @@
 }
 tr_ptrArray;
+
+typedef int (*PtrArrayCompareFunc)(const void * a, const void * b);
 
 typedef void (*PtrArrayForeachFunc)(void *);

trunk/libtransmission/session.c

@@ -612 +612 @@
     tr_runInEventThread (session, tr_sessionInitImpl, &data);
     while (!data.done)
-        tr_wait_msec (100);
+        tr_wait_msec (50);
 
     return session;
@@ -728 +728 @@
 
     tr_webInit (session);
+    while (session->web == NULL)
+      tr_wait_msec (50);
 
     tr_sessionSet (session, &settings);
@@ -1844 +1846 @@
         dbgmsg ("waiting on port unmap (%p) or announcer (%p)... now %zu deadline %zu",
                 session->shared, session->announcer, (size_t)time (NULL), (size_t)deadline);
-        tr_wait_msec (100);
+        tr_wait_msec (50);
     }
 
@@ -1855 +1857 @@
         static bool forced = false;
         dbgmsg ("waiting for libtransmission thread to finish... now %zu deadline %zu", (size_t)time (NULL), (size_t)deadline);
-        tr_wait_msec (500);
+        tr_wait_msec (100);
         if (deadlineReached (deadline) && !forced)
         {
@@ -2184 +2186 @@
 loadBlocklists (tr_session * session)
 {
-    int         binCount = 0;
-    int         newCount = 0;
-    struct stat sb;
-    char      * dirname;
-    DIR *       odir = NULL;
-    tr_list *   list = NULL;
-    const bool  isEnabled = session->isBlocklistEnabled;
-
-    /* walk through the directory and find blocklists */
-    dirname = tr_buildPath (session->configDir, "blocklists", NULL);
-    if (!stat (dirname,
-               &sb) && S_ISDIR (sb.st_mode)
-      && ((odir = opendir (dirname))))
+  DIR * odir;
+  char * dirname;
+  struct dirent * d;
+  tr_list * blocklists = NULL;
+  tr_ptrArray loadme = TR_PTR_ARRAY_INIT;
+  const bool isEnabled = session->isBlocklistEnabled;
+
+  /* walk the blocklist directory... */
+  dirname = tr_buildPath (session->configDir, "blocklists", NULL);
+  odir = opendir (dirname);
+  while ((d = readdir (odir)))
     {
-        struct dirent *d;
-        for (d = readdir (odir); d; d = readdir (odir))
+      char * path;
+      char * load = NULL;
+ 
+      if (!d->d_name || (d->d_name[0]=='.')) /* ignore dotfiles */
+        continue;
+
+      path = tr_buildPath (dirname, d->d_name, NULL);
+
+      if (tr_stringEndsWith (path, ".bin"))
         {
-            char * filename;
-
-            if (!d->d_name || d->d_name[0] == '.') /* skip dotfiles, ., and ..
-                                                      */
-                continue;
-
-            filename = tr_buildPath (dirname, d->d_name, NULL);
-
-            if (tr_stringEndsWith (filename, ".bin"))
+          load = tr_strdup (path);
+        }
+      else
+        {
+          char * binname;
+          char * basename;
+          time_t path_mtime = 0;
+          time_t binname_mtime = 0;
+
+          basename = tr_basename (d->d_name);
+          binname = tr_strdup_printf ("%s" TR_PATH_DELIMITER_STR "%s.bin", dirname, basename);
+
+          if (!tr_fileExists (binname, &binname_mtime)) /* create it */
             {
-                /* if we don't already have this blocklist, add it */
-                if (!tr_list_find (list, filename,
-                                 (TrListCompareFunc)strcmp))
+              tr_blocklistFile * b = tr_blocklistFileNew (binname, isEnabled);
+              const int n = tr_blocklistFileSetContent (b, path);
+              if (n > 0)
+                load = tr_strdup (binname);
+
+              tr_blocklistFileFree (b);
+            }
+          else if (tr_fileExists(path,&path_mtime) && (path_mtime>=binname_mtime)) /* update it */
+            {
+              char * old;
+              tr_blocklistFile * b;
+
+              old = tr_strdup_printf ("%s.old", binname);
+              remove (old);
+              rename (binname, old);
+              b = tr_blocklistFileNew (binname, isEnabled);
+              if (tr_blocklistFileSetContent (b, path) > 0)
                 {
-                    tr_list_append (&list,
-                                   tr_blocklistFileNew (filename, isEnabled));
-                    ++binCount;
+                  remove (old);
                 }
+              else
+                {
+                  remove (binname);
+                  rename (old, binname);
+                }
+
+              tr_blocklistFileFree (b);
+              tr_free (old);
             }
-            else
-            {
-                /* strip out the file suffix, if there is one, and add ".bin"
-                  instead */
-                tr_blocklistFile * b;
-                const char *   dot = strrchr (d->d_name, '.');
-                const int      len = dot ? dot - d->d_name
-                                         : (int)strlen (d->d_name);
-                char         * tmp = tr_strdup_printf (
-                                        "%s" TR_PATH_DELIMITER_STR "%*.*s.bin",
-                                        dirname, len, len, d->d_name);
-                b = tr_blocklistFileNew (tmp, isEnabled);
-                tr_blocklistFileSetContent (b, filename);
-                tr_list_append (&list, b);
-                ++newCount;
-                tr_free (tmp);
-            }
-
-            tr_free (filename);
+
+          tr_free (basename);
+          tr_free (binname);
         }
 
-        closedir (odir);
-    }
-
-    session->blocklists = list;
-
-    if (binCount)
-        tr_dbg ("Found %d blocklists in \"%s\"", binCount, dirname);
-    if (newCount)
-        tr_dbg ("Found %d new blocklists in \"%s\"", newCount, dirname);
-
-    tr_free (dirname);
+      if (load != NULL)
+        {
+          if (tr_ptrArrayFindSorted (&loadme, load, (PtrArrayCompareFunc)strcmp) == NULL)
+            tr_ptrArrayInsertSorted (&loadme, load, (PtrArrayCompareFunc)strcmp);
+          else
+            tr_free (load);
+        }
+
+      tr_free (path);
+    }
+
+  if (!tr_ptrArrayEmpty (&loadme))
+    {
+      int i;
+      const int n = tr_ptrArraySize (&loadme);
+      const char ** paths = (const char **) tr_ptrArrayBase (&loadme);
+
+      for (i=0; i<n; ++i)
+        tr_list_append (&blocklists, tr_blocklistFileNew (paths[i], isEnabled));
+    }
+
+  /* cleanup */
+  closedir (odir);
+  tr_free (dirname);
+  tr_ptrArrayDestruct (&loadme, (PtrArrayForeachFunc)tr_free);
+  session->blocklists = blocklists;
 }