Miguel Jacq
448f6af796
Resolve conflict with upstream's onion.py
2018-01-14 18:49:49 +11:00
Miguel Jacq
9aef3cdbb3
Add a 'persistent URL' label when re-using a private key
2018-01-14 18:41:54 +11:00
Micah Lee
6ab6ea564a
Create the timer before the TorConnectionDialog dialog, but start it after. This way if you cancel the dialog, then click save in the settings, OnionShareGui.timer will already exist, even though though TorConnectionDialog hasn't closed yet
2018-01-13 22:46:57 -08:00
Micah Lee
8f585db127
Don't start the check_for_requests timer until after connected to Tor, and remove OnionShareGui.tor_con and TorConnectionDialog.t as class variables, making them local variables instead
2018-01-13 22:42:27 -08:00
Micah Lee
ebbe490a65
Merge branch '493_500_detect_broken_tor_connection' of https://github.com/mig5/onionshare into mig5-493_500_detect_broken_tor_connection
2018-01-13 16:32:56 -08:00
Micah Lee
04d2f0c0e1
Merge branch '495_clear_status_bar_early' of https://github.com/mig5/onionshare into mig5-495_clear_status_bar_early
2018-01-13 16:09:11 -08:00
Micah Lee
d42369a0f9
Merge branch '453_catch_oserror_on_crunching_files' of https://github.com/mig5/onionshare into mig5-453_catch_oserror_on_crunching_files
2018-01-13 15:58:15 -08:00
Miguel Jacq
e90908c5b0
Move the saving of private key into the SettingsDialog and Onion objects entirely (no QPushButton to save it)
2018-01-13 20:58:24 +11:00
Miguel Jacq
0a5bd45dfe
Add systray notification when Tor connection is lost, thanks @Baccount
2017-12-27 09:29:45 +11:00
Miguel Jacq
2cd61d76e0
Disable the 'Start Sharing' button if the connection to Tor has been lost. Re-enable it if we've subsequently reconnected to Tor via Settings dialog
2017-12-24 14:07:20 +11:00
Miguel Jacq
5c84c277da
Don't show alert dialogs when Tor disconnects - just display in statusbar and stop any active share.
2017-12-23 16:43:58 +11:00
Miguel Jacq
6f4d7f7f44
Fixes for the edge case where Tor connection dialog is canceled, but the Tor process remains open in the background, which was causing onion.is_authenticated() to True. Remove excessive alerts
2017-12-21 14:08:13 +11:00
Miguel Jacq
b442b5d41b
Ensure we don't consider the Tor connection 'lost' if we're still in the connection dialog process (wait for that thread to finish).
...
Also various implementations of onion.is_authenticated() for a more robust check than onion.connected_to_tor,
which seemed to help some corner cases
2017-12-21 12:15:23 +11:00
Miguel Jacq
bcd4363769
#493 , #500 - detect if the Tor connection (bundled, TorBrowser or otherwise) has been lost while the app is open. Stop a running share if so
2017-12-21 09:22:53 +11:00
Miguel Jacq
95f7b0d8df
Clear the status bar messages earlier when starting a new share
2017-12-20 07:39:55 +11:00
Miguel Jacq
4f768e8b77
Catch OSError when preparing the zip file during server start. Fixes #453
2017-12-12 17:02:11 +11:00
Miguel Jacq
a12f9ed4d8
cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor
2017-12-07 16:10:52 +11:00
Miguel Jacq
e7dd78dba7
cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor
2017-12-07 16:08:03 +11:00
Miguel Jacq
d69e93a5ba
emit to the status bar when the private key is saved to disk
2017-12-07 13:02:56 +11:00
Miguel Jacq
3a056803a9
Optionally save the private key of a running share to settings for reuse
2017-12-07 12:45:34 +11:00
Micah Lee
ed2c55c097
Merge branch 'no_available_port_error' of https://github.com/mig5/onionshare into mig5-no_available_port_error
2017-12-06 16:14:21 -08:00
Miguel Jacq
0aacfae925
Raise an error if we were unable to obtain a random port
2017-12-07 08:49:10 +11:00
Miguel Jacq
d500069398
Actually still uncheck the timer when the server stops, but *only* when it stops
2017-12-06 10:21:39 +11:00
Miguel Jacq
eaa37206e5
Let the timer stop the share if there were no downloads, or all downloads are done
2017-12-05 11:18:26 +11:00
Miguel Jacq
91a0c60189
Better fix for preventing timeout firing if a download is not yet done (works for CLI as well as GUI)
2017-12-04 15:03:28 +11:00
Miguel Jacq
2eb7bca242
Merge master branch and fix conflicts
2017-12-03 17:06:33 +11:00
Miguel Jacq
3b52f584a1
Don't auto-stop the share if a download is still in progress
2017-12-03 13:21:25 +11:00
Miguel Jacq
6ad2737d08
Properly stop the server when the timeout is reached (and reset the interface so we can share again)
2017-12-02 14:53:38 +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
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
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
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
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
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
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
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
Micah Lee
c532509626
Merge branch 'status_bar_no_borders' of https://github.com/mig5/onionshare into mig5-status_bar_no_borders
2017-05-30 12:12:52 -07:00
Micah Lee
3628b2ee3c
Merge branch 'pretty_progress_bar' of https://github.com/mig5/onionshare into mig5-pretty_progress_bar
2017-05-30 12:07:49 -07:00
Miguel Jacq
84e167333e
Improve the Zip progressbar style a little bit
2017-05-29 09:14:23 +10:00
Miguel Jacq
0da4c87e5a
Remove border around items in the QStatusBar
2017-05-27 20:38:46 +10:00
Miguel Jacq
acf453e094
Style a prettier progress bar
2017-05-27 19:53:30 +10:00
Miguel Jacq
cc73c92e4b
Adds Settings and Help menu items to the systray
2017-05-27 17:14:59 +10:00
Micah Lee
444f50868d
Remove the extra instances of the Settings object, and only use OnionShareGui.settings
2017-05-22 17:11:41 -07:00
Micah Lee
5846b06478
Reload Settings whenever the settings get saved in SettingsDialog
2017-05-22 17:08:05 -07:00
Micah Lee
e626a410f3
Merge branch 'fix_stay_open' of https://github.com/mig5/onionshare into mig5-fix_stay_open
2017-05-22 17:03:01 -07:00
Micah Lee
63e491bddf
Add a grayscale OnionShare logo for the systray icon in macOS
2017-05-22 16:23:19 -07:00
Micah Lee
65894e2e44
Make systray exit action call OnionShareGui.close() instead of sys.exit(), to give OnionShare a chance to warn users of open servers, and to gracefully shut down
2017-05-22 16:19:44 -07:00
Miguel Jacq
13a2ad2147
get settings from self rather than instantiate a new Settings object
2017-05-23 09:15:52 +10:00
Miguel Jacq
3766a6048d
Add desktop notification messages on download events (via systray)
2017-05-22 16:47:23 +10:00
Miguel Jacq
f446f6630d
Send stay_open variable in the right place, so that it really does stay open if we said so
2017-05-20 16:59:13 +10:00
Micah Lee
66a012bf81
Make settings button flat
2017-05-16 17:36:53 -07:00
Micah Lee
24ccb3995f
Fix UpdateChecker and UpdateThread to work with refactor, now it pops up an update reminder
2017-05-16 17:29:02 -07:00
Micah Lee
010bddb066
When saving settings, if Tor settings changed or if Tor isn't connected, reboot the Onion object, so that it's always connected to Tor when using the app
2017-05-16 16:50:33 -07:00
Micah Lee
eb708973c8
Disable settings while an OnionShare server is active
2017-05-16 15:41:35 -07:00
Micah Lee
3e3d669a49
Remove the menu bar, and replace it with a settings button owned by the OnionShareGui object
2017-05-16 15:24:14 -07:00
Micah Lee
22fb34d50d
Fixed signal/slot/thread issue in TorConnectionDialog and TorConnectionThread, and updated the language of bundled Tor error messages
2017-05-16 13:09:27 -07:00
Micah Lee
f90d49fa4b
Added debug logging to OnionShareGui, SettingsDialog, TorConnectionDialog, and Alert objects
2017-05-16 11:31:52 -07:00
Micah Lee
7003349873
Add log() method to onionshare.common, which logs to stdout if in debug mode
2017-05-16 11:12:55 -07:00
Micah Lee
1591888863
Renamed onionshare.helpers module to onionshare.common
2017-05-16 11:05:48 -07:00
Micah Lee
219c4351e1
Pass debug into the Onion and OnionShareGUI objects
2017-05-16 10:57:59 -07:00
Micah Lee
a9e822b222
Make UpdateChecker use the shared Onion object instead of creating a new one
2017-05-14 19:54:12 -07:00
Micah Lee
58f70b1d9b
Now when you cancel connecting to Tor, it prompts you if you want to quit or open settings
2017-05-14 19:21:33 -07:00
Micah Lee
ad2c5e94b4
OnionShare connects fine when connection_type isn't bundled_tor, and it now displays errors and opens Settings when it can't connect to Tor
2017-05-14 18:46:54 -07:00
Micah Lee
2ca92c52db
Move owernship of the TorConnetionDialog objection from __init__.py into the OnionShareGUI class, and make it so when the Tor connection gets canceled, OnionShare quits
2017-05-14 18:30:45 -07:00
Micah Lee
dc23946fe8
Fixed various issues introduced by creating an singleton Onion object and passing it into the OnionShare object
2017-05-14 17:21:13 -07:00
Micah Lee
18ad436ee2
Move OnionShareGui into its own file, so __init__ is just GUI logic
2017-04-17 19:36:02 -07:00
Micah Lee
db052ce85f
Moved onionshare and onionshare_gui logic directly into __init__.py files
2017-01-06 19:00:08 -08:00
Micah Lee
f8005a63ea
Change GPL copyright from 2016 to 2017
2017-01-06 18:58:15 -08:00
Micah Lee
0ab29ff8af
When a share is active, disable the full advanced options group, not just the stealth checkbox
2016-12-29 14:35:57 -08:00
Micah Lee
cd63dc37f1
Remove the alert function, replace it with the Alert class
2016-12-29 14:23:19 -08:00
Micah Lee
a0abab3653
Make automatic settings work with with Tor Browser 6.0.8
2016-12-29 12:57:58 -08:00
Micah Lee
fa7bec2fae
Handle new Tor controller errors in GUI
2016-12-29 10:34:40 -08:00
Micah Lee
00b0ce443c
Add a menu bar, with a stub for Settings, and Quit
2016-12-28 15:55:31 -08:00
Sigma
4f9016ff51
Fix for zipprogress bar qwidget access from a thread, which is invalid as qwidgets are neither reentrant nor thread safe. Fixes issue #334
2016-12-26 12:57:18 -08:00
Micah Lee
6eed7258a7
Properly handle errors for using stealth onion services in the GUI, instead of crashing in the background ( #144 )
2016-12-23 19:08:18 -08:00
Micah Lee
286573bda5
Added support for stealth onion services in the GUI version
2016-12-22 17:47:05 -08:00
Micah Lee
eb00a29ca7
Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master
...
Conflicts:
onionshare/web.py
onionshare_gui/onionshare_gui.py
resources/locale/cs.json
resources/locale/eo.json
resources/locale/nl.json
This merge required quite a bit of refactoring because.
2016-12-22 16:00:06 -08:00
Micah Lee
4bafd1eb2a
Hide downloads progress bars until download starts, and improve the look of progress bar display
2016-12-22 15:15:37 -08:00
Micah Lee
28df4e40c5
Merge branch 'wrap-progress-bar' of https://github.com/choltz95/onionshare into choltz95-wrap-progress-bar
2016-12-22 14:43:03 -08:00
Micah Lee
373f24e64b
Sleep between launching threads in onionshare-gui, preventing a cx_Freeze crash related to loading the same modules in multiple threads while they're locked
2016-09-06 13:27:59 -07:00
Micah Lee
7a46336149
Enable stdout in Windows, OSX CLI versions ( #305 )
2016-09-06 12:09:10 -07:00
Micah Lee
590edc5d6d
Make onionshare GUI use separate thread for starting onion service with await_publication=True, to avoid non-responsive window
2016-09-05 12:29:58 -07:00
Micah Lee
b7d1a7339c
Refactor onionshare GUI to use await_publication=True when using ephemeral onion services
2016-09-05 11:36:41 -07:00
Micah Lee
1372239ed7
Renamed hs to onion
2016-09-05 11:16:54 -07:00
Micah Lee
bba46e088f
Merge branch 'master' into cx_Freeze
2016-09-04 17:23:27 -07:00
Micah Lee
dbf4af02ac
Pass helpers into strings.load_strings instead of importing it, so fix issue with cx_Freeze in Windows
2016-09-04 20:09:18 -07:00
Micah Lee
310d861ce0
Stop saying 'hidden service', start saying 'onion service'
2016-09-04 17:23:06 -07:00
Srinivas Devaki
3b11f4d382
small refactoring
2016-08-24 02:15:58 +05:30
Srinivas Devaki
c570d7ea77
added progress bar for zipping files
2016-08-24 01:43:21 +05:30
choltz95
6379ca5e48
very poor auto scrolling
2016-08-02 23:46:13 -04:00
choltz95
d0f085f756
reorganize, add comment
2016-08-02 16:43:40 +00:00
choltz95
b1dd45a94b
wrap progress bar
2016-08-02 01:43:17 -04:00
Micah Lee
d35b5a9acd
Added rate-limiting to GUI. After 20 404 errors, server automatically stops ( #238 )
2016-04-12 16:49:46 -07:00
Micah Lee
e81f809882
Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources
2016-04-12 15:14:02 -07:00
Micah Lee
229603eb7d
Localize quit confirm button text ( #264 )
2016-04-11 10:08:24 -07:00
Micah Lee
cb3d39fb4f
Confirm when user tries to close the GUI window ( fixes #264 )
2016-04-10 19:28:22 -07:00
Micah Lee
7b8e9e1e6f
Closing the GUI window causes any current download to stop immediately ( fixes #262 )
2016-04-10 17:43:37 -07:00
Micah Lee
683610e962
Update copyright year to 2016
2016-02-15 22:37:28 -08:00
Micah Lee
deac54db92
Made sure switch to python3 and Qt5 works in OSX ( #261 ). Updated OSX instructions in BUILD.md.
2016-02-12 15:45:26 -08:00
Micah Lee
62c69c4c0b
Porting onionshare GUI from python2 to python3, and also from PyQt4 to PyQt5 ( #261 ). This commit ports onionshare_gui.
2016-02-12 15:12:27 -08:00
Micah Lee
e199946a8d
Display version string automatically in CLI, and in the status bar in GUI ( #251 )
2016-02-12 11:00:35 -08:00
Micah Lee
3c3ea6faf3
Merge branch 'eta' of https://github.com/garrettr/onionshare into garrettr-eta
2016-02-12 08:36:46 -08:00
Micah Lee
4c40b89faf
Merge pull request #245 from garrettr/wait-for-ephemeral-hs
...
Revert to using wait_for_hs for ephemeral HS
2016-01-05 18:37:44 -08:00
Garrett Robinson
ea47e80f14
Add estimated time remaining to progress indicator
...
Estimates the time remaining for each download and displays it in the
progress bar. Waits for 10 seconds before showing the progress bar to
allow the download rate to stabilize, which prevents the estimated time
remaining from jumping all over the place at the start of the download
(a.k.a the "Windows copy dialog experience"). If your download takes
less than 10 seconds, you don't really need to see an ETA anyway.
This commit also refactors the Downloads class, splitting out the
download-specific functionality into a new Download class, providing
better encapsulation. As a result, I was able to simplify the call to
`update_download` because it was no longer necessary to pass the
`total_bytes` (which don't change after the download has begun).
Tested on Mac OS 10.9.
2015-12-23 01:05:30 -05:00
Garrett Robinson
9d5ba9b4f6
Revert to using wait_for_hs for ephemeral HS
...
Using `await_publication = True` blocks inside stem until the hidden
service is published, which makes OnionShare appear to hang. This is a
quick fix that reverts to using `wait_for_hs` for ephemeral hidden
services (as well as non-ephemeral hidden services), which avoids
blocking OnionShare.
2015-12-22 23:09:30 -05:00
Garrett Robinson
a54443084c
Remove unnecessary status_bar.showMessage
...
status_bar.showMessage is already called with the same message at the
beginning of start_server, so there is no reason to call it again in the
try block.
2015-12-22 22:03:29 -05:00
Micah Lee
4cfffbf847
Don't access self.hs when using --local-only in GUI
2015-12-04 13:19:21 -08:00
Micah Lee
f4780813d6
Decorator is expecting argument to be named slug_candidate, not shutdown_slug_candidate ( #200 )
2015-12-04 13:17:45 -08:00
Micah Lee
ce79633eec
"Stop sharing automatically" checkbox respected in GUI when toggled before the server is started ( fixes #223 )
2015-11-20 13:43:19 -08:00
Micah Lee
dc58921187
Add docstrings to all classes and methods ( fix #198 )
2015-11-15 19:01:20 -08:00
Micah Lee
fd39f84bff
Merge branch 'master' into ephemeral
...
Conflicts:
onionshare/helpers.py
onionshare/onionshare.py
2015-11-15 15:35:59 -08:00
Micah Lee
ecb8128f91
Merge pull request #217 from effigies/ctrlq
...
Clean up and exit on Ctrl-Q
2015-11-08 12:52:12 -08:00
Christopher J. Markiewicz
89c363d247
Clean up and exit on Ctrl-Q
2015-11-06 20:43:37 -05:00
Micah Lee
55c4c0fac1
Updated onionshare-gui to support ephemeral hidden services
2015-09-08 18:12:24 -07:00
Micah Lee
bbee1599c5
Updated copyright year to 2015
2015-09-07 21:48:49 -07:00
Micah Lee
5d37d9b7b2
Removed all of the Tails-specific code. If we use ephemeral hidden services, we no longer need to touch the filesystem, and hopefully no longer need root in Tails.
2015-09-07 21:44:29 -07:00
Lazlo Westerhof
7446cee655
Fix some codestyle issues according to pep8.
2015-06-26 19:38:22 +02:00
Micah Lee
3073ec8a76
must load the window_icon before validation, because alert() requires it
2015-06-16 10:54:18 -07:00
Micah Lee
a86cda4549
Ripping out dmg code, replacing pyinstaller with py2app for OSX -- still in progress ( #151 )
2015-05-15 16:56:22 -07:00
Micah Lee
669750be37
specify types in all str.format() calls ( fixes #169 )
2015-05-15 12:26:58 -07:00
Thomas Waldmann
aa2b59ec5d
pep8: 2 spaces before inline comments
2014-11-18 18:37:17 +01:00
Thomas Waldmann
63965fd2d9
pep8: blank after comma and colon
2014-11-18 18:35:09 +01:00
Thomas Waldmann
179eefae29
pep8: fix empty line counts
...
top level: 2, else 1
I also advice to not put "pass" into empty classes, but rather a docstring instead of "pass".
2014-11-18 18:29:32 +01:00
Micah Lee
f5ddd23b70
handles canceled downloads properly ( fixes #81 )
2014-09-22 20:22:30 +00:00
Micah Lee
43a24a19d2
split starting server status message into three verbose chunks
2014-09-22 19:19:24 +00:00
Micah Lee
4f6cff6503
warns about sending large files in GUI ( #123 )
2014-09-18 01:35:30 +00:00
Micah Lee
89581b0a03
encode one way for CLI, encode another for GUI ( #141 )
2014-09-16 02:09:37 +00:00
Micah Lee
3c071ce500
don't try stopping the web app if it hasn't started
2014-09-03 17:56:10 -07:00
Micah Lee
d00b296c47
moving image files into /usr/share instead of /usr/lib ( fixes #126 )
2014-09-03 17:50:06 -07:00
Micah Lee
8d01ad7ec6
moved images to subfolder ( #126 )
2014-09-03 17:36:03 -07:00
Lazlo Westerhof
7c9dbb0caf
Fix missing window icon
2014-09-03 20:56:46 +02:00
Micah Lee
2c1534979e
squash bug in closing Flask web server ( fixes #131 )
2014-09-03 00:11:25 -07:00
Micah Lee
4edcce9ece
add utf-8 encoding to all .py files
2014-09-02 17:30:01 -07:00
Micah Lee
a6e99fcc21
added GPLv3 license to each source file
2014-09-02 12:10:42 -07:00
Micah Lee
c49cc75a55
fixed Tails bug where if you stopped server in GUI, you could not start a new server again
2014-08-30 01:42:17 +00:00
Micah Lee
cf52c2dcd0
fix bug caused by refactoring that made Tails launch infinite onionshare processes (oops)
2014-08-30 01:10:58 +00:00
Micah Lee
0858366e31
remove gui_mode from web app, because it is no longer useful
2014-08-29 16:06:13 -07:00
Micah Lee
e90d90b7d5
keep some status bar messages around for longer
2014-08-29 15:57:44 -07:00
Micah Lee
d1cd3c83ab
added status bar to GUI, populated it with useful status messages
2014-08-29 15:43:07 -07:00
Micah Lee
6688ced698
waits for hs to be ready in GUI too ( #116 )
2014-08-29 14:35:25 -07:00
Micah Lee
846b10b755
waits for hidden service before displaying URL. fixes #116
2014-08-29 14:32:19 -07:00
Micah Lee
9ed128938f
does starting server work in a separate thread to keep GUI responsive
2014-08-28 16:16:41 -07:00
