Changeset 5232

Timestamp:

Mar 9, 2008, 10:11:36 PM (14 years ago)

Author:

charles

Message:

(gtk) in the "watch directory" feature, better handling of when the user changes the watch directory via the preferences dialog

File:

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

trunk/gtk/tr-core.c

@@ -44 +44 @@
 #ifdef HAVE_GIO
     GFileMonitor     * monitor;
+    gulong             monitor_tag;
+    char             * monitor_path;
 #endif
     GtkTreeModel     * model;
@@ -284 +286 @@
 }
 
+static void
+tr_core_apply_defaults( tr_ctor * ctor )
+{
+    if( tr_ctorGetPaused( ctor, TR_FORCE, NULL ) )
+        tr_ctorSetPaused( ctor, TR_FORCE, !pref_flag_get( PREF_KEY_START ) );
+
+    if( tr_ctorGetDeleteSource( ctor, NULL ) ) 
+        tr_ctorSetDeleteSource( ctor, pref_flag_get( PREF_KEY_TRASH_ORIGINAL ) ); 
+
+    if( tr_ctorGetMaxConnectedPeers( ctor, TR_FORCE, NULL ) )
+        tr_ctorSetMaxConnectedPeers( ctor, TR_FORCE,
+                              pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
+
+    if( tr_ctorGetDestination( ctor, TR_FORCE, NULL ) ) {
+        char * path = pref_string_get( PREF_KEY_DIR_DEFAULT );
+        tr_ctorSetDestination( ctor, TR_FORCE, path );
+        g_free( path );
+    }
+}
+
 #ifdef HAVE_GIO
+static gboolean
+canAddTorrent( TrCore * core, const char * filename )
+{
+    gboolean canAdd;
+    tr_ctor * ctor = tr_ctorNew( core->priv->handle );
+    tr_core_apply_defaults( ctor );
+    tr_ctorSetMetainfoFromFile( ctor, filename );
+    canAdd = !tr_torrentParse( core->priv->handle, ctor, NULL );
+    tr_ctorFree( ctor );
+    return canAdd;
+}
+
 static void
 watchFolderChanged( GFileMonitor       * monitor UNUSED,
@@ -297 +331 @@
         char * filename = g_file_get_path( file );
         const gboolean isTorrent = g_str_has_suffix( filename, ".torrent" );
-        if( isTorrent )
+
+        if( isTorrent && canAddTorrent( core, filename ) )
         {
             tr_ctor * ctor = tr_ctorNew( core->priv->handle );
             tr_core_add_list( core, g_list_append( NULL, g_strdup( filename ) ), ctor );
         }
+
         g_free( filename );
     }
@@ -331 +367 @@
     const gboolean isEnabled = pref_flag_get( PREF_KEY_DIR_WATCH_ENABLED );
 
-    if( core->priv->monitor && !isEnabled )
-    {
-        GFileMonitor * m = core->priv->monitor;
+    if( core->priv->monitor && ( !isEnabled || tr_strcmp( filename, core->priv->monitor_path ) ) )
+    {
+        g_signal_handler_disconnect( core->priv->monitor, core->priv->monitor_tag );
+        g_free( core->priv->monitor_path );
+        g_file_monitor_cancel( core->priv->monitor );
+        g_object_unref( G_OBJECT( core->priv->monitor ) );
+        core->priv->monitor_path = NULL;
         core->priv->monitor = NULL;
-        g_signal_handlers_disconnect_by_func( m, watchFolderChanged, core );
-        g_file_monitor_cancel( m );
-        g_object_unref( G_OBJECT( m ) );
-    }
-    else if( isEnabled && !core->priv->monitor )
+        core->priv->monitor_tag = 0;
+    }
+
+    if( isEnabled && !core->priv->monitor )
     {
         GFile * file = g_file_new_for_path( filename );
         GFileMonitor * m = g_file_monitor_directory( file, 0, NULL, NULL );
         scanWatchDir( core );
-        g_signal_connect( m, "changed", G_CALLBACK (watchFolderChanged), core );
         core->priv->monitor = m;
+        core->priv->monitor_path = g_strdup( filename );
+        core->priv->monitor_tag = g_signal_connect( m, "changed", G_CALLBACK (watchFolderChanged), core );
     }
 
@@ -576 +616 @@
 }
 
-static void
-tr_core_apply_defaults( tr_ctor * ctor )
-{
-    if( tr_ctorGetPaused( ctor, TR_FORCE, NULL ) )
-        tr_ctorSetPaused( ctor, TR_FORCE, !pref_flag_get( PREF_KEY_START ) );
-
-    if( tr_ctorGetDeleteSource( ctor, NULL ) ) 
-        tr_ctorSetDeleteSource( ctor, pref_flag_get( PREF_KEY_TRASH_ORIGINAL ) ); 
-
-    if( tr_ctorGetMaxConnectedPeers( ctor, TR_FORCE, NULL ) )
-        tr_ctorSetMaxConnectedPeers( ctor, TR_FORCE,
-                              pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
-
-    if( tr_ctorGetDestination( ctor, TR_FORCE, NULL ) ) {
-        char * path = pref_string_get( PREF_KEY_DIR_DEFAULT );
-        tr_ctorSetDestination( ctor, TR_FORCE, path );
-        g_free( path );
-    }
-}
-
 void
 tr_core_add_ctor( TrCore * self, tr_ctor * ctor )