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

libT doesn't need to create the Incomplete directory until it's needed

This commit is contained in:
Charles Kerr 2009-10-21 19:33:37 +00:00
parent adfb6f70a1
commit c59ae60488
5 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/main.c
View File

@ -438,6 +438,8 @@ main( int argc, char ** argv )
gtr_mkdir_with_parents( str, 0777 );
if(( str = pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR )))
gtr_mkdir_with_parents( str, 0777 );
if(( str = pref_string_get( TR_PREFS_KEY_INCOMPLETE_DIR )))
gtr_mkdir_with_parents( str, 0777 );
/* initialize the libtransmission session */
session = tr_sessionInit( "gtk", configDir, TRUE, pref_get_all( ) );

35
libtransmission/fdlimit.c
View File

@ -278,38 +278,27 @@ tr_close_file( int fd )
*/
static int
TrOpenFile( int i,
const char * folder,
const char * torrentFile,
const char * filename,
tr_bool doWrite,
tr_preallocation_mode preallocationMode,
uint64_t desiredFileSize )
{
struct tr_openfile * file = &gFd->openFiles[i];
int flags;
char * filename;
struct stat sb;
tr_bool alreadyExisted;
/* confirm the parent folder exists */
if( stat( folder, &sb ) || !S_ISDIR( sb.st_mode ) )
{
tr_err( _( "Couldn't create \"%1$s\": \"%2$s\" is not a folder" ), torrentFile, folder );
return ENOENT;
}
/* create subfolders, if any */
filename = tr_buildPath( folder, torrentFile, NULL );
if( doWrite )
{
char * tmp = tr_dirname( filename );
const int err = tr_mkdirp( tmp, 0777 ) ? errno : 0;
char * dir = tr_dirname( filename );
const int err = tr_mkdirp( dir, 0777 ) ? errno : 0;
if( err ) {
tr_err( _( "Couldn't create \"%1$s\": %2$s" ), tmp, tr_strerror( err ) );
tr_free( tmp );
tr_free( filename );
tr_err( _( "Couldn't create \"%1$s\": %2$s" ), dir, tr_strerror( err ) );
tr_free( dir );
return err;
}
tr_free( tmp );
tr_free( dir );
}
alreadyExisted = !stat( filename, &sb ) && S_ISREG( sb.st_mode );
@ -334,7 +323,6 @@ TrOpenFile( int i,
{
const int err = errno;
tr_err( _( "Couldn't open \"%1$s\": %2$s" ), filename, tr_strerror( err ) );
tr_free( filename );
return err;
}
@ -362,7 +350,6 @@ TrOpenFile( int i,
}
#endif
tr_free( filename );
return 0;
}
@ -425,22 +412,18 @@ tr_fdFileGetCached( int torrentId,
int
tr_fdFileCheckout( int torrentId,
tr_file_index_t fileNum,
const char * folder,
const char * torrentFile,
const char * filename,
tr_bool doWrite,
tr_preallocation_mode preallocationMode,
uint64_t desiredFileSize )
{
int i, winner = -1;
struct tr_openfile * o;
char filename[MAX_PATH_LENGTH];
assert( torrentId > 0 );
assert( folder && *folder );
assert( torrentFile && *torrentFile );
assert( filename && *filename );
assert( tr_isBool( doWrite ) );
tr_snprintf( filename, sizeof( filename ), "%s%c%s", folder, TR_PATH_DELIMITER, torrentFile );
dbgmsg( "looking for file '%s', writable %c", filename, doWrite ? 'y' : 'n' );
/* is it already open? */
@ -504,7 +487,7 @@ tr_fdFileCheckout( int torrentId,
o = &gFd->openFiles[winner];
if( !fileIsOpen( o ) )
{
const int err = TrOpenFile( winner, folder, torrentFile, doWrite,
const int err = TrOpenFile( winner, filename, doWrite,
preallocationMode, desiredFileSize );
if( err ) {
errno = err;

4
libtransmission/fdlimit.h
View File

@ -55,7 +55,6 @@ int64_t tr_lseek( int fd, int64_t offset, int whence );
* continually opening and closing the same files when downloading
* piece data.
*
* - if `folder' doesn't exist, errno is set to ENOENT.
* - if doWrite is true, subfolders in torrentFile are created if necessary.
* - if doWrite is true, the target file is created if necessary.
*
@ -66,8 +65,7 @@ int64_t tr_lseek( int fd, int64_t offset, int whence );
*/
int tr_fdFileCheckout( int torrentId,
tr_file_index_t fileNum,
const char * folder,
const char * torrentFile,
const char * fileName,
tr_bool doWrite,
tr_preallocation_mode preallocationMode,
uint64_t desiredFileSize );

16
libtransmission/inout.c
View File

@ -121,13 +121,17 @@ readOrWriteBytes( const tr_torrent * tor,
{
err = ENOENT;
}
else if( ( fd = tr_fdFileCheckout( tor->uniqueId, fileIndex, base, subpath,
doWrite, preallocationMode, file->length ) ) < 0 )
else
{
char * filename;
err = errno;
filename = tr_buildPath( base, subpath, NULL );
tr_torerr( tor, "tr_fdFileCheckout failed for \"%s\": %s", filename, tr_strerror( err ) );
char * filename = tr_buildPath( base, subpath, NULL );
if( ( fd = tr_fdFileCheckout( tor->uniqueId, fileIndex, filename,
doWrite, preallocationMode, file->length ) ) < 0 )
{
err = errno;
tr_torerr( tor, "tr_fdFileCheckout failed for \"%s\": %s", filename, tr_strerror( err ) );
}
tr_free( filename );
}

2
libtransmission/session.c
View File

@ -968,8 +968,6 @@ tr_sessionSetIncompleteDir( tr_session * session, const char * dir )
tr_free( session->incompleteDir );
session->incompleteDir = tr_strdup( dir );
tr_mkdirp( session->incompleteDir, 0777 );
}
}