mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

(trunk libT) #3973 "JIT verification verifies freshly-downloaded torrents" -- test fix.

Browse source 
Files downloaded in Transmission 2.20 betas [1..3] forced each piece to be checked twice -- once on download, and once when uploading the piece for the first time. Older versions of Transmission didn't perform the latter check unless the file had changed after it was downloaded. This commit restores that behavior.
This commit is contained in:
Jordan Lee 2011-02-02 20:30:04 +00:00
parent 859570345d
commit 5fc1ff8855
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libtransmission/fdlimit.c
View file

@ -295,6 +295,7 @@ tr_close_file( int fd )
* but it couldn't hurt... */ * but it couldn't hurt... */
fcntl( fd, F_NOCACHE, 1 ); fcntl( fd, F_NOCACHE, 1 );
#endif #endif
fsync( fd );
close( fd ); close( fd );
} }

17
libtransmission/torrent.c
View file

@ -2951,21 +2951,30 @@ tr_torrentFileCompleted( tr_torrent * tor, tr_file_index_t fileNum )
{ {
char * sub; char * sub;
const char * base; const char * base;
const tr_info * inf = &tor->info;
const tr_file * f = &inf->files[fileNum];
tr_piece * p;
const tr_piece * pend;
const time_t now = tr_time( );
/* close the file so that we can reopen in read-only mode as needed */ /* close the file so that we can reopen in read-only mode as needed */
tr_fdFileClose( tor->session, tor, fileNum ); tr_fdFileClose( tor->session, tor, fileNum );
/* now that the file is complete and closed, we can start watching its
* mtime timestamp for changes to know if we need to reverify pieces */
fprintf( stderr, "file %d completed.. setting all files' timestamps to %zu (%s)\n", (int)fileNum, (size_t)now, f->name );
for( p=&inf->pieces[f->firstPiece], pend=&inf->pieces[f->lastPiece]; p!=pend; ++p )
p->timeChecked = now;
/* if the torrent's current filename isn't the same as the one in the /* if the torrent's current filename isn't the same as the one in the
* metadata -- for example, if it had the ".part" suffix appended to * metadata -- for example, if it had the ".part" suffix appended to
* it until now -- then rename it to match the one in the metadata */ * it until now -- then rename it to match the one in the metadata */
if( tr_torrentFindFile2( tor, fileNum, &base, &sub ) ) if( tr_torrentFindFile2( tor, fileNum, &base, &sub ) )
{ {
const tr_file * file = &tor->info.files[fileNum]; if( strcmp( sub, f->name ) )
if( strcmp( sub, file->name ) )
{ {
char * oldpath = tr_buildPath( base, sub, NULL ); char * oldpath = tr_buildPath( base, sub, NULL );
char * newpath = tr_buildPath( base, file->name, NULL ); char * newpath = tr_buildPath( base, f->name, NULL );
if( rename( oldpath, newpath ) ) if( rename( oldpath, newpath ) )
tr_torerr( tor, "Error moving \"%s\" to \"%s\": %s", oldpath, newpath, tr_strerror( errno ) ); tr_torerr( tor, "Error moving \"%s\" to \"%s\": %s", oldpath, newpath, tr_strerror( errno ) );