rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

Made usage tracker fully functional, with LP URL

Browse Source
This commit is contained in:
Paul Jewell 2015-09-16 20:02:23 +01:00
parent 3961d4a293
commit 1a6ff50d20
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/gcs/src/plugins/coreplugin/Core.pluginspec
View File

@ -1,7 +1,7 @@
<plugin name="Core" version="1.0.0" compatVersion="1.0.0"> <plugin name="Core" version="1.0.0" compatVersion="1.0.0">
<vendor>The OpenPilot Project</vendor> <vendor>The OpenPilot Project</vendor>
<copyright>(C) 2010 OpenPilot Project and Nokia</copyright> <copyright>(C) 2015 Librepilot Project; 2010 OpenPilot Project and Nokia</copyright>
<license>The GNU Public License (GPL) Version 3</license> <license>The GNU Public License (GPL) Version 3</license>
<description>The core plugin for the OpenPilot GCS</description> <description>The core plugin for the GCS</description>
<url>http://www.openpilot.org</url> <url>http://www.librepilot.org</url>
</plugin> </plugin>

3
ground/gcs/src/plugins/coreplugin/generalsettings.cpp
View File

@ -262,8 +262,7 @@ bool GeneralSettings::useUDPMirror() const
bool GeneralSettings::collectUsageData() const bool GeneralSettings::collectUsageData() const
{ {
// return m_collectUsageData; return m_collectUsageData;
return false;
} }
bool GeneralSettings::showUsageDataDisclaimer() const bool GeneralSettings::showUsageDataDisclaimer() const

6
ground/gcs/src/plugins/usagetracker/usagetracker.pluginspec
View File

@ -1,8 +1,8 @@
<plugin name="UsageTracker" version="1.0.0" compatVersion="1.0.0"> <plugin name="UsageTracker" version="1.0.0" compatVersion="1.0.0">
<vendor>The OpenPilot Project</vendor> <vendor>The LibrePilot Project</vendor>
<copyright>(C) 2015 OpenPilot Project</copyright> <copyright>(C) 2015 LibrePilot Project; OpenPilot Project</copyright>
<description>A plugin that tracks GCS usage</description> <description>A plugin that tracks GCS usage</description>
<url>http://www.openpilot.org</url> <url>http://www.librepilot.org</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="1.0.0"/> <dependency name="Core" version="1.0.0"/>
<dependency name="UAVTalk" version="1.0.0"/> <dependency name="UAVTalk" version="1.0.0"/>

6
ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp
View File

@ -2,7 +2,8 @@
****************************************************************************** ******************************************************************************
* *
* @file usagetrackerplugin.cpp * @file usagetrackerplugin.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins
* @{ * @{
* @addtogroup UsageTrackerPlugin Usage Tracker Plugin * @addtogroup UsageTrackerPlugin Usage Tracker Plugin
@ -138,7 +139,7 @@ void UsageTrackerPlugin::trackUsage()
if (shouldSend(hash)) { if (shouldSend(hash)) {
query.addQueryItem("hash", hash); query.addQueryItem("hash", hash);
QUrl url("https://www.librepilot.org/opver?" + query.toString(QUrl::FullyEncoded)); QUrl url("https://usagetracker.librepilot.org/?" + query.toString(QUrl::FullyEncoded));
QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager(); QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager();
@ -261,7 +262,6 @@ QString UsageTrackerPlugin::getUAVFieldValue(UAVObjectManager *objManager, QStri
QString UsageTrackerPlugin::getQueryHash(QString source) const QString UsageTrackerPlugin::getQueryHash(QString source) const
{ {
source += "OpenPilot Fuck Yeah!";
return QString(QCryptographicHash::hash(QByteArray(source.toStdString().c_str()), QCryptographicHash::Md5).toHex()); return QString(QCryptographicHash::hash(QByteArray(source.toStdString().c_str()), QCryptographicHash::Md5).toHex());
} }

5
ground/gcs/src/plugins/usagetracker/usagetrackerplugin.h
View File

@ -2,7 +2,8 @@
****************************************************************************** ******************************************************************************
* *
* @file usagetrackerplugin.h * @file usagetrackerplugin.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins
* @{ * @{
* @addtogroup UsageTrackerPlugin Usage Tracker Plugin * @addtogroup UsageTrackerPlugin Usage Tracker Plugin
@ -36,7 +37,7 @@ class QNetworkReply;
class UsageTrackerPlugin : public ExtensionSystem::IPlugin { class UsageTrackerPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.UsageTracker") Q_PLUGIN_METADATA(IID "LibrePilot.UsageTracker")
public: public:
UsageTrackerPlugin(); UsageTrackerPlugin();
~UsageTrackerPlugin(); ~UsageTrackerPlugin();