Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated onionshare-gui to support ephemeral hidden services

Browse Source
This commit is contained in:
Micah Lee 2015-09-08 18:12:24 -07:00
parent 82e0c4e122
commit 55c4c0fac1
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
onionshare/onionshare.py
View File

@ -73,7 +73,8 @@ class OnionShare(object):
self.cleanup_filenames = [] self.cleanup_filenames = []
# call hs's cleanup # call hs's cleanup
self.hs.cleanup() if self.hs:
self.hs.cleanup()
def main(cwd=None): def main(cwd=None):

20
onionshare_gui/onionshare_gui.py
View File

@ -109,8 +109,6 @@ class OnionShareGui(QtGui.QWidget):
self.timer.start(500) self.timer.start(500)
def start_server_step2(self): def start_server_step2(self):
self.status_bar.showMessage(strings._('gui_starting_server3', True))
# warn about sending large files over Tor # warn about sending large files over Tor
if web.zip_filesize >= 157286400: # 150mb if web.zip_filesize >= 157286400: # 150mb
self.filesize_warning.setText(strings._("large_filesize", True)) self.filesize_warning.setText(strings._("large_filesize", True))
@ -119,18 +117,18 @@ class OnionShareGui(QtGui.QWidget):
def start_server(self): def start_server(self):
# start the hidden service # start the hidden service
self.status_bar.showMessage(strings._('gui_starting_server1', True)) self.status_bar.showMessage(strings._('gui_starting_server1', True))
self.app.choose_port()
try: try:
self.app.choose_port() self.status_bar.showMessage(strings._('gui_starting_server1', True))
print strings._("connecting_ctrlport").format(int(self.app.port))
self.app.start_hidden_service(gui=True) self.app.start_hidden_service(gui=True)
except onionshare.NoTor as e: except onionshare.hs.NoTor as e:
alert(e.args[0], QtGui.QMessageBox.Warning) alert(e.args[0], QtGui.QMessageBox.Warning)
self.server_status.stop_server() self.server_status.stop_server()
self.status_bar.clearMessage() self.status_bar.clearMessage()
return return
# start onionshare service in new thread # start onionshare service in new thread
t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open)) t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open, self.app.transparent_torification))
t.daemon = True t.daemon = True
t.start() t.start()
@ -142,7 +140,10 @@ class OnionShareGui(QtGui.QWidget):
self.starting_server_step2.emit() self.starting_server_step2.emit()
# wait for hs # wait for hs
self.app.wait_for_hs() if not self.app.hs.supports_ephemeral:
if not self.app.local_only:
self.status_bar.showMessage(strings._('gui_starting_server3', True))
self.app.hs.wait_for_hs(self.app.onion_host)
# done # done
self.start_server_finished.emit() self.start_server_finished.emit()
@ -225,6 +226,7 @@ def main():
parser.add_argument('--local-only', action='store_true', dest='local_only', help=strings._("help_local_only")) parser.add_argument('--local-only', action='store_true', dest='local_only', help=strings._("help_local_only"))
parser.add_argument('--stay-open', action='store_true', dest='stay_open', help=strings._("help_stay_open")) parser.add_argument('--stay-open', action='store_true', dest='stay_open', help=strings._("help_stay_open"))
parser.add_argument('--debug', action='store_true', dest='debug', help=strings._("help_debug")) parser.add_argument('--debug', action='store_true', dest='debug', help=strings._("help_debug"))
parser.add_argument('--transparent', action='store_true', dest='transparent_torification', help=strings._("help_transparent_torification"))
parser.add_argument('--filenames', metavar='filenames', nargs='+', help=strings._('help_filename')) parser.add_argument('--filenames', metavar='filenames', nargs='+', help=strings._('help_filename'))
args = parser.parse_args() args = parser.parse_args()
@ -236,6 +238,7 @@ def main():
local_only = bool(args.local_only) local_only = bool(args.local_only)
stay_open = bool(args.stay_open) stay_open = bool(args.stay_open)
debug = bool(args.debug) debug = bool(args.debug)
transparent_torification = bool(args.transparent_torification)
# create the onionshare icon # create the onionshare icon
global window_icon global window_icon
@ -253,7 +256,8 @@ def main():
# start the onionshare app # start the onionshare app
web.set_stay_open(stay_open) web.set_stay_open(stay_open)
app = onionshare.OnionShare(debug, local_only, stay_open) web.set_transparent_torification(transparent_torification)
app = onionshare.OnionShare(debug, local_only, stay_open, transparent_torification)
# clean up when app quits # clean up when app quits
def shutdown(): def shutdown():