Mercurial > libervia-backend
diff sat_frontends/primitivus/status.py @ 4037:524856bd7b19
massive refactoring to switch from camelCase to snake_case:
historically, Libervia (SàT before) was using camelCase as allowed by PEP8 when using a
pre-PEP8 code, to use the same coding style as in Twisted.
However, snake_case is more readable and it's better to follow PEP8 best practices, so it
has been decided to move on full snake_case. Because Libervia has a huge codebase, this
ended with a ugly mix of camelCase and snake_case.
To fix that, this patch does a big refactoring by renaming every function and method
(including bridge) that are not coming from Twisted or Wokkel, to use fully snake_case.
This is a massive change, and may result in some bugs.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sat, 08 Apr 2023 13:54:42 +0200 |
| parents | 559a625a236b |
| children | 4b842c1fb686 |
line wrap: on
line diff
--- a/sat_frontends/primitivus/status.py Fri Apr 07 15:18:39 2023 +0200 +++ b/sat_frontends/primitivus/status.py Sat Apr 08 13:54:42 2023 +0200 @@ -31,7 +31,7 @@ status_prefix = urwid.Text("[") status_suffix = urwid.Text("]") self.status = sat_widgets.ClickableText("") - self.setPresenceStatus(C.PRESENCE_UNAVAILABLE, "") + self.set_presence_status(C.PRESENCE_UNAVAILABLE, "") urwid.Columns.__init__( self, [ @@ -41,25 +41,25 @@ ("weight", 1, status_suffix), ], ) - urwid.connect_signal(self.presence, "click", self.onPresenceClick) - urwid.connect_signal(self.status, "click", self.onStatusClick) + urwid.connect_signal(self.presence, "click", self.on_presence_click) + urwid.connect_signal(self.status, "click", self.on_status_click) - def onPresenceClick(self, sender=None): - if not self.host.bridge.isConnected( + def on_presence_click(self, sender=None): + if not self.host.bridge.is_connected( self.host.current_profile ): # FIXME: manage multi-profiles return options = [commonConst.PRESENCE[presence] for presence in commonConst.PRESENCE] list_widget = sat_widgets.GenericList( - options=options, option_type=sat_widgets.ClickableText, on_click=self.onChange + options=options, option_type=sat_widgets.ClickableText, on_click=self.on_change ) decorated = sat_widgets.LabelLine( list_widget, sat_widgets.SurroundedText(_("Set your presence")) ) - self.host.showPopUp(decorated) + self.host.show_pop_up(decorated) - def onStatusClick(self, sender=None): - if not self.host.bridge.isConnected( + def on_status_click(self, sender=None): + if not self.host.bridge.is_connected( self.host.current_profile ): # FIXME: manage multi-profiles return @@ -67,12 +67,12 @@ _("Set your status"), _("New status"), default_txt=self.status.get_text(), - cancel_cb=lambda _: self.host.removePopUp(), - ok_cb=self.onChange, + cancel_cb=lambda _: self.host.remove_pop_up(), + ok_cb=self.on_change, ) - self.host.showPopUp(pop_up_widget) + self.host.show_pop_up(pop_up_widget) - def onChange(self, sender=None, user_data=None): + def on_change(self, sender=None, user_data=None): new_value = user_data.get_text() previous = ( [key for key in C.PRESENCE if C.PRESENCE[key][0] == self.presence.get_text()][ @@ -100,13 +100,13 @@ ) in ( self.host.profiles ): # FIXME: for now all the profiles share the same status - self.host.bridge.setPresence( + self.host.bridge.presence_set( show=new[0], statuses=statuses, profile_key=profile ) - self.setPresenceStatus(new[0], new[1]) - self.host.removePopUp() + self.set_presence_status(new[0], new[1]) + self.host.remove_pop_up() - def setPresenceStatus(self, show, status): + def set_presence_status(self, show, status): show_icon, show_attr = C.PRESENCE.get(show) self.presence.set_text(("show_normal", show_icon)) if status is not None: