Miguel Jacq
275f345604
better metavar for --shutdown-timeout arg
2017-11-11 17:12:10 +11:00
Miguel Jacq
f220058c63
No longer treating shutdown_timeout as a float, but an int of seconds
2017-11-09 19:50:50 +11:00
Miguel Jacq
882057eafc
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
877459a560
undo removal of newline in web.py
2017-11-09 18:01:09 +11:00
Miguel Jacq
bb46c2de99
send a HTTP 404 code instead of 200, on 404 pages
2017-11-09 17:51:34 +11:00
Miguel Jacq
ac0e375a4b
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
9aabc51edc
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
b618d8c15d
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
44fb6c69ae
set the timeout default to 5 minutes into the future for convenience
2017-11-09 11:56:02 +11:00
Miguel Jacq
2dd6c5527d
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
d49e7cf1d1
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
9657df282e
ensure the shutdown timeout can't go backwards in time
2017-11-09 11:34:59 +11:00
Miguel Jacq
481f33c822
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
a4b8a71c68
remove shutdown_timeout logic in the web server, it's not actually needed
2017-11-09 07:12:00 +11:00
Miguel Jacq
32108dcca2
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
53faa043f9
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
5edd4dd22c
#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
0fb556baf2
Delete temporary tor data directory during cleanup
2017-07-13 18:14:49 -06:00
Delirious Lettuce
18545b7aa2
Reorder imports, spacing, use tempfile.gettempdir
2017-07-10 20:40:01 -06:00
Delirious Lettuce
56109a7012
Reorder imports, use json.load(f)
2017-07-10 20:13:30 -06:00
Delirious Lettuce
301465a49a
Reorder imports, remove p, use ext, use json.load(f)
2017-07-10 20:11:04 -06:00
Delirious Lettuce
52d16d21f7
Remove: unused import, round, formatting indexes. Use tuple
2017-07-10 20:00:19 -06:00
Micah Lee
4387589b4f
Merge branch 'mig5-440_settings_menu_button_disable'
2017-07-09 14:19:08 -07:00
Micah Lee
5435a4b046
Merge branch 'mig5-438_settings_icon_inactive'
2017-07-09 14:16:29 -07:00
Micah Lee
882ade94c7
Merge branch 'mig5-custom_config'
2017-07-09 14:12:49 -07:00
Micah Lee
dee616e8cb
Merge branch 'mig5-433_reset_downloads_on_fresh_share'
2017-07-09 13:19:26 -07:00
Micah Lee
62b0409e86
Merge branch 'mig5-428_fix_order'
2017-07-09 13:11:35 -07:00
Micah Lee
2a8a7fd634
Merge branch 'delirious-lettuce-test_onionshare_common'
2017-07-09 10:59:00 -07:00
Micah Lee
1785cb64e8
Remove references to nosetests, and replace them with pytest
2017-07-09 10:55:16 -07:00
Micah Lee
ef3e2bfd41
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
c91eaa9183
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
e54d6b8648
Remove unnecessary imports, add tests
2017-07-08 11:31:25 -06:00
Delirious Lettuce
5b08372b72
Modify import (more direct), remove unnecessary parentheses
2017-07-08 11:30:26 -06:00
Delirious Lettuce
5132ef8b4f
fixture instead of yield_fixture (2), remove parentheses
2017-07-08 11:29:19 -06:00
Delirious Lettuce
711ae30ba9
Initial commit, coverage of onionshare.settings.py at 92%
2017-07-08 11:23:17 -06:00
Delirious Lettuce
27b917e9e5
Add locale fixtures
2017-07-08 00:17:20 -06:00
Delirious Lettuce
7ab77710a1
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
99bc9ea25b
Create temporary file/directory without deleting them after
2017-07-07 23:16:37 -06:00
Delirious Lettuce
cf05204e65
Add cleanup tests
2017-07-07 23:14:47 -06:00
Delirious Lettuce
17f301022b
Initial commit (all current pytest fixtures)
2017-07-07 22:51:09 -06:00
Delirious Lettuce
69d1434f35
Move fixtures to conftest, remove unneeded imports, spacing
2017-07-07 22:50:11 -06:00
Delirious Lettuce
4f395add0a
* 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
d23c190cdc
Add conftest.py file
2017-07-07 14:26:19 -06:00
Delirious Lettuce
29f15fb9a5
initial commit of onionshare_test.py mods
2017-07-05 14:44:27 -06:00
Delirious Lettuce
50652aa74b
WIP: up to 100% test coverage of common.py
2017-07-04 23:17:51 -06:00
Delirious Lettuce
d37e35c93a
Uncomment after_success
2017-07-04 12:24:38 -06:00
Delirious Lettuce
60f28ed288
Modify .travis.yml
2017-07-04 12:24:38 -06:00
Delirious Lettuce
f7228f7952
Remove test (ZipInfo.is_dir() is Python 3.6+ only)
2017-07-04 12:24:38 -06:00
Delirious Lettuce
c004e70b6e
Comment out sudo: required
2017-07-04 12:24:38 -06:00
Delirious Lettuce
348c1889ae
Initial commit of previous changes, add coverage to travis
2017-07-04 12:24:38 -06:00
