Changeset 2463

Timestamp:

Jul 23, 2007, 3:03:45 AM (16 years ago)

Author:

charles

Message:

use tr_loadTorrents() during startup.

Location:

trunk/gtk

Files:

• main.c (modified) (3 diffs)
• tr_core.c (modified) (3 diffs)
• tr_core.h (modified) (1 diff)
• tr_torrent.c (modified) (1 diff)
• tr_torrent.h (modified) (1 diff)

trunk/gtk/main.c

@@ -413 +413 @@
 
     /* add torrents from command-line and saved state */
-    if( NULL != state )
-    {
-        tr_core_load( cbdata->core, state, paused );
-    }
+    tr_core_load( cbdata->core, paused );
+
     if( NULL != args )
     {
@@ -736 +734 @@
     {
         PREF_ID_PORT,
+        PREF_ID_DOWNLIMIT,
         PREF_ID_USEDOWNLIMIT,
+        PREF_ID_UPLIMIT,
         PREF_ID_USEUPLIMIT,
         PREF_ID_NAT,
@@ -753 +753 @@
 prefschanged( TrCore * core SHUTUP, int id, gpointer data )
 {
-    struct cbdata * cbdata;
-    tr_handle_t   * tr;
+    struct cbdata * cbdata = data;
+    tr_handle_t   * tr     = tr_core_handle( cbdata->core );
     gboolean        boolval;
-
-    cbdata = data;
-    tr     = tr_core_handle( cbdata->core );
 
     switch( id )

trunk/gtk/tr_core.c

@@ -32 +32 @@
 #include <libtransmission/bencode.h>
 #include <libtransmission/transmission.h>
+#include <libtransmission/utils.h>
 
 #include "conf.h"
@@ -402 +403 @@
 
 int
-tr_core_load( TrCore * self, const benc_val_t * state, gboolean forcepaused )
-{
+tr_core_load( TrCore * self, gboolean forcepaused )
+{
+    int i;
+    int flags;
     int count = 0;
-
-    TR_IS_CORE( self );
-
-    if( TYPE_LIST == state->type )
-    {
-        int ii;
-        for( ii = 0; ii < state->val.l.count; ii++ )
-        {
-            char * errstr = NULL;
-            TrTorrent * tor = tr_torrent_new_with_state( self->handle,
-                                                     state->val.l.vals + ii,
-                                                     forcepaused, &errstr );
-            if( NULL == tor )
-            {
-                tr_core_errsig( self, TR_CORE_ERR_ADD_TORRENT, errstr );
-                g_free( errstr );
-            }
-            else
-            {
-                g_assert( NULL == errstr );
-                tr_core_insert( self, tor );
-                count++;
-            }
-        }
-    }
+    tr_torrent_t ** torrents;
+    const char * destination;
+
+    TR_IS_CORE( self );
+
+    destination = getdownloaddir( );
+
+    flags = 0;
+    if( forcepaused )
+         flags |= TR_FLAG_PAUSED;
+
+    torrents = tr_loadTorrents ( self->handle, destination, flags, &count );
+    for( i=0; i<count; ++i )
+        tr_core_insert( self, tr_torrent_new_preexisting( torrents[i] ) );
+    tr_free( torrents );
 
     return count;
@@ -560 +553 @@
     gtk_tree_model_get( self->model, iter, MC_TORRENT, &tor, -1 );
     gtk_list_store_remove( GTK_LIST_STORE( self->model ), iter );
-
-    if( TR_FLAG_SAVE & tr_torrent_info( tor )->flags )
-        tr_torrentRemoveSaved( tr_torrent_handle( tor ) );
+    tr_torrentRemoveSaved( tr_torrent_handle( tor ) );
 
     tr_torrent_sever( tor );

trunk/gtk/tr_core.h

@@ -125 +125 @@
    or more "error" signals with TR_CORE_ERR_ADD_TORRENT */
 int
-tr_core_load( TrCore * self, const benc_val_t * state, gboolean forcepaused );
+tr_core_load( TrCore * self, gboolean forcepaused );
 
 /* Any the tr_core_add functions below may trigger an "error" signal

trunk/gtk/tr_torrent.c

@@ -292 +292 @@
 }
 
+TrTorrent*
+tr_torrent_new_preexisting( tr_torrent_t * tor )
+{
+    return maketorrent( tor );
+}
+
+
 TrTorrent *
 tr_torrent_new( tr_handle_t * back, const char *torrent, const char *dir,

trunk/gtk/tr_torrent.h

@@ -100 +100 @@
 
 TrTorrent *
+tr_torrent_new_preexisting( tr_torrent_t * tor );
+
+TrTorrent *
 tr_torrent_new( tr_handle_t * handle, const char * path, const char * dir,
                 enum tr_torrent_action act, gboolean paused, char ** err);