d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-24 05:25:37 +00:00
Code Issues Projects Releases Wiki Activity

- Improve tracker status detection when using libtorrent v0.14

Browse Source
This commit is contained in:
Christophe Dumez 2009-11-23 07:18:28 +00:00
parent 2f4d27b422
commit c52e0cf841
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bittorrent.cpp
View File

@ -1512,7 +1512,8 @@ void Bittorrent::readAlerts() {
TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url)); TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url));
data.last_message = misc::toQString(p->msg); data.last_message = misc::toQString(p->msg);
#ifndef LIBTORRENT_0_15 #ifndef LIBTORRENT_0_15
data.simply_warning = false; data.verified = false;
++data.fail_count;
#endif #endif
trackers_data.insert(tracker_url, data); trackers_data.insert(tracker_url, data);
trackersInfos[h.hash()] = trackers_data; trackersInfos[h.hash()] = trackers_data;
@ -1531,6 +1532,10 @@ void Bittorrent::readAlerts() {
TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url)); TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url));
data.last_message = ""; // Reset error/warning message data.last_message = ""; // Reset error/warning message
data.num_peers = p->num_peers; data.num_peers = p->num_peers;
#ifndef LIBTORRENT_0_15
data.fail_count = 0;
data.verified = true;
#endif
trackers_data.insert(tracker_url, data); trackers_data.insert(tracker_url, data);
trackersInfos[h.hash()] = trackers_data; trackersInfos[h.hash()] = trackers_data;
} }
@ -1543,7 +1548,8 @@ void Bittorrent::readAlerts() {
TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url)); TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url));
data.last_message = misc::toQString(p->msg); // Store warning message data.last_message = misc::toQString(p->msg); // Store warning message
#ifndef LIBTORRENT_0_15 #ifndef LIBTORRENT_0_15
data.simply_warning = true; data.verified = true;
data.fail_count = 0;
#endif #endif
trackers_data.insert(tracker_url, data); trackers_data.insert(tracker_url, data);
trackersInfos[h.hash()] = trackers_data; trackersInfos[h.hash()] = trackers_data;

9
src/bittorrent.h
View File

@ -56,7 +56,8 @@ public:
QString last_message; QString last_message;
unsigned long num_peers; unsigned long num_peers;
#ifndef LIBTORRENT_0_15 #ifndef LIBTORRENT_0_15
bool simply_warning; bool verified;
uint fail_count;
#endif #endif
//TrackerInfos() {} //TrackerInfos() {}
@ -66,12 +67,14 @@ public:
last_message = b.last_message; last_message = b.last_message;
num_peers = b.num_peers; num_peers = b.num_peers;
#ifndef LIBTORRENT_0_15 #ifndef LIBTORRENT_0_15
simply_warning = b.simply_warning; verified = b.verified;
fail_count = b.fail_count;
#endif #endif
} }
TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) { TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) {
#ifndef LIBTORRENT_0_15 #ifndef LIBTORRENT_0_15
simply_warning = false; fail_count = 0;
verified = false;
#endif #endif
} }
}; };

7
src/trackerlist.h
View File

@ -201,10 +201,13 @@ public slots:
} }
} }
#else #else
if(error_message.isEmpty() || data.simply_warning) { if(data.verified) {
item->setText(COL_STATUS, tr("Working")); item->setText(COL_STATUS, tr("Working"));
} else { } else {
item->setText(COL_STATUS, tr("Not working")); if(data.fail_count > 0)
item->setText(COL_STATUS, tr("Not working"));
else
item->setText(COL_STATUS, tr("Not contacted yet"));
} }
#endif #endif
item->setText(COL_PEERS, QString::number(trackers_data.value(tracker_url, TrackerInfos(tracker_url)).num_peers)); item->setText(COL_PEERS, QString::number(trackers_data.value(tracker_url, TrackerInfos(tracker_url)).num_peers));