diff options
| author | Micah Lee <micah@micahflee.com> | 2021-09-09 16:52:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 16:52:25 -0700 |
| commit | bb1b3ad157857a54c728b85038e94c386ee15f44 (patch) | |
| tree | a86c37d064c481d903376b1e76254be9b61121d5 | |
| parent | 464a345d453554c12726b7969cb03cb9768af55d (diff) | |
| parent | 6edab6877a9591a7fff7cf74607298f0d3730986 (diff) | |
| download | onionshare-bb1b3ad157857a54c728b85038e94c386ee15f44.tar.gz onionshare-bb1b3ad157857a54c728b85038e94c386ee15f44.zip | |
Merge pull request #1406 from SaptakS/fix-filelisting
Fixes directory listing in send mode
| -rw-r--r-- | cli/onionshare_cli/resources/templates/send.html | 4 | ||||
| -rw-r--r-- | cli/onionshare_cli/web/share_mode.py | 5 | ||||
| -rw-r--r-- | desktop/tests/test_gui_share.py | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/cli/onionshare_cli/resources/templates/send.html b/cli/onionshare_cli/resources/templates/send.html index bd9bd631..5fc1ba1f 100644 --- a/cli/onionshare_cli/resources/templates/send.html +++ b/cli/onionshare_cli/resources/templates/send.html @@ -40,7 +40,7 @@ <div class="d-flex"> <div> <img width="30" height="30" title="" alt="" src="{{ static_url_path }}/img/web_folder.png" /> - <a href="{{ info.basename }}"> + <a href="{{ info.link }}"> <span>{{ info.basename }}</span> </a> </div> @@ -53,7 +53,7 @@ <div> <img width="30" height="30" title="" alt="" src="{{ static_url_path }}/img/web_file.png" /> {% if download_individual_files %} - <a href="{{ info.basename }}"> + <a href="{{ info.link }}"> <span>{{ info.basename }}</span> </a> {% else %} diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py index 8ac4055e..92a4c9af 100644 --- a/cli/onionshare_cli/web/share_mode.py +++ b/cli/onionshare_cli/web/share_mode.py @@ -425,10 +425,7 @@ class ShareModeWeb(SendBaseModeWeb): # Render directory listing filenames = [] for filename in os.listdir(filesystem_path): - if os.path.isdir(os.path.join(filesystem_path, filename)): - filenames.append(filename + "/") - else: - filenames.append(filename) + filenames.append(filename) filenames.sort() return self.directory_listing(filenames, path, filesystem_path) diff --git a/desktop/tests/test_gui_share.py b/desktop/tests/test_gui_share.py index d3536569..2cc48d17 100644 --- a/desktop/tests/test_gui_share.py +++ b/desktop/tests/test_gui_share.py @@ -99,7 +99,7 @@ class TestShare(GuiBaseTest): self.assertEqual(r.status_code, 404) self.download_share(tab) else: - self.assertTrue('a href="test.txt"' in r.text) + self.assertTrue('a href="/test.txt"' in r.text) r = requests.get(download_file_url) tmp_file = tempfile.NamedTemporaryFile("wb", delete=False) |