Changeset 5242

Timestamp:

Mar 13, 2008, 1:06:54 AM (15 years ago)

Author:

charles

Message:

(gtk) clean up the "watch directory" code a little.

File:

• trunk/gtk/tr-core.c (modified) (3 diffs)

trunk/gtk/tr-core.c

@@ -327 +327 @@
 
 static void
+maybeAddTorrent( TrCore * core, const char * filename )
+{
+    const gboolean isTorrent = g_str_has_suffix( filename, ".torrent" );
+
+    if( isTorrent )
+    {
+        struct TrCorePrivate * p = core->priv;
+
+        if( !g_list_find_custom( p->monitor_files, filename, (GCompareFunc)strcmp ) )
+            p->monitor_files = g_list_append( p->monitor_files, g_strdup( filename ) );
+        if( !p->monitor_idle_tag )
+            p->monitor_idle_tag = g_timeout_add( 1000, watchFolderIdle, core );
+    }
+}
+
+static void
 watchFolderChanged( GFileMonitor       * monitor UNUSED,
                     GFile              * file,
@@ -336 +352 @@
     {
         char * filename = g_file_get_path( file );
-        const gboolean isTorrent = g_str_has_suffix( filename, ".torrent" );
-
-        if( isTorrent )
-        {
-            struct TrCorePrivate * p = TR_CORE( core )->priv;
-
-            if( !g_list_find_custom( p->monitor_files, filename, (GCompareFunc)strcmp ) )
-                p->monitor_files = g_list_append( p->monitor_files, g_strdup( filename ) );
-            if( !p->monitor_idle_tag )
-                p->monitor_idle_tag = g_timeout_add( 1000, watchFolderIdle, core );
-        }
-
+        maybeAddTorrent( core, filename );
         g_free( filename );
     }
@@ -358 +363 @@
     if( isEnabled )
     {
-        GList * torrents = NULL;
         char * dirname = pref_string_get( PREF_KEY_DIR_WATCH );
         GDir * dir = g_dir_open( dirname, 0, NULL );
         const char * basename;
-        while(( basename = g_dir_read_name( dir )))
-            if( g_str_has_suffix( basename, ".torrent" ) )
-                torrents = g_list_append( torrents, g_build_filename( dirname, basename, NULL ) );
-        if( torrents )
-            tr_core_add_list( core, torrents, tr_ctorNew( core->priv->handle ) );
+        while(( basename = g_dir_read_name( dir ))) {
+            char * filename = g_build_filename( dirname, basename, NULL );
+            maybeAddTorrent( core, filename );
+            g_free( filename );
+        }
         g_free( dirname );
     }