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
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
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
Miguel Jacq
fccec9737d
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
e9120fd87e
fix the settings icon so it only switches to inactive icon when server is active
2017-06-03 19:01:40 +10:00
Miguel Jacq
22971fc205
#440 disable the Settings menu action when server is active
2017-06-03 18:55:09 +10:00
Miguel Jacq
6626e7d67e
#438 Make settings icon lighter grey when inactive
2017-06-02 11:34:19 +10:00
Miguel Jacq
b19f8fce52
Make it possible to supply a custom json settings file from somewhere else
2017-06-01 17:35:27 +10:00
Micah Lee
c6b19a2864
Fix stdeb.cfg so that Ubuntu PPA will build
2017-05-31 15:04:10 -07:00
Miguel Jacq
7e2d4d7888
Remove debug data
2017-05-31 19:44:53 +10:00
Miguel Jacq
3b359aec62
On a fresh share, delete any download progress bars of previous shares, and re-hide the downloads container
2017-05-31 17:35:16 +10:00
Delirious Lettuce
6c458f7fea
Uncomment after_success
2017-05-30 23:53:51 -06:00
Delirious Lettuce
2cd0f70051
Modify .travis.yml
2017-05-30 23:51:29 -06:00
