Start using NewSimpleFuture in ServerConnection

hyperquantum · Jul 17, 2024 · 044ac8f · 044ac8f
1 parent 24ededb
commit 044ac8f
Show file tree

Hide file tree

Showing 24 changed files with 132 additions and 87 deletions.
diff --git a/src/client/generalcontroller.h b/src/client/generalcontroller.h
@@ -21,6 21,7 @@
 #define PMP_GENERALCONTROLLER_H
 
 #include "common/future.h"
 #include "common/newfuture.h"
 #include "common/resultmessageerrorcode.h"
 #include "common/serverhealthstatus.h"
 #include "common/startstopeventstatus.h"
@@ -41,9 42,9 @@ namespace PMP::Client
 
  virtual qint64 clientClockTimeOffsetMs() const = 0;
 
- virtual SimpleFuture<AnyResultMessageCode> startFullIndexation() = 0;
- virtual SimpleFuture<AnyResultMessageCode> startQuickScanForNewFiles() = 0;
- virtual SimpleFuture<AnyResultMessageCode> reloadServerSettings() = 0;
  virtual NewSimpleFuture<AnyResultMessageCode> startFullIndexation() = 0;
  virtual NewSimpleFuture<AnyResultMessageCode> startQuickScanForNewFiles() = 0;
  virtual NewSimpleFuture<AnyResultMessageCode> reloadServerSettings() = 0;
 
  virtual Future<VersionInfo, ResultMessageErrorCode> getServerVersionInfo() = 0;
 

diff --git a/src/client/generalcontrollerimpl.cpp b/src/client/generalcontrollerimpl.cpp
@@ -76,17 76,18 @@ namespace PMP::Client
  return _clientClockTimeOffsetMs;
  }
 
- SimpleFuture<AnyResultMessageCode> GeneralControllerImpl::startFullIndexation()
  NewSimpleFuture<AnyResultMessageCode> GeneralControllerImpl::startFullIndexation()
  {
  return _connection->startFullIndexation();
  }
 
- SimpleFuture<AnyResultMessageCode> GeneralControllerImpl::startQuickScanForNewFiles()
  NewSimpleFuture<AnyResultMessageCode>
  GeneralControllerImpl::startQuickScanForNewFiles()
  {
  return _connection->startQuickScanForNewFiles();
  }
 
- SimpleFuture<AnyResultMessageCode> GeneralControllerImpl::reloadServerSettings()
  NewSimpleFuture<AnyResultMessageCode> GeneralControllerImpl::reloadServerSettings()
  {
  return _connection->reloadServerSettings();
  }

diff --git a/src/client/generalcontrollerimpl.h b/src/client/generalcontrollerimpl.h
@@ -38,9 38,9 @@ namespace PMP::Client
 
  qint64 clientClockTimeOffsetMs() const override;
 
- SimpleFuture<AnyResultMessageCode> startFullIndexation() override;
- SimpleFuture<AnyResultMessageCode> startQuickScanForNewFiles() override;
- SimpleFuture<AnyResultMessageCode> reloadServerSettings() override;
  NewSimpleFuture<AnyResultMessageCode> startFullIndexation() override;
  NewSimpleFuture<AnyResultMessageCode> startQuickScanForNewFiles() override;
  NewSimpleFuture<AnyResultMessageCode> reloadServerSettings() override;
 
  Future<VersionInfo, ResultMessageErrorCode> getServerVersionInfo() override;
 

diff --git a/src/client/playercontroller.h b/src/client/playercontroller.h
@@ -1,5 1,5 @@
 /*
- Copyright (C) 2017-2023, Kevin Andre <[email protected]>
  Copyright (C) 2017-2024, Kevin Andre <[email protected]>
 
  This file is part of PMP (Party Music Player).
 
@@ -21,7 21,7 @@
 #define PMP_PLAYERCONTROLLER_H
 
 #include "common/tribool.h"
-#include "common/future.h"
 #include "common/newfuture.h"
 #include "common/playermode.h"
 #include "common/playerstate.h"
 #include "common/resultmessageerrorcode.h"
@@ -54,11 54,11 @@ namespace PMP::Client
  virtual int volume() const = 0;
 
  virtual QDateTime delayedStartServerDeadline() = 0;
- virtual SimpleFuture<AnyResultMessageCode> activateDelayedStart(
  virtual NewSimpleFuture<AnyResultMessageCode> activateDelayedStart(
  qint64 delayMilliseconds) = 0;
- virtual SimpleFuture<AnyResultMessageCode> activateDelayedStart(
  virtual NewSimpleFuture<AnyResultMessageCode> activateDelayedStart(
  QDateTime startTime) = 0;
- virtual SimpleFuture<AnyResultMessageCode> deactivateDelayedStart() = 0;
  virtual NewSimpleFuture<AnyResultMessageCode> deactivateDelayedStart() = 0;
 
  public Q_SLOTS:
  virtual void play() = 0;

diff --git a/src/client/playercontrollerimpl.cpp b/src/client/playercontrollerimpl.cpp
@@ -1,5 1,5 @@
 /*
- Copyright (C) 2020-2022, Kevin Andre <[email protected]>
  Copyright (C) 2020-2024, Kevin Andre <[email protected]>
 
  This file is part of PMP (Party Music Player).
 
@@ -145,13 145,13 @@ namespace PMP::Client
  return _delayedStartServerDeadline;
  }
 
- SimpleFuture<AnyResultMessageCode> PlayerControllerImpl::activateDelayedStart(
  NewSimpleFuture<AnyResultMessageCode> PlayerControllerImpl::activateDelayedStart(
  qint64 delayMilliseconds)
  {
  return _connection->activateDelayedStart(delayMilliseconds);
  }
 
- SimpleFuture<AnyResultMessageCode> PlayerControllerImpl::activateDelayedStart(
  NewSimpleFuture<AnyResultMessageCode> PlayerControllerImpl::activateDelayedStart(
  QDateTime startTime)
  {
  auto delayMilliseconds =
@@ -160,7 160,7 @@ namespace PMP::Client
  return activateDelayedStart(delayMilliseconds);
  }
 
- SimpleFuture<AnyResultMessageCode> PlayerControllerImpl::deactivateDelayedStart()
  NewSimpleFuture<AnyResultMessageCode> PlayerControllerImpl::deactivateDelayedStart()
  {
  return _connection->deactivateDelayedStart();
  }

diff --git a/src/client/playercontrollerimpl.h b/src/client/playercontrollerimpl.h
@@ -50,11 50,11 @@ namespace PMP::Client
  int volume() const override;
 
  QDateTime delayedStartServerDeadline() override;
- SimpleFuture<AnyResultMessageCode> activateDelayedStart(
  NewSimpleFuture<AnyResultMessageCode> activateDelayedStart(
  qint64 delayMilliseconds) override;
- SimpleFuture<AnyResultMessageCode> activateDelayedStart(
  NewSimpleFuture<AnyResultMessageCode> activateDelayedStart(
  QDateTime startTime) override;
- SimpleFuture<AnyResultMessageCode> deactivateDelayedStart() override;
  NewSimpleFuture<AnyResultMessageCode> deactivateDelayedStart() override;
 
  public Q_SLOTS:
  void play() override;

diff --git a/src/client/scrobblingcontroller.h b/src/client/scrobblingcontroller.h
@@ -1,5 1,5 @@
 /*
- Copyright (C) 2022-2023, Kevin Andre <[email protected]>
  Copyright (C) 2022-2024, Kevin Andre <[email protected]>
 
  This file is part of PMP (Party Music Player).
 
@@ -20,7 20,7 @@
 #ifndef PMP_SCROBBLINGCONTROLLER_H
 #define PMP_SCROBBLINGCONTROLLER_H
 
-#include "common/future.h"
 #include "common/newfuture.h"
 #include "common/nullable.h"
 #include "common/resultmessageerrorcode.h"
 #include "common/scrobblerstatus.h"
@@ -38,7 38,7 @@ namespace PMP::Client
  virtual Nullable<bool> lastFmEnabled() const = 0;
  virtual ScrobblerStatus lastFmStatus() const = 0;
 
- virtual SimpleFuture<AnyResultMessageCode> authenticateLastFm(
  virtual NewSimpleFuture<AnyResultMessageCode> authenticateLastFm(
  QString usernameOrEmail,
  QString password) = 0;
 

diff --git a/src/client/scrobblingcontrollerimpl.cpp b/src/client/scrobblingcontrollerimpl.cpp
@@ -1,5 1,5 @@
 /*
- Copyright (C) 2022-2023, Kevin Andre <[email protected]>
  Copyright (C) 2022-2024, Kevin Andre <[email protected]>
 
  This file is part of PMP (Party Music Player).
 
@@ -91,7 91,7 @@ namespace PMP::Client
  return _lastFmStatus;
  }
 
- SimpleFuture<AnyResultMessageCode> ScrobblingControllerImpl::authenticateLastFm(
  NewSimpleFuture<AnyResultMessageCode> ScrobblingControllerImpl::authenticateLastFm(
  QString usernameOrEmail,
  QString password)
  {

diff --git a/src/client/scrobblingcontrollerimpl.h b/src/client/scrobblingcontrollerimpl.h
@@ -1,5 1,5 @@
 /*
- Copyright (C) 2022-2023, Kevin Andre <[email protected]>
  Copyright (C) 2022-2024, Kevin Andre <[email protected]>
 
  This file is part of PMP (Party Music Player).
 
@@ -35,7 35,7 @@ namespace PMP::Client
  Nullable<bool> lastFmEnabled() const override;
  ScrobblerStatus lastFmStatus() const override;
 
- SimpleFuture<AnyResultMessageCode> authenticateLastFm(QString usernameOrEmail,
  NewSimpleFuture<AnyResultMessageCode> authenticateLastFm(QString usernameOrEmail,
  QString password) override;
 
  public Q_SLOTS:

diff --git a/src/client/serverconnection.cpp b/src/client/serverconnection.cpp
@@ -21,6 21,7 @@
 
 #include "common/networkprotocol.h"
 #include "common/networkutil.h"
 #include "common/newasync.h"
 #include "common/promise.h"
 #include "common/startstopeventstatus.h"
 #include "common/util.h"
@@ -215,7 216,7 @@ namespace PMP::Client
  public:
  PromiseResultHandler(ServerConnection* parent);
 
- SimpleFuture<AnyResultMessageCode> future() const;
  NewSimpleFuture<AnyResultMessageCode> future() const;
 
  void handleResult(ResultMessageData const& data) override;
  void handleExtensionResult(ExtensionResultMessageData const& data) override;
@@ -226,16 227,17 @@ namespace PMP::Client
  ExtensionResultMessageData const& data);
 
  private:
- SimplePromise<AnyResultMessageCode> _promise;
  NewSimplePromise<AnyResultMessageCode> _promise;
  };
 
  ServerConnection::PromiseResultHandler::PromiseResultHandler(ServerConnection* parent)
- : ResultHandler(parent)
  : ResultHandler(parent),
  _promise(NewAsync::createSimplePromise<AnyResultMessageCode>())
  {
  //
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::PromiseResultHandler::future(
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::PromiseResultHandler::future(
  ) const
  {
  return _promise.future();
@@ -255,15 257,15 @@ namespace PMP::Client
  << errorDescription(data);
  }
 
- _promise.setResult(data.errorType);
  _promise.setOutcome(data.errorType);
  }
 
  void ServerConnection::PromiseResultHandler::handleExtensionResult(
  const ExtensionResultMessageData& data)
  {
  auto code = convertExtensionResultCode(data);
 
- _promise.setResult(code);
  _promise.setOutcome(code);
  }
 
  QString ServerConnection::PromiseResultHandler::getActionDetail() const
@@ -1088,8 1090,8 @@ namespace PMP::Client
  sendBinaryMessage(message);
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::sendParameterlessActionRequest(
-  ParameterlessActionCode code)
  NewSimpleFuture<AnyResultMessageCode>
  ServerConnection::sendParameterlessActionRequest(ParameterlessActionCode code)
  {
  if (NetworkProtocol::isSupported(code, _serverProtocolNo) == false)
  return serverTooOldFutureResult();
@@ -1226,22 1228,24 @@ namespace PMP::Client
  return signalRequestError(ResultMessageErrorCode::ServerTooOld, errorSignal);
  }
 
- FutureResult<AnyResultMessageCode> ServerConnection::noErrorFutureResult()
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::noErrorFutureResult()
  {
- return FutureResult(AnyResultMessageCode(ResultMessageErrorCode::NoError));
  return NewSimpleFuture<AnyResultMessageCode>::fromOutcome(
  ResultMessageErrorCode::NoError);
  }
 
- FutureResult<AnyResultMessageCode> ServerConnection::serverTooOldFutureResult()
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::serverTooOldFutureResult()
  {
- return FutureResult(AnyResultMessageCode(ResultMessageErrorCode::ServerTooOld));
  return NewSimpleFuture<AnyResultMessageCode>::fromOutcome(
  ResultMessageErrorCode::ServerTooOld);
  }
 
  FutureError<AnyResultMessageCode> ServerConnection::serverTooOldFutureError()
  {
  return FutureError(AnyResultMessageCode(ResultMessageErrorCode::ServerTooOld));
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::reloadServerSettings()
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::reloadServerSettings()
  {
  if (!serverCapabilities().supportsReloadingServerSettings())
  return serverTooOldFutureResult();
@@ -1252,7 1256,7 @@ namespace PMP::Client
  ParameterlessActionCode::ReloadServerSettings);
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::startFullIndexation()
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::startFullIndexation()
  {
  qDebug() << "sending request to start a full indexation";
 
@@ -1267,15 1271,15 @@ namespace PMP::Client
  return noErrorFutureResult();
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::startQuickScanForNewFiles()
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::startQuickScanForNewFiles()
  {
  qDebug() << "sending request to start a quick scan for new files";
 
  return sendParameterlessActionRequest(
  ParameterlessActionCode::StartQuickScanForNewFiles);
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::activateDelayedStart(
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::activateDelayedStart(
  qint64 delayMilliseconds)
  {
  if (!serverCapabilities().supportsDelayedStart())
@@ -1300,7 1304,7 @@ namespace PMP::Client
  return handler->future();
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::deactivateDelayedStart()
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::deactivateDelayedStart()
  {
  if (!serverCapabilities().supportsDelayedStart())
  return serverTooOldFutureResult();
@@ -1644,7 1648,7 @@ namespace PMP::Client
  sendUserScrobblingEnableDisableRequest(provider, false);
  }
 
- SimpleFuture<AnyResultMessageCode> ServerConnection::authenticateScrobbling(
  NewSimpleFuture<AnyResultMessageCode> ServerConnection::authenticateScrobbling(
  ScrobblingProvider provider,
  QString username,
  QString password)
@@ -1791,7 1795,7 @@ namespace PMP::Client
  sendBinaryMessage(message);
  }
 
- SimpleFuture<AnyResultMessageCode>
  NewSimpleFuture<AnyResultMessageCode>
  ServerConnection::sendScrobblingAuthenticationMessage(ScrobblingProvider provider,
  QString username,
  QString password)