mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-10 14:13:23 +00:00
Code Issues Releases Wiki Activity

#1042: show "in progress" in the inspector when announcing/scraping

Browse source
This commit is contained in:
Mitchell Livingston 2008-07-11 21:48:43 +00:00
parent 291d30239d
commit 012f35bb96
4 changed files with 55 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
macosx/Credits.rtf
View file

@ -15,19 +15,19 @@
Lead Developers
\b0 <{\field{\*\fldinst{HYPERLINK "mailto:dev@transmissionbt.com"}}{\fldrslt dev@transmissionbt.com}}>\
Mitchell Livingston <{\field{\*\fldinst{HYPERLINK "mailto:livings124@transmissionbt.com"}}{\fldrslt livings124@transmissionbt.com}}>
\fs20 \cf2 (Mac OS X interface)
\fs20 \cf2 (Mac OS X client)
\fs24 \cf0 \
Charles Kerr <{\field{\*\fldinst{HYPERLINK "mailto:charles@%20transmissionbt.com"}}{\fldrslt charles@ transmissionbt.com}}>
\fs20 \cf2 (Backend, GTK+ interface)
\fs20 \cf2 (Daemon, Backend, GTK+ client)
\fs24 \cf0 \
Eric Petit <{\field{\*\fldinst{HYPERLINK "mailto:titer@m0k.org"}}{\fldrslt titer@m0k.org}}>
\fs20 \cf2 (Creator)\
\fs24 \cf0 Josh Elsasser <{\field{\*\fldinst{HYPERLINK "mailto:josh@elsasser.org"}}{\fldrslt josh@elsasser.org}}>
\fs20 \cf2 (Daemon, Backend, GTK+ interface)
\fs20 \cf2 (Daemon, Backend, GTK+ client)
\fs24 \cf0 \
Bryan Varner <{\field{\*\fldinst{HYPERLINK "mailto:bryan@varnernet.com"}}{\fldrslt bryan@varnernet.com}}>
\fs20 \cf2 (BeOS interface)
\fs20 \cf2 (BeOS client)
\fs24 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \

28
macosx/InfoWindowController.m
View file

@ -1395,7 +1395,19 @@ typedef enum
[fAnnounceResponseField setSelectable: ![announceResponse isEqualToString: @""]];
int announceNext = [torrent nextAnnounceTime];
[fAnnounceNextField setStringValue: announceNext > 0 ? [NSString timeString: announceNext showSeconds: YES] : @""];
NSString * announceNextString;
switch (announceNext)
{
case STAT_TIME_NOW:
announceNextString = [NSLocalizedString(@"In progress", "Inspector -> tracker tab") stringByAppendingEllipsis];
break;
case STAT_TIME_NONE:
announceNextString = @"";
break;
default:
announceNextString = [NSString timeString: announceNext showSeconds: YES];
}
[fAnnounceNextField setStringValue: announceNextString];
//scrape fields
NSString * scrapeAddress;
@ -1418,7 +1430,19 @@ typedef enum
[fScrapeResponseField setSelectable: ![scrapeResponse isEqualToString: @""]];
int scrapeNext = [torrent nextScrapeTime];
[fScrapeNextField setStringValue: scrapeNext > 0 ? [NSString timeString: scrapeNext showSeconds: YES] : @""];
NSString * scrapeNextString;
switch (scrapeNext)
{
case STAT_TIME_NOW:
scrapeNextString = [NSLocalizedString(@"In progress", "Inspector -> tracker tab") stringByAppendingEllipsis];
break;
case STAT_TIME_NONE:
scrapeNextString = @"";
break;
default:
scrapeNextString = [NSString timeString: scrapeNext showSeconds: YES];
}
[fScrapeNextField setStringValue: scrapeNextString];
}
- (void) updateInfoPeers

3
macosx/Torrent.h
View file

@ -34,6 +34,9 @@ typedef enum
TORRENT_FILE_DEFAULT
} torrentFileState;
#define STAT_TIME_NONE -1
#define STAT_TIME_NOW -2
@interface Torrent : NSObject
{
tr_torrent * fHandle;

32
macosx/Torrent.m
View file

@ -733,11 +733,17 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
- (int) nextAnnounceTime
{
int date = fStat->nextAnnounceTime;
if (date <= 0)
return -1;
NSTimeInterval difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow];
return difference > 0 ? (int)difference : -1;
NSTimeInterval difference;
switch (date)
{
case 0:
return STAT_TIME_NONE;
case 1:
return STAT_TIME_NOW;
default:
difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow];
return difference > 0 ? (int)difference : STAT_TIME_NONE;
}
}
- (NSString *) announceResponse
@ -759,11 +765,17 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
- (int) nextScrapeTime
{
int date = fStat->nextScrapeTime;
if (date <= 0)
return -1;
NSTimeInterval difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow];
return difference > 0 ? (int)difference : -1;
NSTimeInterval difference;
switch (date)
{
case 0:
return STAT_TIME_NONE;
case 1:
return STAT_TIME_NOW;
default:
difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow];
return difference > 0 ? (int)difference : STAT_TIME_NONE;
}
}
- (NSString *) scrapeResponse