squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-22 00:17:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using QDateTime for announce timestamps

Browse Source 
PR #21906.
This commit is contained in:
Vladimir Golovnev
2024-11-27 21:03:54 +03:00
committed by GitHub
parent 15ea836bb9
commit d90a9d15ac
8 changed files with 78 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/trackerlist/trackerlistmodel.cpp
View File

@@ -1,6 +1,6 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2023 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2023-2024 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org>
*
* This program is free software; you can redistribute it and/or
@@ -29,6 +29,7 @@
#include "trackerlistmodel.h"
#include <algorithm>
#include <chrono>
#include <boost/multi_index_container.hpp>
@@ -40,11 +41,13 @@
#include <boost/multi_index/tag.hpp>
#include <QColor>
#include <QDateTime>
#include <QList>
#include <QPointer>
#include <QScopeGuard>
#include <QTimer>
#include "base/bittorrent/announcetimepoint.h"
#include "base/bittorrent/peerinfo.h"
#include "base/bittorrent/session.h"
#include "base/bittorrent/torrent.h"
@@ -141,12 +144,12 @@ struct TrackerListModel::Item final
int numLeeches = -1;
int numDownloaded = -1;
QDateTime nextAnnounceTime {};
QDateTime minAnnounceTime {};
BitTorrent::AnnounceTimePoint nextAnnounceTime;
BitTorrent::AnnounceTimePoint minAnnounceTime;
qint64 secsToNextAnnounce = 0;
qint64 secsToMinAnnounce = 0;
QDateTime announceTimestamp;
BitTorrent::AnnounceTimePoint announceTimestamp;
std::weak_ptr<Item> parentItem {};
@@ -211,7 +214,7 @@ void TrackerListModel::Item::fillFrom(const BitTorrent::TrackerEntryStatus &trac
minAnnounceTime = trackerEntryStatus.minAnnounceTime;
secsToNextAnnounce = 0;
secsToMinAnnounce = 0;
announceTimestamp = QDateTime();
announceTimestamp = {};
}
void TrackerListModel::Item::fillFrom(const BitTorrent::TrackerEndpointStatus &endpointStatus)
@@ -230,7 +233,7 @@ void TrackerListModel::Item::fillFrom(const BitTorrent::TrackerEndpointStatus &e
minAnnounceTime = endpointStatus.minAnnounceTime;
secsToNextAnnounce = 0;
secsToMinAnnounce = 0;
announceTimestamp = QDateTime();
announceTimestamp = {};
}
TrackerListModel::TrackerListModel(BitTorrent::Session *btSession, QObject *parent)
@@ -369,7 +372,7 @@ void TrackerListModel::populate()
for (const BitTorrent::TrackerEntryStatus &status : trackers)
addTrackerItem(status);
m_announceTimestamp = QDateTime::currentDateTime();
m_announceTimestamp = BitTorrent::AnnounceTimePoint::clock::now();
m_announceRefreshTimer->start(ANNOUNCE_TIME_REFRESH_INTERVAL);
}
@@ -448,7 +451,7 @@ void TrackerListModel::refreshAnnounceTimes()
if (!m_torrent)
return;
m_announceTimestamp = QDateTime::currentDateTime();
m_announceTimestamp = BitTorrent::AnnounceTimePoint::clock::now();
emit dataChanged(index(0, COL_NEXT_ANNOUNCE), index((rowCount() - 1), COL_MIN_ANNOUNCE));
for (int i = 0; i < rowCount(); ++i)
{
@@ -545,8 +548,12 @@ QVariant TrackerListModel::data(const QModelIndex &index, const int role) const
if (itemPtr->announceTimestamp != m_announceTimestamp)
{
itemPtr->secsToNextAnnounce = std::max<qint64>(0, m_announceTimestamp.secsTo(itemPtr->nextAnnounceTime));
itemPtr->secsToMinAnnounce = std::max<qint64>(0, m_announceTimestamp.secsTo(itemPtr->minAnnounceTime));
const auto timeToNextAnnounce = std::chrono::duration_cast<std::chrono::seconds>(itemPtr->nextAnnounceTime - m_announceTimestamp);
itemPtr->secsToNextAnnounce = std::max<qint64>(0, timeToNextAnnounce.count());
const auto timeToMinAnnounce = std::chrono::duration_cast<std::chrono::seconds>(itemPtr->minAnnounceTime - m_announceTimestamp);
itemPtr->secsToMinAnnounce = std::max<qint64>(0, timeToMinAnnounce.count());
itemPtr->announceTimestamp = m_announceTimestamp;
}