Some renames in ThumbnailDownloader

Names should reflect the semantics rather than the anatomy.
This commit is contained in:
Veloman Yunkan 2024-02-06 17:14:29 +04:00
parent b252033cc0
commit 4cbc6ee422
2 changed files with 11 additions and 9 deletions

View File

@ -7,8 +7,8 @@
ThumbnailDownloader::ThumbnailDownloader() ThumbnailDownloader::ThumbnailDownloader()
{ {
connect(this, &ThumbnailDownloader::oneThumbnailDownloaded, [=]() { connect(this, &ThumbnailDownloader::oneThumbnailDownloaded, [=]() {
if (m_urlPairList.size() != 0) if (m_downloadQueue.size() != 0)
downloadOnePair(m_urlPairList.takeFirst()); downloadThumbnail(m_downloadQueue.takeFirst());
else else
m_isDownloading = false; m_isDownloading = false;
}); });
@ -20,22 +20,22 @@ ThumbnailDownloader::~ThumbnailDownloader()
void ThumbnailDownloader::addDownload(QString url, ThumbnailId index) void ThumbnailDownloader::addDownload(QString url, ThumbnailId index)
{ {
m_urlPairList.append({index, url}); m_downloadQueue.append({index, url});
if (!m_isDownloading) if (!m_isDownloading)
startDownload(); startDownload();
} }
void ThumbnailDownloader::startDownload() void ThumbnailDownloader::startDownload()
{ {
if (m_urlPairList.size() == 0) { if (m_downloadQueue.size() == 0) {
m_isDownloading = false; m_isDownloading = false;
return; return;
} }
m_isDownloading = true; m_isDownloading = true;
downloadOnePair(m_urlPairList.takeFirst()); downloadThumbnail(m_downloadQueue.takeFirst());
} }
void ThumbnailDownloader::downloadOnePair(ThumbnailInfo thumbnailInfo) void ThumbnailDownloader::downloadThumbnail(ThumbnailInfo thumbnailInfo)
{ {
QNetworkRequest req(thumbnailInfo.second); QNetworkRequest req(thumbnailInfo.second);
auto reply = manager.get(req); auto reply = manager.get(req);

View File

@ -22,14 +22,16 @@ public:
void addDownload(QString url, ThumbnailId index); void addDownload(QString url, ThumbnailId index);
void startDownload(); void startDownload();
void downloadOnePair(ThumbnailInfo thumbnailInfo); void clearQueue() { m_downloadQueue.clear(); }
void clearQueue() { m_urlPairList.clear(); }
private:
void downloadThumbnail(ThumbnailInfo thumbnailInfo);
signals: signals:
void oneThumbnailDownloaded(ThumbnailId, QString, QByteArray); void oneThumbnailDownloaded(ThumbnailId, QString, QByteArray);
private: private:
QQueue<ThumbnailInfo> m_urlPairList; QQueue<ThumbnailInfo> m_downloadQueue;
QNetworkAccessManager manager; QNetworkAccessManager manager;
bool m_isDownloading = false; bool m_isDownloading = false;