d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 20:44:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12086 from FranciscoPombal/code-cleanup

Browse Source 
Clean ups
This commit is contained in:
Vladimir Golovnev 2020-10-09 07:13:18 +03:00 committed by GitHub
commit bad5e1f887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/base/bittorrent/session.cpp
View File

@ -30,6 +30,7 @@
#include "session.h" #include "session.h"
#include <algorithm> #include <algorithm>
#include <cstdint>
#include <queue> #include <queue>
#include <string> #include <string>
#include <utility> #include <utility>
@ -497,7 +498,7 @@ Session::Session(QObject *parent)
// Regular saving of fastresume data // Regular saving of fastresume data
connect(m_resumeDataTimer, &QTimer::timeout, this, [this]() { generateResumeData(); }); connect(m_resumeDataTimer, &QTimer::timeout, this, [this]() { generateResumeData(); });
const uint saveInterval = saveResumeDataInterval(); const int saveInterval = saveResumeDataInterval();
if (saveInterval > 0) { if (saveInterval > 0) {
m_resumeDataTimer->setInterval(saveInterval * 60 * 1000); m_resumeDataTimer->setInterval(saveInterval * 60 * 1000);
m_resumeDataTimer->start(); m_resumeDataTimer->start();
@ -580,12 +581,12 @@ void Session::setAppendExtensionEnabled(const bool enabled)
} }
} }
uint Session::refreshInterval() const int Session::refreshInterval() const
{ {
return m_refreshInterval; return m_refreshInterval;
} }
void Session::setRefreshInterval(const uint value) void Session::setRefreshInterval(const int value)
{ {
if (value != refreshInterval()) { if (value != refreshInterval()) {
m_refreshInterval = value; m_refreshInterval = value;
@ -1100,7 +1101,7 @@ void Session::processBannedIPs(lt::ip_filter &filter)
} }
} }
void Session::adjustLimits(lt::settings_pack &settingsPack) void Session::adjustLimits(lt::settings_pack &settingsPack) const
{ {
// Internally increase the queue limits to ensure that the magnet is started // Internally increase the queue limits to ensure that the magnet is started
const int maxDownloads = maxActiveDownloads(); const int maxDownloads = maxActiveDownloads();
@ -2618,12 +2619,12 @@ void Session::setBandwidthSchedulerEnabled(const bool enabled)
} }
} }
uint Session::saveResumeDataInterval() const int Session::saveResumeDataInterval() const
{ {
return m_saveResumeDataInterval; return m_saveResumeDataInterval;
} }
void Session::setSaveResumeDataInterval(const uint value) void Session::setSaveResumeDataInterval(const int value)
{ {
if (value == m_saveResumeDataInterval) if (value == m_saveResumeDataInterval)
return; return;
@ -2667,10 +2668,10 @@ QString Session::networkInterface() const
return m_networkInterface; return m_networkInterface;
} }
void Session::setNetworkInterface(const QString &iface) void Session::setNetworkInterface(const QString &interface)
{ {
if (iface != networkInterface()) { if (interface != networkInterface()) {
m_networkInterface = iface; m_networkInterface = interface;
configureListeningInterface(); configureListeningInterface();
} }
} }
@ -3655,7 +3656,7 @@ void Session::handleTorrentTrackersRemoved(TorrentHandleImpl *const torrent, con
for (const TrackerEntry &deletedTracker : deletedTrackers) for (const TrackerEntry &deletedTracker : deletedTrackers)
LogMsg(tr("Tracker '%1' was deleted from torrent '%2'").arg(deletedTracker.url(), torrent->name())); LogMsg(tr("Tracker '%1' was deleted from torrent '%2'").arg(deletedTracker.url(), torrent->name()));
emit trackersRemoved(torrent, deletedTrackers); emit trackersRemoved(torrent, deletedTrackers);
if (torrent->trackers().size() == 0) if (torrent->trackers().empty())
emit trackerlessStateChanged(torrent, true); emit trackerlessStateChanged(torrent, true);
emit trackersChanged(torrent); emit trackersChanged(torrent);
} }
@ -4334,7 +4335,7 @@ void Session::createTorrentHandle(const lt::torrent_handle &nativeHandle)
const LoadTorrentParams params = m_loadingTorrents.take(nativeHandle.info_hash()); const LoadTorrentParams params = m_loadingTorrents.take(nativeHandle.info_hash());
TorrentHandleImpl *const torrent = new TorrentHandleImpl {this, nativeHandle, params}; auto *const torrent = new TorrentHandleImpl {this, nativeHandle, params};
m_torrents.insert(torrent->hash(), torrent); m_torrents.insert(torrent->hash(), torrent);
const bool hasMetadata = torrent->hasMetadata(); const bool hasMetadata = torrent->hasMetadata();
@ -4603,16 +4604,16 @@ void Session::handleSessionStatsAlert(const lt::session_stats_alert *p)
m_status.hasIncomingConnections = static_cast<bool>(stats[m_metricIndices.net.hasIncomingConnections]); m_status.hasIncomingConnections = static_cast<bool>(stats[m_metricIndices.net.hasIncomingConnections]);
const auto ipOverheadDownload = stats[m_metricIndices.net.recvIPOverheadBytes]; const int64_t ipOverheadDownload = stats[m_metricIndices.net.recvIPOverheadBytes];
const auto ipOverheadUpload = stats[m_metricIndices.net.sentIPOverheadBytes]; const int64_t ipOverheadUpload = stats[m_metricIndices.net.sentIPOverheadBytes];
const auto totalDownload = stats[m_metricIndices.net.recvBytes] + ipOverheadDownload; const int64_t totalDownload = stats[m_metricIndices.net.recvBytes] + ipOverheadDownload;
const auto totalUpload = stats[m_metricIndices.net.sentBytes] + ipOverheadUpload; const int64_t totalUpload = stats[m_metricIndices.net.sentBytes] + ipOverheadUpload;
const auto totalPayloadDownload = stats[m_metricIndices.net.recvPayloadBytes]; const int64_t totalPayloadDownload = stats[m_metricIndices.net.recvPayloadBytes];
const auto totalPayloadUpload = stats[m_metricIndices.net.sentPayloadBytes]; const int64_t totalPayloadUpload = stats[m_metricIndices.net.sentPayloadBytes];
const auto trackerDownload = stats[m_metricIndices.net.recvTrackerBytes]; const int64_t trackerDownload = stats[m_metricIndices.net.recvTrackerBytes];
const auto trackerUpload = stats[m_metricIndices.net.sentTrackerBytes]; const int64_t trackerUpload = stats[m_metricIndices.net.sentTrackerBytes];
const auto dhtDownload = stats[m_metricIndices.dht.dhtBytesIn]; const int64_t dhtDownload = stats[m_metricIndices.dht.dhtBytesIn];
const auto dhtUpload = stats[m_metricIndices.dht.dhtBytesOut]; const int64_t dhtUpload = stats[m_metricIndices.dht.dhtBytesOut];
auto calcRate = [interval](const quint64 previous, const quint64 current) auto calcRate = [interval](const quint64 previous, const quint64 current)
{ {
@ -4648,13 +4649,13 @@ void Session::handleSessionStatsAlert(const lt::session_stats_alert *p)
m_status.diskWriteQueue = stats[m_metricIndices.peer.numPeersDownDisk]; m_status.diskWriteQueue = stats[m_metricIndices.peer.numPeersDownDisk];
m_status.peersCount = stats[m_metricIndices.peer.numPeersConnected]; m_status.peersCount = stats[m_metricIndices.peer.numPeersConnected];
const int numBlocksRead = stats[m_metricIndices.disk.numBlocksRead]; const int64_t numBlocksRead = stats[m_metricIndices.disk.numBlocksRead];
const int numBlocksCacheHits = stats[m_metricIndices.disk.numBlocksCacheHits]; const int64_t numBlocksCacheHits = stats[m_metricIndices.disk.numBlocksCacheHits];
m_cacheStatus.totalUsedBuffers = stats[m_metricIndices.disk.diskBlocksInUse]; m_cacheStatus.totalUsedBuffers = stats[m_metricIndices.disk.diskBlocksInUse];
m_cacheStatus.readRatio = static_cast<qreal>(numBlocksCacheHits) / std::max(numBlocksCacheHits + numBlocksRead, 1); m_cacheStatus.readRatio = static_cast<qreal>(numBlocksCacheHits) / std::max<int64_t>(numBlocksCacheHits + numBlocksRead, 1);
m_cacheStatus.jobQueueLength = stats[m_metricIndices.disk.queuedDiskJobs]; m_cacheStatus.jobQueueLength = stats[m_metricIndices.disk.queuedDiskJobs];
const quint64 totalJobs = stats[m_metricIndices.disk.writeJobs] + stats[m_metricIndices.disk.readJobs] const int64_t totalJobs = stats[m_metricIndices.disk.writeJobs] + stats[m_metricIndices.disk.readJobs]
+ stats[m_metricIndices.disk.hashJobs]; + stats[m_metricIndices.disk.hashJobs];
m_cacheStatus.averageJobTime = (totalJobs > 0) m_cacheStatus.averageJobTime = (totalJobs > 0)
? (stats[m_metricIndices.disk.diskJobTime] / totalJobs) : 0; ? (stats[m_metricIndices.disk.diskJobTime] / totalJobs) : 0;

14
src/base/bittorrent/session.h
View File

@ -276,8 +276,8 @@ namespace BitTorrent
void setTrackerEnabled(bool enabled); void setTrackerEnabled(bool enabled);
bool isAppendExtensionEnabled() const; bool isAppendExtensionEnabled() const;
void setAppendExtensionEnabled(bool enabled); void setAppendExtensionEnabled(bool enabled);
uint refreshInterval() const; int refreshInterval() const;
void setRefreshInterval(uint value); void setRefreshInterval(int value);
bool isPreallocationEnabled() const; bool isPreallocationEnabled() const;
void setPreallocationEnabled(bool enabled); void setPreallocationEnabled(bool enabled);
QString torrentExportDirectory() const; QString torrentExportDirectory() const;
@ -302,8 +302,8 @@ namespace BitTorrent
bool isBandwidthSchedulerEnabled() const; bool isBandwidthSchedulerEnabled() const;
void setBandwidthSchedulerEnabled(bool enabled); void setBandwidthSchedulerEnabled(bool enabled);
uint saveResumeDataInterval() const; int saveResumeDataInterval() const;
void setSaveResumeDataInterval(uint value); void setSaveResumeDataInterval(int value);
int port() const; int port() const;
void setPort(int port); void setPort(int port);
bool useRandomPort() const; bool useRandomPort() const;
@ -570,7 +570,7 @@ namespace BitTorrent
void loadLTSettings(lt::settings_pack &settingsPack); void loadLTSettings(lt::settings_pack &settingsPack);
void configureNetworkInterfaces(lt::settings_pack &settingsPack); void configureNetworkInterfaces(lt::settings_pack &settingsPack);
void configurePeerClasses(); void configurePeerClasses();
void adjustLimits(lt::settings_pack &settingsPack); void adjustLimits(lt::settings_pack &settingsPack) const;
void applyBandwidthLimits(lt::settings_pack &settingsPack) const; void applyBandwidthLimits(lt::settings_pack &settingsPack) const;
void initMetrics(); void initMetrics();
void adjustLimits(); void adjustLimits();
@ -697,7 +697,7 @@ namespace BitTorrent
CachedSettingValue<bool> m_isAddTorrentPaused; CachedSettingValue<bool> m_isAddTorrentPaused;
CachedSettingValue<bool> m_isKeepTorrentTopLevelFolder; CachedSettingValue<bool> m_isKeepTorrentTopLevelFolder;
CachedSettingValue<bool> m_isAppendExtensionEnabled; CachedSettingValue<bool> m_isAppendExtensionEnabled;
CachedSettingValue<uint> m_refreshInterval; CachedSettingValue<int> m_refreshInterval;
CachedSettingValue<bool> m_isPreallocationEnabled; CachedSettingValue<bool> m_isPreallocationEnabled;
CachedSettingValue<QString> m_torrentExportDirectory; CachedSettingValue<QString> m_torrentExportDirectory;
CachedSettingValue<QString> m_finishedTorrentExportDirectory; CachedSettingValue<QString> m_finishedTorrentExportDirectory;
@ -707,7 +707,7 @@ namespace BitTorrent
CachedSettingValue<int> m_altGlobalUploadSpeedLimit; CachedSettingValue<int> m_altGlobalUploadSpeedLimit;
CachedSettingValue<bool> m_isAltGlobalSpeedLimitEnabled; CachedSettingValue<bool> m_isAltGlobalSpeedLimitEnabled;
CachedSettingValue<bool> m_isBandwidthSchedulerEnabled; CachedSettingValue<bool> m_isBandwidthSchedulerEnabled;
CachedSettingValue<uint> m_saveResumeDataInterval; CachedSettingValue<int> m_saveResumeDataInterval;
CachedSettingValue<int> m_port; CachedSettingValue<int> m_port;
CachedSettingValue<bool> m_useRandomPort; CachedSettingValue<bool> m_useRandomPort;
CachedSettingValue<QString> m_networkInterface; CachedSettingValue<QString> m_networkInterface;

6
src/base/rss/rss_session.cpp
View File

@ -65,7 +65,7 @@ QPointer<Session> Session::m_instance = nullptr;
Session::Session() Session::Session()
: m_processingEnabled(SettingsStorage::instance()->loadValue(SettingsKey_ProcessingEnabled, false).toBool()) : m_processingEnabled(SettingsStorage::instance()->loadValue(SettingsKey_ProcessingEnabled, false).toBool())
, m_workingThread(new QThread(this)) , m_workingThread(new QThread(this))
, m_refreshInterval(SettingsStorage::instance()->loadValue(SettingsKey_RefreshInterval, 30).toUInt()) , m_refreshInterval(SettingsStorage::instance()->loadValue(SettingsKey_RefreshInterval, 30).toInt())
, m_maxArticlesPerFeed(SettingsStorage::instance()->loadValue(SettingsKey_MaxArticlesPerFeed, 50).toInt()) , m_maxArticlesPerFeed(SettingsStorage::instance()->loadValue(SettingsKey_MaxArticlesPerFeed, 50).toInt())
{ {
Q_ASSERT(!m_instance); // only one instance is allowed Q_ASSERT(!m_instance); // only one instance is allowed
@ -475,12 +475,12 @@ Feed *Session::feedByURL(const QString &url) const
return m_feedsByURL.value(url); return m_feedsByURL.value(url);
} }
uint Session::refreshInterval() const int Session::refreshInterval() const
{ {
return m_refreshInterval; return m_refreshInterval;
} }
void Session::setRefreshInterval(const uint refreshInterval) void Session::setRefreshInterval(const int refreshInterval)
{ {
if (m_refreshInterval != refreshInterval) { if (m_refreshInterval != refreshInterval) {
SettingsStorage::instance()->storeValue(SettingsKey_RefreshInterval, refreshInterval); SettingsStorage::instance()->storeValue(SettingsKey_RefreshInterval, refreshInterval);

6
src/base/rss/rss_session.h
View File

@ -101,8 +101,8 @@ namespace RSS
int maxArticlesPerFeed() const; int maxArticlesPerFeed() const;
void setMaxArticlesPerFeed(int n); void setMaxArticlesPerFeed(int n);
uint refreshInterval() const; int refreshInterval() const;
void setRefreshInterval(uint refreshInterval); void setRefreshInterval(int refreshInterval);
bool addFolder(const QString &path, QString *error = nullptr); bool addFolder(const QString &path, QString *error = nullptr);
bool addFeed(const QString &url, const QString &path, QString *error = nullptr); bool addFeed(const QString &url, const QString &path, QString *error = nullptr);
@ -152,7 +152,7 @@ namespace RSS
AsyncFileStorage *m_confFileStorage; AsyncFileStorage *m_confFileStorage;
AsyncFileStorage *m_dataFileStorage; AsyncFileStorage *m_dataFileStorage;
QTimer m_refreshTimer; QTimer m_refreshTimer;
uint m_refreshInterval; int m_refreshInterval;
int m_maxArticlesPerFeed; int m_maxArticlesPerFeed;
QHash<QString, Item *> m_itemsByPath; QHash<QString, Item *> m_itemsByPath;
QHash<QUuid, Feed *> m_feedsByUID; QHash<QUuid, Feed *> m_feedsByUID;

2
src/gui/rss/rsswidget.cpp
View File

@ -521,7 +521,7 @@ void RSSWidget::restoreSlidersPosition()
m_ui->splitterMain->restoreState(stateMain); m_ui->splitterMain->restoreState(stateMain);
} }
void RSSWidget::updateRefreshInterval(uint val) void RSSWidget::updateRefreshInterval(int val) const
{ {
RSS::Session::instance()->setRefreshInterval(val); RSS::Session::instance()->setRefreshInterval(val);
} }

2
src/gui/rss/rsswidget.h
View File

@ -54,7 +54,7 @@ public:
public slots: public slots:
void deleteSelectedItems(); void deleteSelectedItems();
void updateRefreshInterval(uint val); void updateRefreshInterval(int val) const;
signals: signals:
void unreadCountUpdated(int count); void unreadCountUpdated(int count);

6
src/webui/api/appcontroller.cpp
View File

@ -254,7 +254,7 @@ void AppController::preferencesAction()
data["dyndns_domain"] = pref->getDynDomainName(); data["dyndns_domain"] = pref->getDynDomainName();
// RSS settings // RSS settings
data["rss_refresh_interval"] = static_cast<double>(RSS::Session::instance()->refreshInterval()); data["rss_refresh_interval"] = RSS::Session::instance()->refreshInterval();
data["rss_max_articles_per_feed"] = RSS::Session::instance()->maxArticlesPerFeed(); data["rss_max_articles_per_feed"] = RSS::Session::instance()->maxArticlesPerFeed();
data["rss_processing_enabled"] = RSS::Session::instance()->isProcessingEnabled(); data["rss_processing_enabled"] = RSS::Session::instance()->isProcessingEnabled();
data["rss_auto_downloading_enabled"] = RSS::AutoDownloader::instance()->isProcessingEnabled(); data["rss_auto_downloading_enabled"] = RSS::AutoDownloader::instance()->isProcessingEnabled();
@ -268,7 +268,7 @@ void AppController::preferencesAction()
// Current network interface address // Current network interface address
data["current_interface_address"] = BitTorrent::Session::instance()->networkInterfaceAddress(); data["current_interface_address"] = BitTorrent::Session::instance()->networkInterfaceAddress();
// Save resume data interval // Save resume data interval
data["save_resume_data_interval"] = static_cast<double>(session->saveResumeDataInterval()); data["save_resume_data_interval"] = session->saveResumeDataInterval();
// Recheck completed torrents // Recheck completed torrents
data["recheck_completed_torrents"] = pref->recheckTorrentsOnCompletion(); data["recheck_completed_torrents"] = pref->recheckTorrentsOnCompletion();
// Resolve peer countries // Resolve peer countries
@ -654,7 +654,7 @@ void AppController::setPreferencesAction()
pref->setDynDomainName(it.value().toString()); pref->setDynDomainName(it.value().toString());
if (hasKey("rss_refresh_interval")) if (hasKey("rss_refresh_interval"))
RSS::Session::instance()->setRefreshInterval(it.value().toUInt()); RSS::Session::instance()->setRefreshInterval(it.value().toInt());
if (hasKey("rss_max_articles_per_feed")) if (hasKey("rss_max_articles_per_feed"))
RSS::Session::instance()->setMaxArticlesPerFeed(it.value().toInt()); RSS::Session::instance()->setMaxArticlesPerFeed(it.value().toInt());
if (hasKey("rss_processing_enabled")) if (hasKey("rss_processing_enabled"))