Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-14 00:55:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

started web server in separate thread. organized file info, so it can be set from both cli and gui.

Browse source
This commit is contained in:
Micah Lee 2014-05-30 21:25:26 -04:00
parent 837533e9c6
commit 4868a9155b
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
onionshare_gui/onionshare_gui.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python
import onionshare, webgui
import os, sys, time, json, gtk
import os, sys, time, json, gtk, thread
class Global(object):
quit = False
@ -75,14 +75,14 @@ def main():
web_send("init('{0}', {1});".format(basename, json.dumps(strings)))
web_send("update('{0}')".format(strings['calculating_sha1']))
filehash, filesize = onionshare.file_crunching(filename)
onionshare.set_file_info(filename, filehash, filesize)
onionshare.tails_open_port(port)
url = 'http://{0}/{1}'.format(onion_host, onionshare.slug)
web_send("update('{0}')".format('Secret URL is {0}'.format(url)))
web_send("set_url('{0}')".format(url));
# start the web server
# todo: start this in another thread, and send output using web_send
#onionshare.app.run(port=port)
web_thread = thread.start_new_thread(onionshare.app.run, (), {"port": port})
# main loop
last_second = time.time()