mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

use the new ctor function in torrent creation

This commit is contained in:
Mitchell Livingston 2007-12-22 03:13:54 +00:00
parent 9148c9211f
commit 0fba1e53ca
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
macosx/Torrent.m
View File

@ -1466,29 +1466,40 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
fIncompleteFolder = [[fIncompleteFolder stringByExpandingTildeInPath] retain]; fIncompleteFolder = [[fIncompleteFolder stringByExpandingTildeInPath] retain];
} }
NSString * currentDownloadFolder; //set libT settings
tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetPaused(ctor, TR_FORCE, YES);
tr_info info; tr_info info;
int error; int error;
if (hashString) if (hashString)
{ {
if (tr_torrentParseHash(fLib, [hashString UTF8String], NULL, &info) == TR_OK) tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_OK)
{ {
currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]] NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
? fIncompleteFolder : fDownloadFolder; ? fIncompleteFolder : fDownloadFolder;
fHandle = tr_torrentInitSaved(fLib, [hashString UTF8String], [currentDownloadFolder UTF8String], YES, &error); tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
fHandle = tr_torrentNew(fLib, ctor, &error);
} }
tr_metainfoFree(&info); tr_metainfoFree(&info);
} }
if (!fHandle && path) if (!fHandle && path)
{ {
if (tr_torrentParse(fLib, [path UTF8String], NULL, &info) == TR_OK) tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_OK)
{ {
currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]] NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
? fIncompleteFolder : fDownloadFolder; ? fIncompleteFolder : fDownloadFolder;
fHandle = tr_torrentInit(fLib, [path UTF8String], [currentDownloadFolder UTF8String], YES, &error); tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
fHandle = tr_torrentNew(fLib, ctor, &error);
} }
tr_metainfoFree(&info); tr_metainfoFree(&info);
} }
tr_ctorFree(ctor);
if (!fHandle) if (!fHandle)
{ {
[self release]; [self release];