Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix showing cover from LyricsWikia

This commit is contained in:
Martchus 2017-08-08 19:16:11 +02:00
parent 978de4f101
commit c64791e10f
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gui/dbquerywidget.cpp
View File

@ -131,7 +131,7 @@ SongDescription DbQueryWidget::currentSongDescription() const
desc.title = m_ui->titleLineEdit->text();
desc.album = m_ui->albumLineEdit->text();
desc.artist = m_ui->artistLineEdit->text();
desc.track = static_cast<unsigned int>(m_ui->trackSpinBox->value());
desc.track = m_ui->trackSpinBox->value();
return desc;
}
@ -154,9 +154,7 @@ void DbQueryWidget::searchMusicBrainz()
setStatus(false);
// do actual query
m_ui->resultsTreeView->setModel(m_model = queryMusicBrainz(currentSongDescription()));
connect(m_model, &QueryResultsModel::resultsAvailable, this, &DbQueryWidget::showResults);
connect(m_model, &QueryResultsModel::coverAvailable, this, &DbQueryWidget::showCoverFromIndex);
useQueryResults(queryMusicBrainz(currentSongDescription()));
}
void DbQueryWidget::searchLyricsWikia()
@ -178,9 +176,7 @@ void DbQueryWidget::searchLyricsWikia()
setStatus(false);
// do actual query
m_ui->resultsTreeView->setModel(m_model = queryLyricsWikia(currentSongDescription()));
connect(m_model, &QueryResultsModel::resultsAvailable, this, &DbQueryWidget::showResults);
connect(m_model, &QueryResultsModel::lyricsAvailable, this, &DbQueryWidget::showLyricsFromIndex);
useQueryResults(queryLyricsWikia(currentSongDescription()));
}
void DbQueryWidget::abortSearch()
@ -457,7 +453,7 @@ void DbQueryWidget::fetchAndShowCoverForSelection()
if(const QByteArray *cover = m_model->cover(selectedIndex)) {
showCover(*cover);
} else {
// cover couldn't be fetched, error tracks via resultsAvailable() signal so nothing to do
// cover couldn't be fetched, error tracked via resultsAvailable() signal so nothing to do
}
} else {
// cover is fetched asynchronously
@ -488,7 +484,7 @@ void DbQueryWidget::fetchAndShowLyricsForSelection()
if(const QByteArray *cover = m_model->cover(selectedIndex)) {
showLyrics(*cover);
} else {
// lyrics couldn't be fetched, error tracks via resultsAvailable() signal so nothing to do
// lyrics couldn't be fetched, error tracked via resultsAvailable() signal so nothing to do
}
} else {
// lyrics are fetched asynchronously
@ -581,4 +577,12 @@ bool DbQueryWidget::eventFilter(QObject *obj, QEvent *event)
return QWidget::eventFilter(obj, event);
}
void DbQueryWidget::useQueryResults(QueryResultsModel *queryResults)
{
m_ui->resultsTreeView->setModel(m_model = queryResults);
connect(queryResults, &QueryResultsModel::resultsAvailable, this, &DbQueryWidget::showResults);
connect(queryResults, &QueryResultsModel::lyricsAvailable, this, &DbQueryWidget::showLyricsFromIndex);
connect(queryResults, &QueryResultsModel::coverAvailable, this, &DbQueryWidget::showCoverFromIndex);
}
}

2
gui/dbquerywidget.h
View File

@ -63,6 +63,8 @@ protected:
bool eventFilter(QObject *obj, QEvent *event);
private:
void useQueryResults(QueryResultsModel *queryResults);
std::unique_ptr<Ui::DbQueryWidget> m_ui;
TagEditorWidget *m_tagEditorWidget;
QueryResultsModel *m_model;