From 551ca40deafea06f055883cb40896228dfbf4832 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 21 Mar 2021 01:01:23 +1100
Subject: [PATCH] new style of crashpad report

---
 .github/workflows/ci.yml                 |  2 +-
 app/dialog/crashhandler/crashhandler.cpp | 60 +++++++++++++++++++-----
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c772c231c..9f0bef5d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -216,7 +216,7 @@ jobs:
         working-directory: ${{ runner.workspace }}/build
         shell: bash
         run: |
-          $DOWNLOAD_TOOL https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true
+          curl -fLSs https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true > dump_syms.exe
           ./dump_syms app/olive-editor.pdb > olive-editor.sym
           SYM_HEADER=($(head -n 1 olive-editor.sym)) # Read first line of symbol file
           SYM_DIR=olive-editor/symbols/olive-editor.pdb/${SYM_HEADER[3]}
diff --git a/app/dialog/crashhandler/crashhandler.cpp b/app/dialog/crashhandler/crashhandler.cpp
index 87e93cbb8..d11bc2c9b 100644
--- a/app/dialog/crashhandler/crashhandler.cpp
+++ b/app/dialog/crashhandler/crashhandler.cpp
@@ -108,8 +108,9 @@ void CrashHandlerDialog::GenerateReport()
   stackwalk_filename.append(QStringLiteral(".exe"));
 #endif
 
-  QString stackwalk_bin = QDir(qApp->applicationDirPath()).filePath(stackwalk_filename);
-  p->start(stackwalk_bin, {report_filename_, QDir(qApp->applicationDirPath()).filePath(QStringLiteral("symbols"))});
+  QDir app_path(qApp->applicationDirPath());
+  QString stackwalk_bin = app_path.filePath(stackwalk_filename);
+  p->start(stackwalk_bin, {report_filename_, app_path.filePath(QStringLiteral("symbols"))});
   crash_report_->setText(QStringLiteral("Trying to run: %1").arg(stackwalk_bin));
 }
 
@@ -192,16 +193,53 @@ void CrashHandlerDialog::SendErrorReport()
   desc_part.setBody(summary_edit_->toPlainText().toUtf8());
   multipart->append(desc_part);
 
-  // Create file section
-  QHttpPart file_part;
-  file_part.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/octet-stream"));
-  file_part.setHeader(QNetworkRequest::ContentDispositionHeader, QStringLiteral("form-data; name=\"upload_file_minidump\"; filename=\"%1\"")
+  // Create report section
+  QHttpPart desc_part;
+  desc_part.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("text/plain"));
+  desc_part.setHeader(QNetworkRequest::ContentDispositionHeader, QStringLiteral("form-data; name=\"report\""));
+  desc_part.setBody(report_data_.toUtf8());
+  multipart->append(desc_part);
+
+  // Create commit section
+  QHttpPart desc_part;
+  desc_part.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("text/plain"));
+  desc_part.setHeader(QNetworkRequest::ContentDispositionHeader, QStringLiteral("form-data; name=\"commit\""));
+  desc_part.setBody(GITHASH);
+  multipart->append(desc_part);
+
+  // Create dump section
+  QHttpPart dump_part;
+  dump_part.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/octet-stream"));
+  dump_part.setHeader(QNetworkRequest::ContentDispositionHeader, QStringLiteral("form-data; name=\"dump\"; filename=\"%1\"")
                       .arg(QFileInfo(report_filename_).fileName()));
-  QFile* file = new QFile(report_filename_);
-  file->open(QFile::ReadOnly);
-  file_part.setBodyDevice(file);
-  file->setParent(multipart); // Delete file with multipart
-  multipart->append(file_part);
+  QFile* dump_file = new QFile(report_filename_);
+  dump_file->open(QFile::ReadOnly);
+  dump_part.setBodyDevice(dump_file);
+  dump_file->setParent(multipart); // Delete file with multipart
+  multipart->append(dump_part);
+
+  // Find symbol file
+  QDir symbol_dir(QDir(qApp->applicationDirPath()).filePath(QStringLiteral("symbols")));
+#ifdef Q_OS_WINDOWS
+  symbol_dir = QDir(symbol_dir.filePath(QStringLiteral("olive-editor.pdb")));
+#else
+  symbol_dir = QDir(symbol_dir.filePath(QStringLiteral("olive-editor")));
+#endif
+  // Assume that the first folder we find is the one with the symbols in it
+  symbol_dir = QDir(symbol_dir.filePath(symbol_dir.entryList(QDir::NoDotAndDotDot).first()));
+
+  // Create sym section
+  QString symbol_filename = QStringLiteral("olive-editor.sym");
+  QString symbol_full_path = symbol_dir.filePath(symbol_filename);
+  QHttpPart sym_part;
+  sym_part.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/octet-stream"));
+  sym_part.setHeader(QNetworkRequest::ContentDispositionHeader, QStringLiteral("form-data; name=\"sym\"; filename=\"%1\"")
+                      .arg(symbol_filename));
+  QFile* sym_file = new QFile(symbol_full_path);
+  sym_file->open(QFile::ReadOnly);
+  sym_part.setBodyDevice(sym_file);
+  sym_file->setParent(multipart); // Delete file with multipart
+  multipart->append(sym_part);
 
   manager->post(request, multipart);
 }