Replace login helper with argument on run

kraxarn · Nov 17, 2024 · c79c4ac · c79c4ac
1 parent 42a9bdf
commit c79c4ac
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 166 deletions.
diff --git a/src/spotifyclient/CMakeLists.txt b/src/spotifyclient/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_sources(${PROJECT_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/helper.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/login.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/runner.cpp
 )
diff --git a/src/spotifyclient/login.cpp b/src/spotifyclient/login.cpp
diff --git a/src/spotifyclient/login.hpp b/src/spotifyclient/login.hpp
diff --git a/src/spotifyclient/runner.cpp b/src/spotifyclient/runner.cpp
@@ -56,6 +56,11 @@ void SpotifyClient::Runner::start()
 		return;
 	}
 
+	// Common arguments
+	QStringList arguments({
+		"--bitrate", QString::number(static_cast<int>(settings.spotify.bitrate)),
+	});
+
 	// Check if not logged in
 	if (!isLoggedIn())
 	{
@@ -65,15 +70,9 @@ void SpotifyClient::Runner::start()
 			return;
 		}
 
-		login();
-		return;
+		arguments.append(QStringLiteral("--enable-oauth"));
 	}
 
-	// Common arguments
-	QStringList arguments({
-		"--bitrate", QString::number(static_cast<int>(settings.spotify.bitrate)),
-	});
-
 	const auto initialVolume = QString::number(settings.spotify.volume);
 
 	// librespot specific
@@ -145,26 +144,6 @@ void SpotifyClient::Runner::start()
 	process->start(path, arguments);
 }
 
-void SpotifyClient::Runner::login()
-{
-	if (loginHelper != nullptr)
-	{
-		loginHelper->deleteLater();
-		loginHelper = nullptr;
-	}
-
-	loginHelper = new Login(parentWidget);
-
-	connect(loginHelper, &Login::loginSuccess,
-		this, &Runner::onLoginSuccess);
-
-	connect(loginHelper, &Login::loginFailed,
-		this, &Runner::onLoginFailed);
-
-	const auto cachePath = QString::fromStdString(getCachePath().string());
-	loginHelper->run(path, cachePath);
-}
-
 auto SpotifyClient::Runner::isRunning() const -> bool
 {
 	return process == nullptr
@@ -183,6 +162,14 @@ void SpotifyClient::Runner::logOutput(const QByteArray &output, lib::log_type lo
 
 		log.emplace_back(lib::date_time::now(), logType, line.toStdString());
 
+		const auto urlIndex = line.indexOf(QStringLiteral("https://accounts.spotify.com/authorize"));
+		if (urlIndex >= 0)
+		{
+			const auto url = line.right(line.length() - urlIndex);
+			auto *parent = qobject_cast<QWidget *>(QObject::parent());
+			Url::open(url, LinkType::Web, parent);
+		}
+
 		if (line.contains(QStringLiteral("Bad credentials")))
 		{
 			emit statusChanged(QStringLiteral("Bad credentials, please try again"));
@@ -246,30 +233,6 @@ void SpotifyClient::Runner::onErrorOccurred(QProcess::ProcessError error)
 	emit statusChanged(message);
 }
 
-void SpotifyClient::Runner::onLoginSuccess()
-{
-	if (!isLoggedIn())
-	{
-		lib::log::warn("Login successful, but not login found");
-		emit statusChanged(QStringLiteral("Unknown error"));
-		return;
-	}
-
-	loginHelper->deleteLater();
-	loginHelper = nullptr;
-
-	start();
-}
-
-void SpotifyClient::Runner::onLoginFailed(const QString &message)
-{
-	lib::log::warn(message.toStdString());
-	emit statusChanged(message);
-
-	loginHelper->deleteLater();
-	loginHelper = nullptr;
-}
-
 auto SpotifyClient::Runner::getLog() -> const std::vector<lib::log_message> &
 {
 	return log;

diff --git a/src/spotifyclient/runner.hpp b/src/spotifyclient/runner.hpp
@@ -5,7 +5,6 @@
 #include "lib/logmessage.hpp"
 
 #include "spotifyclient/helper.hpp"
-#include "spotifyclient/login.hpp"
 
 #include <QDateTime>
 #include <QFileInfo>
@@ -48,11 +47,9 @@ namespace SpotifyClient
 		const lib::settings &settings;
 		const lib::paths &paths;
 		lib::client_type clientType;
-		Login *loginHelper = nullptr;
 
 		void logOutput(const QByteArray &output, lib::log_type logType);
 		static auto joinArgs(const QStringList &args) -> QString;
-		void login();
 
 		auto getCachePath() const -> ghc::filesystem::path;
 		auto isLoggedIn() const -> bool;
@@ -62,8 +59,5 @@ namespace SpotifyClient
 		void onReadyReadError();
 		void onStarted();
 		void onErrorOccurred(QProcess::ProcessError error);
-
-		void onLoginSuccess();
-		void onLoginFailed(const QString &message);
 	};
 }