Changeset 6013

Timestamp:

Jun 3, 2008, 5:55:43 PM (14 years ago)

Author:

livings124

Message:

implement most of the rpc preferences updating

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (3 diffs)
• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -269 +269 @@
 
 - (void) rpcCallback: (tr_rpc_callback_type) type forTorrentStruct: (struct tr_torrent *) torrentStruct;
+- (void) rpcAddTorrentStruct: (NSValue *) torrentStructPtr;
+- (void) rpcRemoveTorrent: (Torrent *) torrent;
+- (void) rpcStartedStoppedTorrent: (Torrent *) torrent;
+- (void) rpcChangedTorrent: (Torrent *) torrent;
 
 @end

trunk/macosx/Controller.m

@@ -4160 +4160 @@
     
     //get the torrent
-    Torrent * torrent;
+    Torrent * torrent = nil;
     if (torrentStruct != NULL && (type != TR_RPC_TORRENT_ADDED && type != TR_RPC_SESSION_CHANGED))
     {
@@ -4198 +4198 @@
         
         case TR_RPC_SESSION_CHANGED:
+            [fPrefsController performSelectorOnMainThread: @selector(rpcUpdatePrefs) withObject: nil waitUntilDone: NO];
             break;
         
         default:
             NSLog(@"Unknown RPC command received!");
+            [torrent release];
     }
     
@@ -4249 +4251 @@
     if ([[fTableView selectedTorrents] containsObject: torrent])
     {
+        #warning update the file table as well
+        
         [fInfoController updateInfoStats];
         [fInfoController updateOptions];

trunk/macosx/PrefsController.h

@@ -117 +117 @@
 - (void) helpForNetwork: (id) sender;
 
+- (void) rpcUpdatePrefs;
+
 @end

trunk/macosx/PrefsController.m

@@ -625 +625 @@
 }
 
+- (void) rpcUpdatePrefs
+{
+    //encryption
+    tr_encryption_mode encryptionMode = tr_sessionGetEncryption(fHandle);
+    [fDefaults setBool: encryptionMode != TR_PLAINTEXT_PREFERRED forKey: @"EncryptionPrefer"];
+    [fDefaults setBool: encryptionMode == TR_ENCRYPTION_PREFERRED forKey: @"EncryptionPrefer"];
+    
+    //download directory
+    #warning missing!
+    
+    //peers
+    uint16_t peersTotal = tr_sessionGetPeerLimit(fHandle);
+    [fDefaults setInteger: peersTotal forKey: @"PeersTotal"];
+    
+    //pex
+    BOOL pex = tr_sessionIsPexEnabled(fHandle);
+    [fDefaults setBool: pex forKey: @"PEXGlobal"];
+    
+    //port
+    int port = tr_sessionGetPeerPort(fHandle);
+    [fDefaults setInteger: port forKey: @"BindPort"];
+    
+    BOOL nat = tr_sessionIsPortForwardingEnabled(fHandle);
+    [fDefaults setBool: nat forKey: @"NatTraversal"];
+    
+    fPeerPort = -1;
+    fNatStatus = -1;
+    [self updatePortStatus];
+    
+    //speed limit - down
+    BOOL downLimitEnabled = tr_sessionIsSpeedLimitEnabled(fHandle, TR_DOWN);
+    [fDefaults setBool: downLimitEnabled forKey: @"CheckDownload"];
+    
+    int downLimit = tr_sessionGetSpeedLimit(fHandle, TR_DOWN);
+    [fDefaults setInteger: downLimit forKey: @"DownloadLimit"];
+    
+    //speed limit - up
+    BOOL upLimitEnabled = tr_sessionIsSpeedLimitEnabled(fHandle, TR_UP);
+    [fDefaults setBool: upLimitEnabled forKey: @"CheckUpload"];
+    
+    int upLimit = tr_sessionGetSpeedLimit(fHandle, TR_UP);
+    [fDefaults setInteger: upLimit forKey: @"UploadLimit"];
+    
+    
+    //update gui if necessary
+    if (fHasLoaded)
+    {
+        //encryption handled by bindings
+        
+        [fPeersGlobalField setIntValue: peersTotal];
+        
+        //pex handled by bindings
+        
+        [fPortField setIntValue: port];
+        //port forwarding (nat) handled by bindings
+        
+        //limit check handled by bindings
+        [fDownloadField setIntValue: downLimit];
+        
+        //limit check handled by bindings
+        [fUploadField setIntValue: upLimit];
+    }
+}
+
 @end