From 3f7c4a4e2503c26dabc37f656c9875b64c63a0a6 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sun, 8 Sep 2019 09:35:44 -0700
Subject: [PATCH] Remove method from IndividualFileHistoryItem, and only
 display these widgets on 200 and 404 requests, not all of the others

---
 onionshare/common.py             |  3 ---
 onionshare/web/send_base_mode.py |  3 +--
 onionshare/web/web.py            | 24 ------------------------
 onionshare_gui/mode/history.py   |  6 ++----
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/onionshare/common.py b/onionshare/common.py
index 06563461..ab503fdc 100644
--- a/onionshare/common.py
+++ b/onionshare/common.py
@@ -315,9 +315,6 @@ class Common(object):
                     color: #666666;
                 }""",
 
-            'history_individual_file_request_label': """
-                QLabel { }""",
-
             'history_individual_file_status_code_label_2xx': """
                 QLabel {
                     color: #008800;
diff --git a/onionshare/web/send_base_mode.py b/onionshare/web/send_base_mode.py
index 3a01cb8f..6a0390ab 100644
--- a/onionshare/web/send_base_mode.py
+++ b/onionshare/web/send_base_mode.py
@@ -147,8 +147,7 @@ class SendBaseModeWeb:
         self.cur_history_id += 1
         self.web.add_request(self.web.REQUEST_INDIVIDUAL_FILE_STARTED, path, {
             'id': history_id,
-            'filesize': filesize,
-            'method': request.method
+            'filesize': filesize
         })
 
         # Only GET requests are allowed, any other method should fail
diff --git a/onionshare/web/web.py b/onionshare/web/web.py
index c4d5385f..610c14c2 100644
--- a/onionshare/web/web.py
+++ b/onionshare/web/web.py
@@ -196,26 +196,10 @@ class Web:
                     self.force_shutdown()
                     print("Someone has made too many wrong attempts to guess your password, so OnionShare has stopped the server. Start sharing again and send the recipient a new address to share.")
 
-        history_id = self.cur_history_id
-        self.cur_history_id += 1
-        self.add_request(self.REQUEST_INDIVIDUAL_FILE_STARTED, '{}'.format(request.path), {
-            'id': history_id,
-            'method': request.method,
-            'status_code': 401
-        })
-
         r = make_response(render_template('401.html', static_url_path=self.static_url_path), 401)
         return self.add_security_headers(r)
 
     def error403(self):
-        history_id = self.cur_history_id
-        self.cur_history_id += 1
-        self.add_request(self.REQUEST_INDIVIDUAL_FILE_STARTED, '{}'.format(request.path), {
-            'id': history_id,
-            'method': request.method,
-            'status_code': 403
-        })
-
         self.add_request(Web.REQUEST_OTHER, request.path)
         r = make_response(render_template('403.html', static_url_path=self.static_url_path), 403)
         return self.add_security_headers(r)
@@ -234,14 +218,6 @@ class Web:
         return self.add_security_headers(r)
 
     def error405(self):
-        history_id = self.cur_history_id
-        self.cur_history_id += 1
-        self.add_request(self.REQUEST_INDIVIDUAL_FILE_STARTED, '{}'.format(request.path), {
-            'id': history_id,
-            'method': request.method,
-            'status_code': 405
-        })
-
         r = make_response(render_template('405.html', static_url_path=self.static_url_path), 405)
         return self.add_security_headers(r)
 
diff --git a/onionshare_gui/mode/history.py b/onionshare_gui/mode/history.py
index 797950ab..2fd7cddb 100644
--- a/onionshare_gui/mode/history.py
+++ b/onionshare_gui/mode/history.py
@@ -354,7 +354,6 @@ class IndividualFileHistoryItem(HistoryItem):
         self.path = path
         self.total_bytes = 0
         self.downloaded_bytes = 0
-        self.method = data['method']
         self.started = time.time()
         self.started_dt = datetime.fromtimestamp(self.started)
         self.status = HistoryItem.STATUS_STARTED
@@ -364,8 +363,7 @@ class IndividualFileHistoryItem(HistoryItem):
         # Labels
         self.timestamp_label = QtWidgets.QLabel(self.started_dt.strftime("%b %d, %I:%M%p"))
         self.timestamp_label.setStyleSheet(self.common.css['history_individual_file_timestamp_label'])
-        self.request_label = QtWidgets.QLabel("{} {}".format(self.method, self.path))
-        self.request_label.setStyleSheet(self.common.css['history_individual_file_request_label'])
+        self.path_label = QtWidgets.QLabel("{}".format(self.path))
         self.status_code_label = QtWidgets.QLabel()
 
         # Progress bar
@@ -379,7 +377,7 @@ class IndividualFileHistoryItem(HistoryItem):
         # Text layout
         labels_layout = QtWidgets.QHBoxLayout()
         labels_layout.addWidget(self.timestamp_label)
-        labels_layout.addWidget(self.request_label)
+        labels_layout.addWidget(self.path_label)
         labels_layout.addWidget(self.status_code_label)
         labels_layout.addStretch()