mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-28 18:48:48 +00:00
Code Issues Releases Wiki Activity

warnings--

Browse source
This commit is contained in:
Mitchell Livingston 2009-12-13 01:36:22 +00:00
parent bdf3144376
commit 09442cd88b
1 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
macosx/Torrent.m
View file

@ -31,7 +31,8 @@
@interface Torrent (Private) @interface Torrent (Private)
- (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct
magnetAddress: (NSString *) magnetAddress lib: (tr_session *) lib
waitToStart: (NSNumber *) waitToStart waitToStart: (NSNumber *) waitToStart
groupValue: (NSNumber *) groupValue groupValue: (NSNumber *) groupValue
downloadFolder: (NSString *) downloadFolder legacyIncompleteFolder: (NSString *) incompleteFolder; downloadFolder: (NSString *) downloadFolder legacyIncompleteFolder: (NSString *) incompleteFolder;
@ -78,7 +79,7 @@ int trashDataFile(const char * filename)
- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (BOOL) torrentDelete - (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (BOOL) torrentDelete
lib: (tr_session *) lib lib: (tr_session *) lib
{ {
self = [self initWithPath: path hash: nil torrentStruct: NULL lib: lib self = [self initWithPath: path hash: nil torrentStruct: NULL magnetAddress: nil lib: lib
waitToStart: nil groupValue: nil waitToStart: nil groupValue: nil
downloadFolder: location legacyIncompleteFolder: nil]; downloadFolder: location legacyIncompleteFolder: nil];
@ -92,7 +93,7 @@ int trashDataFile(const char * filename)
- (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib - (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib
{ {
self = [self initWithPath: nil hash: nil torrentStruct: torrentStruct lib: lib self = [self initWithPath: nil hash: nil torrentStruct: torrentStruct magnetAddress: nil lib: lib
waitToStart: nil groupValue: nil waitToStart: nil groupValue: nil
downloadFolder: location legacyIncompleteFolder: nil]; downloadFolder: location legacyIncompleteFolder: nil];
@ -102,25 +103,9 @@ int trashDataFile(const char * filename)
#warning need location (and use it)? #warning need location (and use it)?
- (id) initWithMagnetAddress: (NSString *) address location: (NSString *) location lib: (tr_session *) lib - (id) initWithMagnetAddress: (NSString *) address location: (NSString *) location lib: (tr_session *) lib
{ {
#warning move into real constructor? self = [self initWithPath: nil hash: nil torrentStruct: nil magnetAddress: address
//set libtransmission settings for initialization lib: lib waitToStart: nil groupValue: nil
tr_ctor * ctor = tr_ctorNew(lib); downloadFolder: location legacyIncompleteFolder: nil];
tr_ctorSetPaused(ctor, TR_FORCE, YES);
const tr_parse_result result = tr_ctorSetMagnet(ctor, [address UTF8String]);
tr_torrent * handle = NULL;
if (result == TR_PARSE_OK)
handle = tr_torrentNew(ctor, NULL);
tr_ctorFree(ctor);
if (handle)
self = [self initWithPath: nil hash: nil torrentStruct: handle lib: lib
waitToStart: nil groupValue: nil
downloadFolder: location legacyIncompleteFolder: nil];
else
self = nil;
return self; return self;
} }
@ -129,7 +114,9 @@ int trashDataFile(const char * filename)
{ {
self = [self initWithPath: [history objectForKey: @"InternalTorrentPath"] self = [self initWithPath: [history objectForKey: @"InternalTorrentPath"]
hash: [history objectForKey: @"TorrentHash"] hash: [history objectForKey: @"TorrentHash"]
torrentStruct: NULL lib: lib torrentStruct: NULL
magnetAddress: nil
lib: lib
waitToStart: [history objectForKey: @"WaitToStart"] waitToStart: [history objectForKey: @"WaitToStart"]
groupValue: [history objectForKey: @"GroupValue"] groupValue: [history objectForKey: @"GroupValue"]
downloadFolder: [history objectForKey: @"DownloadFolder"] //upgrading from versions < 1.80 downloadFolder: [history objectForKey: @"DownloadFolder"] //upgrading from versions < 1.80
@ -1542,7 +1529,8 @@ int trashDataFile(const char * filename)
@implementation Torrent (Private) @implementation Torrent (Private)
- (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct
magnetAddress: (NSString *) magnetAddress lib: (tr_session *) lib
waitToStart: (NSNumber *) waitToStart waitToStart: (NSNumber *) waitToStart
groupValue: (NSNumber *) groupValue groupValue: (NSNumber *) groupValue
downloadFolder: (NSString *) downloadFolder legacyIncompleteFolder: (NSString *) incompleteFolder downloadFolder: (NSString *) downloadFolder legacyIncompleteFolder: (NSString *) incompleteFolder
@ -1554,11 +1542,37 @@ int trashDataFile(const char * filename)
if (torrentStruct) if (torrentStruct)
fHandle = torrentStruct; fHandle = torrentStruct;
else if (magnetAddress)
{
tr_ctor * ctor = tr_ctorNew(lib);
tr_ctorSetPaused(ctor, TR_FORCE, YES);
if (downloadFolder)
tr_ctorSetDownloadDir(ctor, TR_FORCE, [downloadFolder UTF8String]);
const tr_parse_result result = tr_ctorSetMagnet(ctor, [magnetAddress UTF8String]);
if (result == TR_PARSE_OK)
fHandle = tr_torrentNew(ctor, NULL);
tr_ctorFree(ctor);
if (!fHandle)
{
[self release];
return nil;
}
}
else else
{ {
//set libtransmission settings for initialization //set libtransmission settings for initialization
tr_ctor * ctor = tr_ctorNew(lib); tr_ctor * ctor = tr_ctorNew(lib);
tr_ctorSetPaused(ctor, TR_FORCE, YES); tr_ctorSetPaused(ctor, TR_FORCE, YES);
if (downloadFolder)
tr_ctorSetDownloadDir(ctor, TR_FORCE, [downloadFolder UTF8String]);
if (incompleteFolder)
tr_ctorSetIncompleteDir(ctor, [incompleteFolder UTF8String]);
tr_parse_result result = TR_PARSE_ERR; tr_parse_result result = TR_PARSE_ERR;
if (path) if (path)
@ -1569,14 +1583,7 @@ int trashDataFile(const char * filename)
result = tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]); result = tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
if (result == TR_PARSE_OK) if (result == TR_PARSE_OK)
{
if (downloadFolder)
tr_ctorSetDownloadDir(ctor, TR_FORCE, [downloadFolder UTF8String]);
if (incompleteFolder)
tr_ctorSetIncompleteDir(ctor, [incompleteFolder UTF8String]);
fHandle = tr_torrentNew(ctor, NULL); fHandle = tr_torrentNew(ctor, NULL);
}
tr_ctorFree(ctor); tr_ctorFree(ctor);