From ec17dc9830ef98ec0d4493f6b36d92fc87aea622 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 18 Oct 2021 23:15:30 +0200
Subject: [PATCH] TagReaderClient: Sort functions

---
 ext/strawberry-tagreader/tagreaderworker.cpp |  9 ++--
 src/core/tagreaderclient.cpp                 | 54 ++++++++++----------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/ext/strawberry-tagreader/tagreaderworker.cpp b/ext/strawberry-tagreader/tagreaderworker.cpp
index 9ac2357b6..becaa2d32 100644
--- a/ext/strawberry-tagreader/tagreaderworker.cpp
+++ b/ext/strawberry-tagreader/tagreaderworker.cpp
@@ -34,16 +34,15 @@ void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
 
   spb::tagreader::Message reply;
 
-  if (message.has_read_file_request()) {
+  if (message.has_is_media_file_request()) {
+    reply.mutable_is_media_file_response()->set_success(tag_reader_.IsMediaFile(QStringFromStdString(message.is_media_file_request().filename())));
+  }
+  else if (message.has_read_file_request()) {
     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
   }
   else if (message.has_save_file_request()) {
     reply.mutable_save_file_response()->set_success(tag_reader_.SaveFile(QStringFromStdString(message.save_file_request().filename()), message.save_file_request().metadata()));
   }
-
-  else if (message.has_is_media_file_request()) {
-    reply.mutable_is_media_file_response()->set_success(tag_reader_.IsMediaFile(QStringFromStdString(message.is_media_file_request().filename())));
-  }
   else if (message.has_load_embedded_art_request()) {
     QByteArray data = tag_reader_.LoadEmbeddedArt(QStringFromStdString(message.load_embedded_art_request().filename()));
     reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp
index 675bb68b8..36be9a57b 100644
--- a/src/core/tagreaderclient.cpp
+++ b/src/core/tagreaderclient.cpp
@@ -69,6 +69,17 @@ void TagReaderClient::WorkerFailedToStart() {
   qLog(Error) << "The" << kWorkerExecutableName << "executable was not found in the current directory or on the PATH.  Strawberry will not be able to read music file tags without it.";
 }
 
+TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
+
+  spb::tagreader::Message message;
+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
+
+  req->set_filename(DataCommaSizeFromQString(filename));
+
+  return worker_pool_->SendMessageWithReply(&message);
+
+}
+
 TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
 
   spb::tagreader::Message message;
@@ -94,17 +105,6 @@ TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &m
 
 }
 
-TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
-
-  spb::tagreader::Message message;
-  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-
-  req->set_filename(DataCommaSizeFromQString(filename));
-
-  return worker_pool_->SendMessageWithReply(&message);
-
-}
-
 TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
 
   spb::tagreader::Message message;
@@ -128,6 +128,22 @@ TagReaderReply *TagReaderClient::SaveEmbeddedArt(const QString &filename, const
 
 }
 
+bool TagReaderClient::IsMediaFileBlocking(const QString &filename) {
+
+  Q_ASSERT(QThread::currentThread() != thread());
+
+  bool ret = false;
+
+  TagReaderReply *reply = IsMediaFile(filename);
+  if (reply->WaitForFinished()) {
+    ret = reply->message().is_media_file_response().success();
+  }
+  QMetaObject::invokeMethod(reply, "deleteLater", Qt::QueuedConnection);
+
+  return ret;
+
+}
+
 void TagReaderClient::ReadFileBlocking(const QString &filename, Song *song) {
 
   Q_ASSERT(QThread::currentThread() != thread());
@@ -156,22 +172,6 @@ bool TagReaderClient::SaveFileBlocking(const QString &filename, const Song &meta
 
 }
 
-bool TagReaderClient::IsMediaFileBlocking(const QString &filename) {
-
-  Q_ASSERT(QThread::currentThread() != thread());
-
-  bool ret = false;
-
-  TagReaderReply *reply = IsMediaFile(filename);
-  if (reply->WaitForFinished()) {
-    ret = reply->message().is_media_file_response().success();
-  }
-  QMetaObject::invokeMethod(reply, "deleteLater", Qt::QueuedConnection);
-
-  return ret;
-
-}
-
 QByteArray TagReaderClient::LoadEmbeddedArtBlocking(const QString &filename) {
 
   Q_ASSERT(QThread::currentThread() != thread());