phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-25 02:32:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rebase and fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2023-10-09 15:37:32 +11:00
parent c4d0b64464
commit 456ce33e0a
No known key found for this signature in database
GPG key ID: 59B3F0C24135C6A9
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cli/onionshare_cli/__init__.py
View file

@ -31,7 +31,7 @@ from .web import Web
from .onion import TorErrorProtocolError, TorTooOldEphemeral, TorTooOldStealth, Onion from .onion import TorErrorProtocolError, TorTooOldEphemeral, TorTooOldStealth, Onion
from .onionshare import OnionShare from .onionshare import OnionShare
from .mode_settings import ModeSettings from .mode_settings import ModeSettings
from qrcode import QRCode
def main(cwd=None): def main(cwd=None):
""" """
@ -119,6 +119,13 @@ def main(cwd=None):
default=False, default=False,
help="Share files: Continue sharing after files have been sent (default is to stop sharing)", help="Share files: Continue sharing after files have been sent (default is to stop sharing)",
) )
parser.add_argument(
"--qr",
action="store_true",
dest="qr",
default=False,
help="Display a QR code in the terminal for share links",
)
# Receive args # Receive args
parser.add_argument( parser.add_argument(
"--data-dir", "--data-dir",
@ -190,6 +197,7 @@ def main(cwd=None):
autostart_timer = int(args.autostart_timer) autostart_timer = int(args.autostart_timer)
autostop_timer = int(args.autostop_timer) autostop_timer = int(args.autostop_timer)
autostop_sharing = not bool(args.no_autostop_sharing) autostop_sharing = not bool(args.no_autostop_sharing)
print_qr = bool(args.qr)
data_dir = args.data_dir data_dir = args.data_dir
webhook_url = args.webhook_url webhook_url = args.webhook_url
disable_text = args.disable_text disable_text = args.disable_text
@ -229,6 +237,7 @@ def main(cwd=None):
mode_settings.set("general", "public", public) mode_settings.set("general", "public", public)
mode_settings.set("general", "autostart_timer", autostart_timer) mode_settings.set("general", "autostart_timer", autostart_timer)
mode_settings.set("general", "autostop_timer", autostop_timer) mode_settings.set("general", "autostop_timer", autostop_timer)
mode_settings.set("general", "qr", print_qr)
if persistent_filename: if persistent_filename:
mode_settings.set("persistent", "mode", mode) mode_settings.set("persistent", "mode", mode)
if mode == "share": if mode == "share":
@ -382,6 +391,10 @@ def main(cwd=None):
f"Give this address to your recipient, and tell them it won't be accessible until: {schedule.strftime('%I:%M:%S%p, %b %d, %y')}" f"Give this address to your recipient, and tell them it won't be accessible until: {schedule.strftime('%I:%M:%S%p, %b %d, %y')}"
) )
print(url) print(url)
if mode_settings.get("general", "qr"):
qr = QRCode()
qr.add_data(url)
qr.print_ascii()
print("") print("")
print("Waiting for the scheduled time before starting...") print("Waiting for the scheduled time before starting...")
app.onion.cleanup(False) app.onion.cleanup(False)
@ -465,6 +478,11 @@ def main(cwd=None):
print("Give this address and private key to the recipient:") print("Give this address and private key to the recipient:")
print(url) print(url)
print(f"Private key: {app.auth_string}") print(f"Private key: {app.auth_string}")
if mode_settings.get("general", "qr"):
qr = QRCode()
qr.add_data(url)
qr.print_ascii()
print("") print("")
print("Press Ctrl+C to stop the server") print("Press Ctrl+C to stop the server")