diff --git a/Tubio/Idler.cpp b/Tubio/Idler.cpp
index 762930c..4201057 100644
--- a/Tubio/Idler.cpp
+++ b/Tubio/Idler.cpp
@@ -6,16 +6,14 @@
void Idler::Update()
{
// Has no request been made within 3 minutes?
- if (time(0) - XGControl::last_query_time > TIME_TO_FALL_ASLEEP)
+ if (time(0) - XGControl::last_query_time > 10)
{
// Let the processor chill for a second.
// This should reduce the idling-cpu load to near 0%
#ifdef _WIN
- std::cout << "Sleeping..." << std::endl;
- Sleep(SLEEP_TIME * 1000); // Uses milliseconds
- std::cout << "Waking..." << std::endl;
+ Sleep(SLEEP_TIME * 1e3); // Uses milliseconds
#else
- usleep(SLEEP_TIME * 10000000); // Uses microseconds
+ usleep(SLEEP_TIME * 1e6); // Uses microseconds
#endif
}
}
diff --git a/Tubio/RestQueryHandler.cpp b/Tubio/RestQueryHandler.cpp
index f8c617d..5ce03d4 100644
--- a/Tubio/RestQueryHandler.cpp
+++ b/Tubio/RestQueryHandler.cpp
@@ -1,4 +1,5 @@
#include "RestQueryHandler.h"
+#include "Version.h"
using namespace Rest;
using namespace Logging;
@@ -44,6 +45,7 @@ bool RestQueryHandler::ProcessQuery(const std::string clientAdress, const Json&
else if (requestName == "remove_download_entry") return RemoveDownloadEntry(requestBody, responseBody, responseCode);
else if (requestName == "update_config") return UpdateConfig(requestBody, responseBody, responseCode);
else if (requestName == "reset_config_to_default_values") return ResetConfigDefaults(requestBody, responseBody, responseCode);
+ else if (requestName == "get_server_version") return GetServerVersion(requestBody, responseBody, responseCode);
@@ -494,6 +496,14 @@ bool RestQueryHandler::ResetConfigDefaults(const JsonBlock& request, JsonBlock&
return true;
}
+bool Rest::RestQueryHandler::GetServerVersion(const JasonPP::JsonBlock& request, JasonPP::JsonBlock& responseBody, HTTP_STATUS_CODE& responseCode)
+{
+ responseCode = OK;
+ responseBody.CloneFrom(RestResponseTemplates::GetByCode(OK));
+ responseBody.Set("server_version").SetFloatData(TUBIO_SERVER_VERSION);
+ return true;
+}
+
diff --git a/Tubio/RestQueryHandler.h b/Tubio/RestQueryHandler.h
index ab9ed12..bd2e5a5 100644
--- a/Tubio/RestQueryHandler.h
+++ b/Tubio/RestQueryHandler.h
@@ -36,6 +36,7 @@ namespace Rest
static bool RemoveDownloadEntry(const JasonPP::JsonBlock& request, JasonPP::JsonBlock& responseBody, HTTP_STATUS_CODE& responseCode);
static bool UpdateConfig(const JasonPP::JsonBlock& request, JasonPP::JsonBlock& responseBody, HTTP_STATUS_CODE& responseCode);
static bool ResetConfigDefaults(const JasonPP::JsonBlock& request, JasonPP::JsonBlock& responseBody, HTTP_STATUS_CODE& responseCode);
+ static bool GetServerVersion(const JasonPP::JsonBlock& request, JasonPP::JsonBlock& responseBody, HTTP_STATUS_CODE& responseCode);
static bool ValidateField(const std::string name, const JasonPP::JDType type, const JasonPP::Json& checkThat, JasonPP::JsonBlock& putErrorResponseHere);
diff --git a/Tubio/Tubio.vcxproj b/Tubio/Tubio.vcxproj
index 36db03f..a392869 100644
--- a/Tubio/Tubio.vcxproj
+++ b/Tubio/Tubio.vcxproj
@@ -180,6 +180,7 @@
+
diff --git a/Tubio/Tubio.vcxproj.filters b/Tubio/Tubio.vcxproj.filters
index b279a81..4ca00f7 100644
--- a/Tubio/Tubio.vcxproj.filters
+++ b/Tubio/Tubio.vcxproj.filters
@@ -119,5 +119,8 @@
Headerdateien
+
+ Headerdateien
+
\ No newline at end of file
diff --git a/Tubio/Version.h b/Tubio/Version.h
new file mode 100644
index 0000000..82a8882
--- /dev/null
+++ b/Tubio/Version.h
@@ -0,0 +1,2 @@
+#pragma once
+#define TUBIO_SERVER_VERSION (0.5)
diff --git a/Tubio/frontend/200.html b/Tubio/frontend/200.html
index 44836cb..18b40a6 100644
--- a/Tubio/frontend/200.html
+++ b/Tubio/frontend/200.html
@@ -1,9 +1,9 @@
- Tubio - Video downloader
+ Tubio - Video downloader
-
-
+
+