]> granicus.if.org Git - transmission/commitdiff
update project for new rpc code (part 2)
authorMitchell Livingston <livings124@transmissionbt.com>
Mon, 19 May 2008 01:05:14 +0000 (01:05 +0000)
committerMitchell Livingston <livings124@transmissionbt.com>
Mon, 19 May 2008 01:05:14 +0000 (01:05 +0000)
Transmission.xcodeproj/project.pbxproj
macosx/Controller.m
macosx/Defaults.plist
macosx/Torrent.m
macosx/it.lproj/InfoPlist.strings
macosx/ru.lproj/InfoPlist.strings
macosx/zh_TW.lproj/InfoPlist.strings

index dd4846d52ba1f936667236c65a7d2f73b95e3b81..3c02f5d0a133c21d929585f6ca24d11f72065714 100644 (file)
                A2A306620AAD24A80049E2AC /* UKMainThreadProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A3065A0AAD24A80049E2AC /* UKMainThreadProxy.m */; };
                A2A4E9210DE0F7E9000CE197 /* web.h in Headers */ = {isa = PBXBuildFile; fileRef = A29EBE530DC01FC9006CEE80 /* web.h */; };
                A2A4E9220DE0F7EB000CE197 /* web.c in Sources */ = {isa = PBXBuildFile; fileRef = A29EBE520DC01FC9006CEE80 /* web.c */; };
+               A2A4E9870DE10399000CE197 /* json.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A4E9840DE1038C000CE197 /* json.h */; };
+               A2A4E9880DE1039C000CE197 /* json.c in Sources */ = {isa = PBXBuildFile; fileRef = A2A4E9830DE1038C000CE197 /* json.c */; };
+               A2A4E99F0DE10429000CE197 /* JSON_checker.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A4E99B0DE10424000CE197 /* JSON_checker.h */; };
+               A2A4E9A00DE1042A000CE197 /* JSON_checker.c in Sources */ = {isa = PBXBuildFile; fileRef = A2A4E99A0DE10424000CE197 /* JSON_checker.c */; };
+               A2A4E9F40DE10539000CE197 /* shttpd.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AAB6D60DE0D5A400E04DDA /* shttpd.h */; };
+               A2A4E9FA0DE10623000CE197 /* libshttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A2AAB6BB0DE0D55D00E04DDA /* libshttpd.dylib */; };
+               A2A4E9FD0DE10643000CE197 /* defs.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A4E9FC0DE10643000CE197 /* defs.h */; };
+               A2A4E9FF0DE1065B000CE197 /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AAB6D40DE0D5A400E04DDA /* md5.h */; };
+               A2A4EA000DE1065C000CE197 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AAB6C80DE0D5A400E04DDA /* config.h */; };
+               A2A4EA010DE1065D000CE197 /* compat_unix.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AAB6C60DE0D5A400E04DDA /* compat_unix.h */; };
+               A2A4EA0C0DE106E8000CE197 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */; };
+               A2A4EA0E0DE106EB000CE197 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */; };
+               A2A4EA0F0DE106EE000CE197 /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */; };
                A2A6321B0CD9751700E3DA60 /* BadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A6321A0CD9751700E3DA60 /* BadgeView.m */; };
                A2AA579D0ADFCAB400CA59F6 /* PiecesView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AA579B0ADFCAB400CA59F6 /* PiecesView.m */; };
                A2AAB65C0DE0CF6200E04DDA /* rpc-server.c in Sources */ = {isa = PBXBuildFile; fileRef = A2AAB6580DE0CF6200E04DDA /* rpc-server.c */; };
                        remoteGlobalIDString = 3C7A118C0D0B2EB800B5701F;
                        remoteInfo = natpmp;
                };
+               A2A4E9ED0DE104A4000CE197 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = A2AAB6BA0DE0D55D00E04DDA /* shttpd */;
+                       remoteInfo = shttpd;
+               };
                BE1183750CE161040002D0F3 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
                A2A306580AAD24A80049E2AC /* UKKQueue.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UKKQueue.m; path = macosx/UKKQueue/UKKQueue.m; sourceTree = "<group>"; };
                A2A306590AAD24A80049E2AC /* UKMainThreadProxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UKMainThreadProxy.h; path = macosx/UKKQueue/UKMainThreadProxy.h; sourceTree = "<group>"; };
                A2A3065A0AAD24A80049E2AC /* UKMainThreadProxy.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UKMainThreadProxy.m; path = macosx/UKKQueue/UKMainThreadProxy.m; sourceTree = "<group>"; };
+               A2A4E9830DE1038C000CE197 /* json.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = json.c; path = libtransmission/json.c; sourceTree = "<group>"; };
+               A2A4E9840DE1038C000CE197 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = libtransmission/json.h; sourceTree = "<group>"; };
+               A2A4E99A0DE10424000CE197 /* JSON_checker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = JSON_checker.c; path = libtransmission/JSON_checker.c; sourceTree = "<group>"; };
+               A2A4E99B0DE10424000CE197 /* JSON_checker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSON_checker.h; path = libtransmission/JSON_checker.h; sourceTree = "<group>"; };
+               A2A4E9FC0DE10643000CE197 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = "third-party/shttpd/defs.h"; sourceTree = "<group>"; };
+               A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ConvertUTF.c; path = libtransmission/ConvertUTF.c; sourceTree = "<group>"; };
+               A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertUTF.h; path = libtransmission/ConvertUTF.h; sourceTree = "<group>"; };
                A2A632190CD9751700E3DA60 /* BadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BadgeView.h; path = macosx/BadgeView.h; sourceTree = "<group>"; };
                A2A6321A0CD9751700E3DA60 /* BadgeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BadgeView.m; path = macosx/BadgeView.m; sourceTree = "<group>"; };
                A2AA579A0ADFCAB400CA59F6 /* PiecesView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PiecesView.h; path = macosx/PiecesView.h; sourceTree = "<group>"; };
                                BE1183780CE161390002D0F3 /* libminiupnp.a in Frameworks */,
                                BE75C38A0C72A1ED00DBEFE0 /* libevent.a in Frameworks */,
                                A226FDAC0D0CDF20005A7F71 /* libnatpmp.a in Frameworks */,
+                               A2A4E9FA0DE10623000CE197 /* libshttpd.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                A2D307900D9EC46B0051FD27 /* ggets.c */,
                                A29EBE530DC01FC9006CEE80 /* web.h */,
                                A29EBE520DC01FC9006CEE80 /* web.c */,
+                               A2A4E9840DE1038C000CE197 /* json.h */,
+                               A2A4E9830DE1038C000CE197 /* json.c */,
+                               A2A4E99A0DE10424000CE197 /* JSON_checker.c */,
+                               A2A4E99B0DE10424000CE197 /* JSON_checker.h */,
+                               A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */,
+                               A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */,
                        );
                        name = libtransmission;
                        sourceTree = "<group>";
                                A2AAB6C60DE0D5A400E04DDA /* compat_unix.h */,
                                A2AAB6C70DE0D5A400E04DDA /* config.c */,
                                A2AAB6C80DE0D5A400E04DDA /* config.h */,
+                               A2A4E9FC0DE10643000CE197 /* defs.h */,
                                A2AAB6CA0DE0D5A400E04DDA /* io_cgi.c */,
                                A2AAB6CB0DE0D5A400E04DDA /* io_dir.c */,
                                A2AAB6CC0DE0D5A400E04DDA /* io_emb.c */,
                                A29DF8BE0DB2545F00D04E5A /* verify.h in Headers */,
                                A2AAB6650DE0D08B00E04DDA /* blocklist.h in Headers */,
                                A2A4E9210DE0F7E9000CE197 /* web.h in Headers */,
+                               A2A4E9870DE10399000CE197 /* json.h in Headers */,
+                               A2A4E99F0DE10429000CE197 /* JSON_checker.h in Headers */,
+                               A2A4EA0F0DE106EE000CE197 /* ConvertUTF.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               A2A4E9F40DE10539000CE197 /* shttpd.h in Headers */,
+                               A2A4E9FD0DE10643000CE197 /* defs.h in Headers */,
+                               A2A4E9FF0DE1065B000CE197 /* md5.h in Headers */,
+                               A2A4EA000DE1065C000CE197 /* config.h in Headers */,
+                               A2A4EA010DE1065D000CE197 /* compat_unix.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                A226FDB10D0CDF6E005A7F71 /* PBXTargetDependency */,
                                BE1183760CE161040002D0F3 /* PBXTargetDependency */,
                                BE75C34F0C729ED300DBEFE0 /* PBXTargetDependency */,
+                               A2A4E9EE0DE104A4000CE197 /* PBXTargetDependency */,
                        );
                        name = libtransmission;
                        productName = transmission;
                                A29DF8B90DB2544C00D04E5A /* resume.c in Sources */,
                                A29DF8BC0DB2545900D04E5A /* ggets.c in Sources */,
                                A2A4E9220DE0F7EB000CE197 /* web.c in Sources */,
+                               A2A4E9880DE1039C000CE197 /* json.c in Sources */,
+                               A2A4E9A00DE1042A000CE197 /* JSON_checker.c in Sources */,
+                               A2A4EA0E0DE106EB000CE197 /* ConvertUTF.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                A2AAB6ED0DE0D5A500E04DDA /* md5.c in Sources */,
                                A2AAB6EF0DE0D5A500E04DDA /* shttpd.c in Sources */,
                                A2AAB6F40DE0D5A600E04DDA /* string.c in Sources */,
+                               A2A4EA0C0DE106E8000CE197 /* ConvertUTF.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        target = 3C7A118C0D0B2EB800B5701F /* natpmp */;
                        targetProxy = A226FDB00D0CDF6E005A7F71 /* PBXContainerItemProxy */;
                };
+               A2A4E9EE0DE104A4000CE197 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = A2AAB6BA0DE0D55D00E04DDA /* shttpd */;
+                       targetProxy = A2A4E9ED0DE104A4000CE197 /* PBXContainerItemProxy */;
+               };
                BE1183760CE161040002D0F3 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = BE1183470CE160960002D0F3 /* miniupnp */;
                                GCC_MODEL_TUNING = G5;
                                INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
+                               OTHER_CFLAGS = (
+                                       "-DEMBEDDED",
+                                       "-DNDEBUG",
+                                       "-DNO_CGI",
+                                       "-DNO_SSI",
+                               );
                                PREBINDING = NO;
                                PRODUCT_NAME = shttpd;
                                USER_HEADER_SEARCH_PATHS = "third-party/shttpd";
                                GCC_MODEL_TUNING = G5;
                                INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
+                               OTHER_CFLAGS = (
+                                       "-DEMBEDDED",
+                                       "-DNDEBUG",
+                                       "-DNO_CGI",
+                                       "-DNO_SSI",
+                               );
                                PREBINDING = NO;
                                PRODUCT_NAME = shttpd;
                                USER_HEADER_SEARCH_PATHS = "third-party/shttpd";
                                GCC_OPTIMIZATION_LEVEL = 0;
                                INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
+                               OTHER_CFLAGS = (
+                                       "-DEMBEDDED",
+                                       "-DNDEBUG",
+                                       "-DNO_CGI",
+                                       "-DNO_SSI",
+                               );
                                PREBINDING = NO;
                                PRODUCT_NAME = shttpd;
                                SEPARATE_STRIP = YES;
index f5f57d2aff649766b3b42e2ef8ddebad4996a197..54addc8a6b628094a4292b8c37520f07e8370819 100644 (file)
@@ -196,6 +196,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         
         fLib = tr_sessionInitFull(NULL, /* use default config directory (Application Support) */
                                 "macosx",
+                                NULL, /* download directory set when adding transfers */
                                 [fDefaults boolForKey: @"PEXGlobal"],
                                 [fDefaults boolForKey: @"NatTraversal"],
                                 [fDefaults integerForKey: @"BindPort"],
@@ -208,7 +209,10 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
                                 [fDefaults integerForKey: @"MessageLevel"],
                                 YES,
                                 [fDefaults boolForKey: @"Blocklist"],
-                                TR_DEFAULT_PEER_SOCKET_TOS );
+                                TR_DEFAULT_PEER_SOCKET_TOS,
+                                [fDefaults boolForKey: @"RPC"],
+                                [fDefaults integerForKey: @"RPCPort"],
+                                TR_DEFAULT_RPC_ACL);
         
         [NSApp setDelegate: self];
         
index 1be321d5ca5a84b3118f8fb34cee927f7b13b8fc..72db4b0407f9a77cf69f219b092462512a73ea3b 100644 (file)
        <string>Constant</string>
        <key>NatTraversal</key>
        <true/>
+       <key>RPC</key>
+       <false/>
+       <key>RPCPort</key>
+       <integer>9091</integer>
        <key>PEXGlobal</key>
        <true/>
        <key>PeersTorrent</key>
        <true/>
        <key>WarningRemainingSpace</key>
        <true/>
-    <key>WarningResetStats</key>
+       <key>WarningResetStats</key>
        <true/>
 </dict>
 </plist>
index db2fb2a4f7e2a4d3ce99b0d2a874082f76938112..e8cd48c46f2959f85355d94942630086514f8e50 100644 (file)
@@ -230,7 +230,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (NSString *) downloadFolder
 {
-    return [NSString stringWithUTF8String: tr_torrentGetFolder(fHandle)];
+    return [NSString stringWithUTF8String: tr_torrentGetDownloadDir(fHandle)];
 }
 
 - (void) getAvailability: (int8_t *) tab size: (int) size
@@ -619,7 +619,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 - (BOOL) alertForFolderAvailable
 {
     #warning check for change from incomplete to download folder first
-    if (access(tr_torrentGetFolder(fHandle), 0))
+    if (access(tr_torrentGetDownloadDir(fHandle), 0))
     {
         NSAlert * alert = [[NSAlert alloc] init];
         [alert setMessageText: [NSString stringWithFormat:
@@ -730,13 +730,13 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (NSDate *) lastAnnounceTime
 {
-    int date = fStat->tracker_stat.lastAnnounceTime;
+    int date = fStat->trackerStat.lastAnnounceTime;
     return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
 - (int) nextAnnounceTime
 {
-    int date = fStat->tracker_stat.nextAnnounceTime;
+    int date = fStat->trackerStat.nextAnnounceTime;
     if (date <= 0)
         return -1;
     
@@ -746,7 +746,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (NSString *) announceResponse
 {
-    return [NSString stringWithUTF8String: fStat->tracker_stat.announceResponse];
+    return [NSString stringWithUTF8String: fStat->trackerStat.announceResponse];
 }
 
 - (NSString *) trackerAddressScrape
@@ -756,13 +756,13 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (NSDate *) lastScrapeTime
 {
-    int date = fStat->tracker_stat.lastScrapeTime;
+    int date = fStat->trackerStat.lastScrapeTime;
     return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
 - (int) nextScrapeTime
 {
-    int date = fStat->tracker_stat.nextScrapeTime;
+    int date = fStat->trackerStat.nextScrapeTime;
     if (date <= 0)
         return -1;
     
@@ -772,7 +772,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (NSString *) scrapeResponse
 {
-    return [NSString stringWithUTF8String: fStat->tracker_stat.scrapeResponse];
+    return [NSString stringWithUTF8String: fStat->trackerStat.scrapeResponse];
 }
 
 - (NSArray *) allTrackers: (BOOL) separators
@@ -1289,7 +1289,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (float) swarmSpeed
 {
-    return fStat->swarmspeed;
+    return fStat->swarmSpeed;
 }
 
 - (int) orderValue
@@ -1579,7 +1579,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
         {
             NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
                                                 ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
+            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
             
             fHandle = tr_torrentNew(lib, ctor, &error);
         }
@@ -1592,7 +1592,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
         {
             NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
                                                 ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
+            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
             
             fHandle = tr_torrentNew(lib, ctor, &error);
         }
@@ -1605,7 +1605,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
         {
             NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
                                                 ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
+            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
             
             fHandle = tr_torrentNew(lib, ctor, &error);
         }
@@ -1745,7 +1745,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     [self setTimeMachineExclude: NO forPath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]];
     
     NSString * folder = [self shouldUseIncompleteFolderForName: [self name]] ? fIncompleteFolder : fDownloadFolder;
-    tr_torrentSetFolder(fHandle, [folder UTF8String]);
+    tr_torrentSetDownloadDir(fHandle, [folder UTF8String]);
     
     [self setTimeMachineExclude: ![self allDownloaded] forPath: [folder stringByAppendingPathComponent: [self name]]];
 }
index 82c63bcf961d665971790b85d74dd9f1e20d7866..92efb68fe50458f54fd413c4c2c0fa2ce553f121 100644 (file)
@@ -1,4 +1,4 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Transmission";
-NSHumanReadableCopyright = "Copyright 2005-2008 The Transmission Project";
\ No newline at end of file
+NSHumanReadableCopyright = "Copyright 2005-2008 The Transmission Project";
index 2f3f5749489a25bb32c3977710d1b414e63a001c..139f0142d569b15c4a4dcd4c08d3ecc9edf015e7 100644 (file)
@@ -1,4 +1,4 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Transmission";
-NSHumanReadableCopyright = "2005-2008 The Transmission Project, все права защищены";
\ No newline at end of file
+NSHumanReadableCopyright = "2005-2008 The Transmission Project, все права защищены";
index ede762d81094b2f85f0b8a11e974c3b31cda3c22..ce94377763208a7a4f780375395fa7e18a71c37a 100644 (file)
@@ -1,4 +1,4 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Transmission";
-NSHumanReadableCopyright = "版權所有 2005-2008 The Transmission Project";
\ No newline at end of file
+NSHumanReadableCopyright = "版權所有 2005-2008 The Transmission Project";