Commit graph

4430 commits

Author SHA1 Message Date
Miguel Jacq
d6324080ac only prevent the share from starting when the timeout has expired, if the timeout feature was even set at all 2017-11-09 18:23:11 +11:00
Miguel Jacq
183b149bc6 undo removal of newline in web.py 2017-11-09 18:01:09 +11:00
Miguel Jacq
f9d7cce90a send a HTTP 404 code instead of 200, on 404 pages 2017-11-09 17:51:34 +11:00
Miguel Jacq
7ac6bfa215 Various safety checks to prevent a share from starting after the timeout has expired. Also enforce that a timeout lands right on the minute and not precisely when the user clicks start (e.g mid-minute), to avoid confusion that a share might be lingering longer than desired 2017-11-09 17:26:32 +11:00
Miguel Jacq
ef92f92c40 On subsequent shares, the default time should nudge 5 minutes ahead of the current time again, instead of 5 minutes since the time OnionShare was opened 2017-11-09 12:52:44 +11:00
Miguel Jacq
16f34ca49e Calculate the time difference in a more appropriate spot (rather than on clicking Start, but when the server is ready, as it may have taken some time, but should still stop at the nominated time) 2017-11-09 12:35:38 +11:00
Miguel Jacq
5bc1a45a1e set the timeout default to 5 minutes into the future for convenience 2017-11-09 11:56:02 +11:00
Miguel Jacq
daafd53446 ensure the timeout checkbox is always shown if the server is stopped and it was not already checked 2017-11-09 11:49:01 +11:00
Miguel Jacq
abec0b037b more UI fixes - hide checkbox if server is working/started and it was not checked. Ensure we only set the timer if the timeout checkbox was checked to begin with 2017-11-09 11:46:26 +11:00
Miguel Jacq
f2ae2eb778 ensure the shutdown timeout can't go backwards in time 2017-11-09 11:34:59 +11:00
Miguel Jacq
f5b45539b0 use QDateTimeEdit instead of a spinbox for selecting a future date/time to auto-stop share 2017-11-09 11:29:55 +11:00
Miguel Jacq
89129a2ca7 remove shutdown_timeout logic in the web server, it's not actually needed 2017-11-09 07:12:00 +11:00
Miguel Jacq
c6f36e2086 Implements a shutdown timer to stop a share automatically (downloaded or not) after N hours 2017-11-08 20:25:59 +11:00
Miguel Jacq
263d0a102b use LooseVersion instead of StrictVersion, so that upstream versions of Flask that contain -dev will still work. Fixes #442 2017-11-06 09:16:55 +11:00
Miguel Jacq
d59462fcbe #468 If the server is stopped before a download is completed, emit the Canceled message in the progress bar 2017-11-03 12:58:45 +11:00
Delirious Lettuce
ca4f10d35c Delete temporary tor data directory during cleanup 2017-07-13 18:14:49 -06:00
Delirious Lettuce
5aedac5143 Reorder imports, spacing, use tempfile.gettempdir 2017-07-10 20:40:01 -06:00
Delirious Lettuce
5fd3973983 Reorder imports, use json.load(f) 2017-07-10 20:13:30 -06:00
Delirious Lettuce
b59a442bf1 Reorder imports, remove p, use ext, use json.load(f) 2017-07-10 20:11:04 -06:00
Delirious Lettuce
edf1d62737 Remove: unused import, round, formatting indexes. Use tuple 2017-07-10 20:00:19 -06:00
Micah Lee
6cd4b4391d Merge branch 'mig5-440_settings_menu_button_disable' 2017-07-09 14:19:08 -07:00
Micah Lee
3333c81c77 Merge branch 'mig5-438_settings_icon_inactive' 2017-07-09 14:16:29 -07:00
Micah Lee
57a01a4f8a Merge branch 'mig5-custom_config' 2017-07-09 14:12:49 -07:00
Micah Lee
dd3bbe9996 Merge branch 'mig5-433_reset_downloads_on_fresh_share' 2017-07-09 13:19:26 -07:00
Micah Lee
df4e34d6ce Merge branch 'mig5-428_fix_order' 2017-07-09 13:11:35 -07:00
Micah Lee
ca87bb020e Merge branch 'delirious-lettuce-test_onionshare_common' 2017-07-09 10:59:00 -07:00
Micah Lee
5df96ad768 Remove references to nosetests, and replace them with pytest 2017-07-09 10:55:16 -07:00
Micah Lee
93caf2fc73 Merge branch '433_reset_downloads_on_fresh_share' of https://github.com/mig5/onionshare into mig5-433_reset_downloads_on_fresh_share 2017-07-09 10:11:00 -07:00
Micah Lee
178b6022b6 Merge branch '428_fix_order' of https://github.com/mig5/onionshare into mig5-428_fix_order 2017-07-09 10:10:12 -07:00
Delirious Lettuce
f7556102b1 Remove unnecessary imports, add tests 2017-07-08 11:31:25 -06:00
Delirious Lettuce
8a70c60632 Modify import (more direct), remove unnecessary parentheses 2017-07-08 11:30:26 -06:00
Delirious Lettuce
d837652cd9 fixture instead of yield_fixture (2), remove parentheses 2017-07-08 11:29:19 -06:00
Delirious Lettuce
22906249e7 Initial commit, coverage of onionshare.settings.py at 92% 2017-07-08 11:23:17 -06:00
Delirious Lettuce
da1e744150 Add locale fixtures 2017-07-08 00:17:20 -06:00
Delirious Lettuce
880ed56054 Merge remote-tracking branch 'origin/test_onionshare_common' into test_onionshare_common
# Conflicts:
#	test/onionshare_common_test.py
2017-07-07 23:21:21 -06:00
Delirious Lettuce
19b41cc3b6 Create temporary file/directory without deleting them after 2017-07-07 23:16:37 -06:00
Delirious Lettuce
d5792bd357 Add cleanup tests 2017-07-07 23:14:47 -06:00
Delirious Lettuce
1fa5d3a2a6 Initial commit (all current pytest fixtures) 2017-07-07 22:51:09 -06:00
Delirious Lettuce
bdf9765234 Move fixtures to conftest, remove unneeded imports, spacing 2017-07-07 22:50:11 -06:00
Delirious Lettuce
7724df923f * Use re.verbose on LOG_MSG_REGEX
* Create new fixtures for creating temporary files and directories
* Modify custom_zw fixture to include custom callback function to test
* Delete parent directory of ZipWriter file from default_zw fixture
* Modify monkeypatch arguments
* Group tests into separate classes for each function
* Parametrize ZeroDivisionError tests
* Test all regular expressions
* Use new fixtures to ensure proper deletion of files after testing
2017-07-07 21:33:45 -06:00
Delirious Lettuce
6558d2f7ce Add conftest.py file 2017-07-07 14:26:19 -06:00
Delirious Lettuce
8456591424 initial commit of onionshare_test.py mods 2017-07-05 14:44:27 -06:00
Delirious Lettuce
03a4df4980 WIP: up to 100% test coverage of common.py 2017-07-04 23:17:51 -06:00
Delirious Lettuce
7a52ec3781 Uncomment after_success 2017-07-04 12:24:38 -06:00
Delirious Lettuce
597502f6e7 Modify .travis.yml 2017-07-04 12:24:38 -06:00
Delirious Lettuce
b247d589d1 Remove test (ZipInfo.is_dir() is Python 3.6+ only) 2017-07-04 12:24:38 -06:00
Delirious Lettuce
1b7160e1d6 Comment out sudo: required 2017-07-04 12:24:38 -06:00
Delirious Lettuce
97a48a76e3 Initial commit of previous changes, add coverage to travis 2017-07-04 12:24:38 -06:00
Miguel Jacq
5d57eb5893 Need to actually ensure the dark settings icon is set back once server inactive again 2017-06-03 19:04:21 +10:00
Miguel Jacq
6b0d66b90d fix the settings icon so it only switches to inactive icon when server is active 2017-06-03 19:01:40 +10:00