diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index d55464858..7bd56e753 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -280,7 +280,6 @@ void WebApplication::doProcessRequest() {"query/preferences", {"app", "preferences"}}, {"command/setPreferences", {"app", "setPreferences"}}, {"command/getSavePath", {"app", "defaultSavePath"}}, - {"version/qbittorrent", {"app", "version"}}, {"query/getLog", {"log", "main"}}, {"query/getPeerLog", {"log", "peers"}}, @@ -343,7 +342,8 @@ void WebApplication::doProcessRequest() (*params)["deleteFiles"] = "true"; const QString hash {match.captured(QLatin1String("hash"))}; - (*params)[QLatin1String("hash")] = hash; + if (!hash.isEmpty()) + (*params)[QLatin1String("hash")] = hash; return true; }; @@ -354,12 +354,17 @@ void WebApplication::doProcessRequest() APIController *controller = m_apiControllers.value(scope); if (!controller) { if (request().path == QLatin1String("/version/api")) { - print(QString(COMPAT_API_VERSION), Http::CONTENT_TYPE_TXT); + print(QString::number(COMPAT_API_VERSION), Http::CONTENT_TYPE_TXT); return; } if (request().path == QLatin1String("/version/api_min")) { - print(QString(COMPAT_API_VERSION_MIN), Http::CONTENT_TYPE_TXT); + print(QString::number(COMPAT_API_VERSION_MIN), Http::CONTENT_TYPE_TXT); + return; + } + + if (request().path == QLatin1String("/version/qbittorrent")) { + print(QString(QBT_VERSION), Http::CONTENT_TYPE_TXT); return; } diff --git a/src/webui/webapplication.h b/src/webui/webapplication.h index 2d098f6cb..73a36a07c 100644 --- a/src/webui/webapplication.h +++ b/src/webui/webapplication.h @@ -126,7 +126,7 @@ private: Http::Environment m_env; const QRegularExpression m_apiPathPattern {(QLatin1String("^/api/v2/(?[A-Za-z_][A-Za-z_0-9]*)/(?[A-Za-z_][A-Za-z_0-9]*)$"))}; - const QRegularExpression m_apiLegacyPathPattern {QLatin1String("^/(?((sync|control|query)/[A-Za-z_][A-Za-z_0-9]*|login|logout))(/(?[^/]+))?$")}; + const QRegularExpression m_apiLegacyPathPattern {QLatin1String("^/(?((sync|command|query)/[A-Za-z_][A-Za-z_0-9]*|login|logout))(/(?[^/]+))?$")}; QHash m_apiControllers; QSet m_publicAPIs;