Browse Source

- Display more information regarding the torrent in its properties pannel

- Made properties pannel scrollable, it behaves better with the splitter
adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
a6f31c7950
  1. 1
      Changelog
  2. 10
      src/misc.h
  3. 697
      src/propertiesWidget.ui
  4. 33
      src/propertieswidget.cpp
  5. 28
      src/qtorrenthandle.cpp
  6. 11
      src/qtorrenthandle.h

1
Changelog

@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
- FEATURE: Option to skip file checking and start seeding immediately in torrent addition dialog (Stephanos Antaris)
- FEATURE: Dropped dependency on libcurl
- FEATURE: Dropped Qt 4.3 support (Qt >= 4.4 is required)
- FEATURE: Display more information regarding the torrent in its properties
- FEATURE: Various optimizations to save CPU and memory
- COSMETIC: Merged download / upload lists
- COSMETIC: Torrents can be filtered based on their status

10
src/misc.h

@ -41,6 +41,10 @@ @@ -41,6 +41,10 @@
#include <QList>
#include <QPair>
#include <QThread>
#include <ctime>
#include <QDateTime>
#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/date_time/posix_time/conversion.hpp>
#ifndef Q_WS_WIN
#ifdef Q_WS_MAC
@ -308,6 +312,12 @@ public: @@ -308,6 +312,12 @@ public:
return hash;
}
static QString boostTimeToQString(boost::optional<boost::posix_time::ptime> boostDate) {
if(!boostDate) return tr("Unknown");
struct std::tm tm = boost::posix_time::to_tm(*boostDate);
return QDateTime::fromTime_t(mktime(&tm)).toString(Qt::DefaultLocaleLongDate);
}
// Take a number of seconds and return an user-friendly
// time duration like "1d 2h 10m".
static QString userFriendlyDuration(qlonglong seconds) {

697
src/propertiesWidget.ui

@ -2,26 +2,14 @@ @@ -2,26 +2,14 @@
<ui version="4.0">
<class>PropertiesWidget</class>
<widget class="QWidget" name="PropertiesWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>758</width>
<height>235</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="font">
<font>
<pointsize>8</pointsize>
</font>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
@ -31,470 +19,454 @@ @@ -31,470 +19,454 @@
</property>
<item>
<widget class="QStackedWidget" name="stackedProperties">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>260</height>
</size>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="ProgressHLayout">
<item>
<widget class="QLabel" name="downloaded_pieces_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Downloaded:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="progress_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>44</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string notr="true">0.0%</string>
</property>
</widget>
</item>
</layout>
</item>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>0</number>
<widget class="QScrollArea" name="scrollArea">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<item>
<widget class="QGroupBox" name="groupTorrentInfos">
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>-39</y>
<width>714</width>
<height>285</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<property name="spacing">
<number>3</number>
</property>
<property name="title">
<string>Torrent information</string>
<property name="topMargin">
<number>3</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<layout class="QHBoxLayout" name="ProgressHLayout">
<item>
<widget class="QLabel" name="downloaded_pieces_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Downloaded:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="progress_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>44</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string notr="true">0.0%</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>0</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Transfer</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="_4">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="savePath_lbl">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Save path:</string>
<string>Uploaded:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="creator_lbl">
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Creator:</string>
<string>Downloaded:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hash_lbl2">
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Wasted:</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="_5">
<item>
<widget class="QLabel" name="upTotal">
<property name="text">
<string>Torrent hash:</string>
<string notr="true">0 Kb</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="comment_lbl2">
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="dlTotal">
<property name="text">
<string notr="true">0 Kb</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="wasted">
<property name="text">
<string>Comment:</string>
<string notr="true">0 kb</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>97</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="save_path">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="changeSavePathButton">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string notr="true">...</string>
</property>
</widget>
</item>
</layout>
<widget class="QLabel" name="label">
<property name="text">
<string>UP limit:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="creator">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<widget class="QLabel" name="label_2">
<property name="text">
<string/>
<string>DL limit:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hash_lbl">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<widget class="QLabel" name="label_7">
<property name="text">
<string/>
<string>Time elapsed:</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QLabel" name="lbl_uplimit">
<property name="text">
<string notr="true">∞</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="comment_lbl">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="lbl_dllimit">
<property name="text">
<string notr="true">∞</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lbl_elapsed">
<property name="text">
<string/>
<string notr="true">∞</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>190</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="title">
<string>Current session</string>
</property>
<layout class="QVBoxLayout" name="_2">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="_3">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="_4">
<property name="spacing">
<number>6</number>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="margin">
<number>0</number>
<property name="sizeHint" stdset="0">
<size>
<width>98</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_12">
<item>
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<widget class="QLabel" name="lbl_ratio">
<property name="text">
<string>Total uploaded:</string>
<string>Share ratio:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Total downloaded:</string>
<string>Connections:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lbl_ratio">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="label_10">
<property name="text">
<string notr="true"> </string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QLabel" name="shareRatio">
<property name="text">
<string>Share ratio:</string>
<string notr="true">1.0</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
<widget class="QLabel" name="lbl_connections">
<property name="text">
<string notr="true">0</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_11">
<property name="text">
<string>Total failed:</string>
<string notr="true"> </string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="_5">
<property name="spacing">
<number>6</number>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="margin">
<number>0</number>
<property name="sizeHint" stdset="0">
<size>
<width>97</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupTorrentInfos">
<property name="title">
<string>Information</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="upTotal">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="savePath_lbl">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>19</height>
</size>
</property>
<property name="text">
<string/>
<string>Save path:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="dlTotal">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="label_9">
<property name="text">
<string>Created on:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hash_lbl2">
<property name="text">
<string/>
<string>Torrent hash:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="shareRatio">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="comment_lbl2">
<property name="text">
<string>Comment:</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="save_path">
<property name="text">
<string notr="true">path</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="changeSavePathButton">
<property name="maximumSize">
<size>
<width>22</width>
<height>19</height>
</size>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="lbl_creationDate">
<property name="text">
<string/>
<string notr="true">date</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="failed">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
<widget class="QLabel" name="hash_lbl">
<property name="text">
<string notr="true">hash</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="comment_lbl">
<property name="text">
<string/>
<string notr="true">comment</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>181</width>
<width>517</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="incrementalDownload">
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="text">
<string>Download in correct order (slower but good for previewing)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="incrementalDownload">
<property name="text">
<string>Download in correct order (slower but good for previewing)</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
@ -714,16 +686,6 @@ @@ -714,16 +686,6 @@
<height>16</height>
</size>
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="text">
<string>Current tracker:</string>
</property>
@ -920,6 +882,9 @@ @@ -920,6 +882,9 @@
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="QPushButton" name="main_infos_button">
<property name="styleSheet">

33
src/propertieswidget.cpp

@ -140,16 +140,20 @@ void PropertiesWidget::slide() { @@ -140,16 +140,20 @@ void PropertiesWidget::slide() {
void PropertiesWidget::clear() {
save_path->clear();
creator->clear();
lbl_creationDate->clear();
hash_lbl->clear();
comment_lbl->clear();
incrementalDownload->setChecked(false);
trackersURLS->clear();
trackerURL->clear();
progressBar->setProgress(QRealArray());
failed->clear();
wasted->clear();
upTotal->clear();
dlTotal->clear();
lbl_uplimit->clear();
lbl_dllimit->clear();
lbl_elapsed->clear();
lbl_connections->clear();
shareRatio->clear();
listWebSeeds->clear();
PropListModel->clear();
@ -171,11 +175,8 @@ void PropertiesWidget::loadTorrentInfos(QTorrentHandle &_h) { @@ -171,11 +175,8 @@ void PropertiesWidget::loadTorrentInfos(QTorrentHandle &_h) {
try {
// Save path
save_path->setText(TorrentPersistentData::getSavePath(h.hash()));
// Author
QString author = h.creator().trimmed();
if(author.isEmpty())
author = tr("Unknown");
creator->setText(author);
// Creation date
lbl_creationDate->setText(h.creation_date());
// Hash
hash_lbl->setText(h.hash());
// Comment
@ -225,7 +226,7 @@ void PropertiesWidget::readSettings() { @@ -225,7 +226,7 @@ void PropertiesWidget::readSettings() {
reduce();
} else {
main_infos_button->setStyleSheet(SELECTED_BUTTON_CSS);
setEnabled(false);
//setEnabled(false);
}
}
@ -254,10 +255,18 @@ void PropertiesWidget::saveSettings() { @@ -254,10 +255,18 @@ void PropertiesWidget::saveSettings() {
void PropertiesWidget::loadDynamicData() {
if(!h.is_valid()) return;
try {
// Session infos
failed->setText(misc::friendlyUnit(h.total_failed_bytes()));
upTotal->setText(misc::friendlyUnit(h.total_payload_upload()));
dlTotal->setText(misc::friendlyUnit(h.total_payload_download()));
// Transfer infos
wasted->setText(misc::friendlyUnit(h.total_failed_bytes()+h.total_redundant_bytes()));
upTotal->setText(misc::friendlyUnit(h.all_time_upload()) + " ("+misc::friendlyUnit(h.total_payload_upload())+" "+tr("this session")+")");
dlTotal->setText(misc::friendlyUnit(h.all_time_download()) + " ("+misc::friendlyUnit(h.total_payload_download())+" "+tr("this session")+")");
lbl_uplimit->setText(misc::friendlyUnit(h.upload_limit()));
lbl_dllimit->setText(misc::friendlyUnit(h.download_limit()));
QString elapsed_txt = misc::userFriendlyDuration(h.active_time());
if(h.is_seed()) {
elapsed_txt += " ("+tr("Seeding for %1", "e.g. Seeding for 3m10s").arg(misc::userFriendlyDuration(h.seeding_time()))+")";
}
lbl_elapsed->setText(elapsed_txt);
lbl_connections->setText(QString::number(h.num_connections())+" ("+tr("%1 max", "e.g. 10 max").arg(QString::number(h.connections_limit()))+")");
// Update ratio info
float ratio;
if(h.total_payload_download() == 0){

28
src/qtorrenthandle.cpp

@ -63,6 +63,12 @@ QString QTorrentHandle::name() const { @@ -63,6 +63,12 @@ QString QTorrentHandle::name() const {
return misc::toQString(h.name());
}
QString QTorrentHandle::creation_date() const {
Q_ASSERT(h.is_valid());
boost::optional<boost::posix_time::ptime> boostDate = h.get_torrent_info().creation_date();
return misc::boostTimeToQString(boostDate);
}
float QTorrentHandle::progress() const {
Q_ASSERT(h.is_valid());
if(!h.status().total_wanted)
@ -264,6 +270,11 @@ size_type QTorrentHandle::total_failed_bytes() const { @@ -264,6 +270,11 @@ size_type QTorrentHandle::total_failed_bytes() const {
return h.status().total_failed_bytes;
}
size_type QTorrentHandle::total_redundant_bytes() const {
Q_ASSERT(h.is_valid());
return h.status().total_redundant_bytes;
}
void QTorrentHandle::file_progress(std::vector<size_type>& fp) {
Q_ASSERT(h.is_valid());
return h.file_progress(fp);
@ -328,11 +339,26 @@ bool QTorrentHandle::is_auto_managed() const { @@ -328,11 +339,26 @@ bool QTorrentHandle::is_auto_managed() const {
return h.is_auto_managed();
}
int QTorrentHandle::active_time() const {
qlonglong QTorrentHandle::active_time() const {
Q_ASSERT(h.is_valid());
return h.status().active_time;
}
qlonglong QTorrentHandle::seeding_time() const {
Q_ASSERT(h.is_valid());
return h.status().seeding_time;
}
int QTorrentHandle::num_connections() const {
Q_ASSERT(h.is_valid());
return h.status().num_connections;
}
int QTorrentHandle::connections_limit() const {
Q_ASSERT(h.is_valid());
return h.status().connections_limit;
}
bool QTorrentHandle::is_sequential_download() const {
Q_ASSERT(h.is_valid());
return h.is_sequential_download();

11
src/qtorrenthandle.h

@ -35,13 +35,13 @@ @@ -35,13 +35,13 @@
#include <libtorrent/torrent_info.hpp>
using namespace libtorrent;
class QString;
#include <QString>
class QStringList;
// A wrapper for torrent_handle in libtorrent
// to interact well with Qt types
class QTorrentHandle {
private:
torrent_handle h;
@ -75,6 +75,8 @@ class QTorrentHandle { @@ -75,6 +75,8 @@ class QTorrentHandle {
size_type total_wanted_done() const;
float download_payload_rate() const;
float upload_payload_rate() const;
int num_connections() const;
int connections_limit() const;
int num_peers() const;
int num_seeds() const;
int num_complete() const;
@ -97,6 +99,7 @@ class QTorrentHandle { @@ -97,6 +99,7 @@ class QTorrentHandle {
QString creator() const;
QString comment() const;
size_type total_failed_bytes() const;
size_type total_redundant_bytes() const;
void file_progress(std::vector<size_type>& fp);
size_type total_payload_download();
size_type total_payload_upload();
@ -106,10 +109,12 @@ class QTorrentHandle { @@ -106,10 +109,12 @@ class QTorrentHandle {
int num_uploads() const;
bool is_seed() const;
bool is_auto_managed() const;
int active_time() const;
qlonglong active_time() const;
qlonglong seeding_time() const;
std::vector<int> file_priorities() const;
bool is_sequential_download() const;
bool super_seeding() const;
QString creation_date() const;
//
// Setters

Loading…
Cancel
Save