From 228453fb485b8569efc920bc507e11cc75483ab2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 10 Nov 2019 17:58:07 +0530 Subject: [PATCH] Also indicate if content server is running with HTTP or HTTPS --- src/calibre/gui2/actions/device.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index bb5cb73581..a01195f591 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -68,11 +68,12 @@ class ShareConnMenu(QMenu): # {{{ from calibre.srv.opts import server_config opts = server_config() listen_on = verify_ipV4_address(opts.listen_on) or get_external_ip() + protocol = 'HTTPS' if opts.ssl_certfile and opts.ssl_keyfile else 'HTTP' try: - ip_text = _(' [%(ip)s, port %(port)d]')%dict( - ip=listen_on, port=opts.port) + ip_text = ' ' + _('[{ip}, port {port}, {protocol}]').format( + ip=listen_on, port=opts.port, protocol=protocol) except Exception: - ip_text = ' [%s]'%listen_on + ip_text = ' [{} {}]'.format(listen_on, protocol) self.ip_text = ip_text self.server_state_changed_signal.emit(running, ip_text) text = _('Stop Content server') + ip_text