mirror of
https://github.com/markqvist/NomadNet.git
synced 2026-10-26 19:01:44 -04:00
Add HubInfoArea focus shortcuts, fix for pending room joins
This commit is contained in:
parent
deb8c7f55d
commit
3187fe296c
3 changed files with 51 additions and 14 deletions
|
|
@ -809,9 +809,22 @@ class RRCHub:
|
|||
body = env.get(K_BODY)
|
||||
room = env.get(K_ROOM)
|
||||
text = body if isinstance(body, str) else "(error)"
|
||||
r = room.strip().lower() if isinstance(room, str) else None
|
||||
rollback_join = False
|
||||
if r:
|
||||
with self._lock:
|
||||
if r in self._pending_joins:
|
||||
rollback_join = True
|
||||
self._pending_joins.discard(r)
|
||||
self._silent_joins.discard(r)
|
||||
self._pending_parts.discard(r)
|
||||
if rollback_join:
|
||||
self.rooms.discard(r)
|
||||
if rollback_join:
|
||||
self.manager.save()
|
||||
msg = RRCMessage(
|
||||
"error",
|
||||
room.strip().lower() if isinstance(room, str) else None,
|
||||
r,
|
||||
None,
|
||||
None,
|
||||
text,
|
||||
|
|
|
|||
|
|
@ -362,14 +362,7 @@ class Browser:
|
|||
raise ValueError("hub hash must be "+str(expected_len)+" bytes")
|
||||
|
||||
room = room.strip().lstrip("#").strip()
|
||||
room_norm = None
|
||||
if room:
|
||||
try:
|
||||
# validate the room name early; pass the raw value through
|
||||
from nomadnet.RRC import RRCHub as _RRCHubCls # noqa
|
||||
room_norm = room.lower()
|
||||
except Exception:
|
||||
room_norm = None
|
||||
room_norm = room.lower() if room else None
|
||||
|
||||
existing = self.app.rrc.find_hub(hub_hash, dest_name=dest)
|
||||
self.app.ui.main_display.show_channels(None)
|
||||
|
|
|
|||
|
|
@ -211,6 +211,32 @@ class ChannelsListArea(urwid.LineBox):
|
|||
return super(ChannelsListArea, self).keypress(size, key)
|
||||
|
||||
|
||||
class HubInfoArea(urwid.LineBox):
|
||||
def keypress(self, size, key):
|
||||
if key == "ctrl n":
|
||||
self.delegate.new_hub_dialog()
|
||||
return None
|
||||
if key == "ctrl a":
|
||||
self.delegate.join_room_dialog()
|
||||
return None
|
||||
if key == "ctrl r":
|
||||
self.delegate.connect_selected()
|
||||
return None
|
||||
if key == "ctrl w":
|
||||
self.delegate.disconnect_selected()
|
||||
return None
|
||||
if key == "ctrl t":
|
||||
self.delegate.toggle_auto_reconnect_selected()
|
||||
return None
|
||||
if key == "ctrl e":
|
||||
self.delegate.edit_hub_dialog()
|
||||
return None
|
||||
if key == "ctrl x":
|
||||
self.delegate.remove_selected_dialog()
|
||||
return None
|
||||
return super(HubInfoArea, self).keypress(size, key)
|
||||
|
||||
|
||||
class RoomMessageEdit(urwid.Edit):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
|
|
@ -1052,9 +1078,13 @@ class ChannelsDisplay():
|
|||
self.selected_key = ("room", hub.hub_hash, hub.dest_name, room)
|
||||
self.app.rrc.set_active(hub, room)
|
||||
self._maybe_autoconnect(hub)
|
||||
if room not in hub.rooms and hub.status == RRCHub.STATUS_CONNECTED:
|
||||
try: hub.join_room(room)
|
||||
except Exception as e: RNS.log("Auto-join failed: "+str(e), RNS.LOG_ERROR)
|
||||
if room not in hub.rooms:
|
||||
if hub.status == RRCHub.STATUS_CONNECTED:
|
||||
try: hub.join_room(room)
|
||||
except Exception as e: RNS.log("Auto-join failed: "+str(e), RNS.LOG_ERROR)
|
||||
else:
|
||||
try: hub.add_room(room)
|
||||
except Exception as e: RNS.log("Pending join queue failed: "+str(e), RNS.LOG_ERROR)
|
||||
self._show_room(hub, room)
|
||||
|
||||
def _maybe_autoconnect(self, hub):
|
||||
|
|
@ -1131,7 +1161,8 @@ class ChannelsDisplay():
|
|||
urwid.connect_signal(entry, "click", self._select_room, (hub, name))
|
||||
lines.append(urwid.AttrMap(entry, "list_unknown", "list_focus"))
|
||||
|
||||
info = urwid.LineBox(urwid.Filler(urwid.Pile(lines), "top"), title=hub.name)
|
||||
info = HubInfoArea(urwid.Filler(urwid.Pile(lines), "top"), title=hub.name)
|
||||
info.delegate = self
|
||||
self.current_room_widget = None
|
||||
options = self.columns_widget.options(urwid.WEIGHT, 1)
|
||||
self.columns_widget.contents[1] = (info, options)
|
||||
|
|
@ -1295,7 +1326,7 @@ class ChannelsDisplay():
|
|||
urwid.AttrMap(urwid.Text(
|
||||
" Opening will add this hub to your client,"), "list_unknown"),
|
||||
urwid.AttrMap(urwid.Text(
|
||||
" ,and connect to it, and reveal your identity hash"), "list_unknown"),
|
||||
" and reveal your identity hash to the hub"), "list_unknown"),
|
||||
urwid.AttrMap(urwid.Text(
|
||||
" to the hub operator."), "list_unknown"),
|
||||
urwid.Text(""),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue