Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-25 15:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add --title, and make it display the title in chat mode

Browse Source
This commit is contained in:
Micah Lee 2021-04-12 17:55:16 -04:00
parent 530f9547f5
commit b5c68fa5ca
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/onionshare_cli/__init__.py
View File

@ -143,6 +143,12 @@ def main(cwd=None):
help="Filename of persistent session", help="Filename of persistent session",
) )
# General args # General args
parser.add_argument(
"--title",
metavar="TITLE",
default=None,
help="Set a title",
)
parser.add_argument( parser.add_argument(
"--public", "--public",
action="store_true", action="store_true",
@ -234,6 +240,7 @@ def main(cwd=None):
connect_timeout = int(args.connect_timeout) connect_timeout = int(args.connect_timeout)
config_filename = args.config config_filename = args.config
persistent_filename = args.persistent persistent_filename = args.persistent
title = args.title
public = bool(args.public) public = bool(args.public)
autostart_timer = int(args.autostart_timer) autostart_timer = int(args.autostart_timer)
autostop_timer = int(args.autostop_timer) autostop_timer = int(args.autostop_timer)
@ -280,6 +287,7 @@ def main(cwd=None):
if mode_settings.just_created: if mode_settings.just_created:
# This means the mode settings were just created, not loaded from disk # This means the mode settings were just created, not loaded from disk
mode_settings.set("general", "title", title)
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)

1
cli/onionshare_cli/mode_settings.py
View File

@ -42,6 +42,7 @@ class ModeSettings:
}, },
"persistent": {"mode": None, "enabled": False}, "persistent": {"mode": None, "enabled": False},
"general": { "general": {
"title": None,
"public": False, "public": False,
"autostart_timer": False, "autostart_timer": False,
"autostop_timer": False, "autostop_timer": False,

4
cli/onionshare_cli/resources/templates/chat.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>OnionShare</title> <title>{% if title %}{{ title }}{% else %}OnionShare Chat{% endif %}</title>
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon"> <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all"> <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
</head> </head>
@ -11,7 +11,7 @@
<header class="clearfix"> <header class="clearfix">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare"> <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1> <h1>{% if title %}{{ title }}{% else %}OnionShare Chat{% endif %}</h1>
</header> </header>
<noscript> <noscript>
<p> <p>

8
cli/onionshare_cli/web/chat_mode.py
View File

@ -18,12 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
from flask import ( from flask import request, render_template, make_response, jsonify, session
request,
render_template,
make_response,
jsonify,
session)
from flask_socketio import emit, join_room, leave_room from flask_socketio import emit, join_room, leave_room
@ -72,6 +67,7 @@ class ChatModeWeb:
"chat.html", "chat.html",
static_url_path=self.web.static_url_path, static_url_path=self.web.static_url_path,
username=session.get("name"), username=session.get("name"),
title=self.web.settings.get("general", "title"),
) )
) )
return self.web.add_security_headers(r) return self.web.add_security_headers(r)