Record fitness test data too (#39)

pcolby · Oct 8, 2014 · 8411b36 · 8411b36
1 parent 93a13c0
commit 8411b36
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/hook/qt/qnetworkaccessmanager.patch b/hook/qt/qnetworkaccessmanager.patch
@@ -1,5 +1,5 @@
---- qt-everywhere-opensource-src-5.1.1\qtbase\src\network\access\qnetworkaccessmanager.cpp	Sun Jun 29 10:12:25 2014
-+++ qt-everywhere-opensource-src-5.1.1\qtbase\src\network\access\qnetworkaccessmanager.new	Mon Aug  4 19:36:32 2014
+--- qt-everywhere-opensource-src-5.1.1\qtbase\src\network\access\qnetworkaccessmanager.cpp	Mon Aug 26 04:03:34 2013
++++ qt-everywhere-opensource-src-5.1.1\qtbase\src\network\access\qnetworkaccessmanager.new	Wed Oct  8 19:36:54 2014
 @@ -71,6 +71,8 @@
 
  #include "qthread.h"
@@ -9,7 +9,7 @@
  QT_BEGIN_NAMESPACE
 
  Q_GLOBAL_STATIC(QNetworkAccessFileBackendFactory, fileBackend)
-@@ -701,6 +703,54 @@
+@@ -701,6 +703,66 @@
  */
  QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, QIODevice *data)
  {
@@ -20,7 +20,9 @@
 +    debug.write(QString::fromLatin1("%1 urlPath %2\r")
 +        .arg(QDateTime::currentDateTime().toString())
 +        .arg(urlPath).toUtf8());
-+    if (urlPath.contains(QLatin1String("training-sessions"))) {
++    if (urlPath.contains(QLatin1String("tests")) ||
++        urlPath.contains(QLatin1String("training-sessions")))
++    {
 +        // Write the POST data file.
 +        const QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
 +        QString fileName(dataDir.path() + QDir::separator() + QLatin1String("export") + QDir::separator());
@@ -45,19 +47,29 @@
 +                .arg(QDateTime::currentDateTime().toString())
 +                .arg(QDir::toNativeSeparators(fileName)).toUtf8());
 +        }
-+        // Rename any existing *-create files that we now know the ID for.
++        // Rename any existing *-create files that we now know the IDs for.
++        QStringList src, dst;
 +        if (fileName.contains(QLatin1String("-exercises-"))) {
 +            const QStringList parts = fileName.split(QLatin1Char('-'));
 +            const int pos = parts.lastIndexOf(QLatin1String("exercises"));
 +            const bool creation = (parts.last() == QLatin1String("create"));
-+            const QStringList src = QStringList(parts.mid(0, creation ? pos-1 : pos+1)) + QStringList(QLatin1String("create"));
-+            const QStringList dst = QStringList(parts.mid(0, creation ? pos   : pos+2)) + QStringList(QLatin1String("create"));
++            src = QStringList(parts.mid(0, creation ? pos-1 : pos+1)) + QStringList(QLatin1String("create"));
++            dst = QStringList(parts.mid(0, creation ? pos   : pos+2)) + QStringList(QLatin1String("create"));
++        } else if ((fileName.contains(QLatin1String("-tests-"))) &&
++                   (!fileName.endsWith(QLatin1String("-create")))) {
++            const QStringList parts = fileName.split(QLatin1Char('-'));
++            src = QStringList(parts.mid(0, parts.size()-2)) + QStringList(QLatin1String("create"));
++            dst = QStringList(parts.mid(0, parts.size()-1)) + QStringList(QLatin1String("create"));
++        }
++        if ((!src.isEmpty()) && (!dst.isEmpty())) {
 +            QFile file(src.join(QLatin1Char('-')));
 +            if (file.exists()) {
++                const QString dstFileName = dst.join(QLatin1Char('-'));
 +                debug.write(QString::fromLatin1("%1 renaming '%2' to '%3'\r")
 +                    .arg(QDateTime::currentDateTime().toString())
-+                    .arg(QDir::toNativeSeparators(file.fileName())).toUtf8());
-+                file.rename(dst.join(QLatin1Char('-')));
++                    .arg(QDir::toNativeSeparators(file.fileName()))
++                    .arg(dstFileName).toUtf8());
++                file.rename(dstFileName);
 +            }
 +        }
 +    }

diff --git a/hook/qt/winmakefile.patch b/hook/qt/winmakefile.patch
@@ -1,10 +1,10 @@
 --- qt-everywhere-opensource-src-5.1.1\qtbase\qmake\generators\win32\winmakefile.cpp	Mon Aug 26 04:04:06 2013
-+++ qt-everywhere-opensource-src-5.1.1\qtbase\qmake\generators\win32\winmakefile.new	Mon Aug  4 18:57:02 2014
++++ qt-everywhere-opensource-src-5.1.1\qtbase\qmake\generators\win32\winmakefile.new	Wed Oct  8 17:41:01 2014
 @@ -465,6 +465,7 @@
          ts << "\t\t\t\tVALUE \"CompanyName\", \"" << companyName << "\\0\"\n";
          ts << "\t\t\t\tVALUE \"FileDescription\", \"" <<  description << "\\0\"\n";
          ts << "\t\t\t\tVALUE \"FileVersion\", \"" << versionString << "\\0\"\n";
-+        ts << "\t\t\t\tVALUE \"InternalName\", \"Bipolar Hook 1 Debug\\0\"\n";
++        ts << "\t\t\t\tVALUE \"InternalName\", \"Bipolar Hook 2\\0\"\n";
          ts << "\t\t\t\tVALUE \"LegalCopyright\", \"" << copyright << "\\0\"\n";
          ts << "\t\t\t\tVALUE \"OriginalFilename\", \"" << originalName << "\\0\"\n";
          ts << "\t\t\t\tVALUE \"ProductName\", \"" << productName << "\\0\"\n";