Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of downloadStatusChanged in Enclosure

Browse Source 
Instead change the signature on statusChanged so it can pass on all
required information instead of needing two signals with separate
signatures.
This commit is contained in:
Bart De Vries 2021-05-02 09:05:26 +02:00
parent c9af45f2ce
commit 173b86b85d
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/enclosure.cpp
View File

@ -23,11 +23,7 @@ Enclosure::Enclosure(Entry *entry)
: QObject(entry)
, m_entry(entry)
{
// Set up signals to make DownloadProgressModel aware of ongoing downloads
connect(this, &Enclosure::statusChanged, this, [this]() {
Q_EMIT downloadStatusChanged(m_entry, m_status);
});
connect(this, &Enclosure::downloadStatusChanged, &DownloadProgressModel::instance(), &DownloadProgressModel::monitorDownloadProgress);
connect(this, &Enclosure::statusChanged, &DownloadProgressModel::instance(), &DownloadProgressModel::monitorDownloadProgress);
connect(this, &Enclosure::downloadError, &ErrorLogModel::instance(), &ErrorLogModel::monitorErrorMessages);
QSqlQuery query;
@ -111,13 +107,13 @@ void Enclosure::download()
}
}
disconnect(this, &Enclosure::cancelDownload, this, nullptr);
Q_EMIT statusChanged();
Q_EMIT statusChanged(m_entry, m_status);
});
connect(this, &Enclosure::cancelDownload, this, [this, downloadJob]() {
downloadJob->doKill();
m_status = Downloadable;
Q_EMIT statusChanged();
Q_EMIT statusChanged(m_entry, m_status);
Q_EMIT DataManager::instance().downloadCountChanged(m_entry->feed()->url());
disconnect(this, &Enclosure::cancelDownload, this, nullptr);
});
@ -128,7 +124,7 @@ void Enclosure::download()
});
m_status = Downloading;
Q_EMIT statusChanged();
Q_EMIT statusChanged(m_entry, m_status);
}
void Enclosure::processDownloadedFile()
@ -177,7 +173,7 @@ void Enclosure::deleteFile()
query.bindValue(QStringLiteral(":id"), m_entry->id());
query.bindValue(QStringLiteral(":downloaded"), false);
Database::instance().execute(query);
Q_EMIT statusChanged();
Q_EMIT statusChanged(m_entry, m_status);
Q_EMIT DataManager::instance().downloadCountChanged(m_entry->feed()->url());
}

3
src/enclosure.h
View File

@ -52,13 +52,12 @@ public:
void setSize(const int &size);
Q_SIGNALS:
void statusChanged();
void statusChanged(Entry *entry, Status status);
void downloadProgressChanged();
void cancelDownload();
void playPositionChanged();
void durationChanged();
void sizeChanged();
void downloadStatusChanged(Entry *entry, Status status);
void downloadError(const QString &url, const QString &id, const int errorId, const QString &errorString);
private: