Make AcoustId great again

src/acoustid/acoustid.cpp

@@ -89,38 +89,34 @@ AcoustId::~AcoustId()
 	});
 }*/
 
-void AcoustId::start()
+void AcoustId::start(const QList<QUrl> &tracks)
 {
-	/*if (!_selectedTracksModel->selectedTracks().isEmpty()) {
-		_stackedWidget->setVisible(true);
-
-		QString appName = QCoreApplication::instance()->applicationName();
-		QString appVersion = QCoreApplication::instance()->applicationVersion();
-		QString client = appName.append(appVersion);
-
-		for (int i = 0; i < _selectedTracksModel->selectedTracks().count(); i++) {
-			QString track = _selectedTracksModel->selectedTracks().at(i).toLocalFile();
-			if (_chromaprint->start(track)) {
-
-				QString fingerprint = _chromaprint->fingerprint();
-				if (!fingerprint.isEmpty()) {
-
-					QUrlQuery urlQuery;
-					urlQuery.addQueryItem("format", "json");
-					urlQuery.addQueryItem("client", AcoustId::_apiKey);
-					urlQuery.addQueryItem("duration", QString::number(_chromaprint->duration()));
-					urlQuery.addQueryItem("meta", "recordings+releasegroups+releases+tracks");
-					//qDebug() << fingerprint;
-					urlQuery.addQueryItem("fingerprint", fingerprint);
-
-					QNetworkRequest request(QUrl::fromEncoded(_wsAcoustID.toLatin1()));
-					request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-					//request.setRawHeader("Content-Encoding", "gzip");
-					request.setRawHeader("User-Agent", client.toLatin1());
-
-					_requestPool->add(track, request, urlQuery, _chromaprint->duration());
-				}
+	QString appName = QCoreApplication::instance()->applicationName();
+	QString appVersion = QCoreApplication::instance()->applicationVersion();
+	QString client = appName.append(appVersion);
+
+	for (int i = 0; i < tracks.count(); i++) {
+		QString track = tracks.at(i).toLocalFile();
+		if (_chromaprint->start(track)) {
+
+			QString fingerprint = _chromaprint->fingerprint();
+			if (!fingerprint.isEmpty()) {
+
+				QUrlQuery urlQuery;
+				urlQuery.addQueryItem("format", "json");
+				urlQuery.addQueryItem("client", AcoustId::_apiKey);
+				urlQuery.addQueryItem("duration", QString::number(_chromaprint->duration()));
+				urlQuery.addQueryItem("meta", "recordings+releasegroups+releases+tracks");
+				//qDebug() << fingerprint;
+				urlQuery.addQueryItem("fingerprint", fingerprint);
+
+				QNetworkRequest request(QUrl::fromEncoded(_wsAcoustID.toLatin1()));
+				request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+				//request.setRawHeader("Content-Encoding", "gzip");
+				request.setRawHeader("User-Agent", client.toLatin1());
+
+				_requestPool->add(track, request, urlQuery, _chromaprint->duration());
 			}
 		}
-	}*/
+	}
 }

src/acoustid/acoustid.h

@@ -31,7 +31,7 @@ class MIAMACOUSTID_LIBRARY AcoustId : public QObject
 
 	virtual ~AcoustId();
 
-	void start();
+	void start(const QList<QUrl> &tracks);
 
 signals:
 	void releaseFound(const MusicBrainz::Release &);

src/acoustid/qchromaprint.cpp

@@ -67,6 +67,7 @@ QString QChromaprint::fingerprint() const
 	int r = chromaprint_get_fingerprint(_ctx, &fp);
 	if (r == 1) {
 		QString s(fp);
+		qDebug() << Q_FUNC_INFO << "decoded fingerprint" << s;
 		return s;
 	} else {
 		return QString();
@@ -174,6 +175,9 @@ int QChromaprint::processFile(const QString &file)
 			ao->play(QByteArray::fromRawData(data.constData(), qMin(data.size(), ao->bufferSize())));
 			data.remove(0, qMin(data.size(), ao->bufferSize()));
 		}*/
+		/*if (!chromaprint_feed(_ctx, frame_data, first_part_size * frame.samplesPerChannel())) {
+			qDebug() << "ERROR: Could not process audio data";
+		}*/
 	}
 
 

src/acoustid/requestpool.cpp

@@ -39,6 +39,7 @@ void RequestPool::add(const QString &track, const QNetworkRequest &request, cons
 			_timer->start(1000);
 		}
 	} else {
+		qDebug() << Q_FUNC_INFO << track << urlQuery.query() << trackDuration;
 		QNetworkReply* reply = _nam.post(request, urlQuery.query(QUrl::FullyEncoded).toUtf8());
 		reply->setProperty("duration", trackDuration);
 		reply->setProperty("track", track);

src/acoustid/requestpool.h

@@ -27,7 +27,7 @@ class MIAMACOUSTID_LIBRARY RequestPool : public QObject
 	QMap<QString, QNetworkReply*> _map;
 
 	/**
-	 * \brief	The Triplet class is a nested class to manipulate queries easily.
+	 * \brief	The Quadruplet class is a nested class to manipulate queries easily.
 	 */
 	class Quadruplet
 	{

src/tageditor/tageditor.cpp

@@ -62,7 +62,7 @@ TagEditor::TagEditor(QWidget *parent)
 		combo->setProperty("column", _combos.key(combo));
 	}
 
-	connect(analyzePushButton, &QPushButton::clicked, _acoustId, &AcoustId::start);
+	connect(analyzePushButton, &QPushButton::clicked, this, &TagEditor::autoFetchTags);
 	connect(saveChangesButton, &QPushButton::clicked, this, &TagEditor::commitChanges);
 	connect(cancelButton, &QPushButton::clicked, this, &TagEditor::rollbackChanges);
 
@@ -323,6 +323,14 @@ void TagEditor::applyCoverToAll(bool isForAll, Cover *cover)
 	cancelButton->setEnabled(true);
 }
 
+void TagEditor::autoFetchTags()
+{
+	if (!selectedTracks().isEmpty()) {
+		//_stackedWidget->setVisible(true);
+		_acoustId->start(selectedTracks());
+	}
+}
+
 /** Saves all fields in the media. */
 void TagEditor::commitChanges()
 {

src/tageditor/tageditor.h

@@ -93,6 +93,8 @@ public slots:
 private slots:
 	void applyCoverToAll(bool isForAll, Cover *cover);
 
+	void autoFetchTags();
+
 	/** Saves all fields in the media. */
 	void commitChanges();