Mercurial > libervia-backend

diff sat_frontends/jp/cmd_avatar.py @ 3254:6cf4bd6972c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core, frontends: avatar refactoring: /!\ huge commit Avatar logic has been reworked around the IDENTITY plugin: plugins able to handle avatar or other identity related metadata (like nicknames) register to IDENTITY plugin in the same way as for other features like download/upload. Once registered, IDENTITY plugin will call them when suitable in order of priority, and handle caching. Methods to manage those metadata from frontend now use serialised data. For now `avatar` and `nicknames` are handled: - `avatar` is now a dict with `path` + metadata like `media_type`, instead of just a string path - `nicknames` is now a list of nicknames in order of priority. This list is never empty, and `nicknames[0]` should be the preferred nickname to use by frontends in most cases. In addition to contact specified nicknames, user set nickname (the one set in roster) is used in priority when available. Among the side changes done with this commit, there are: - a new `contactGet` bridge method to get roster metadata for a single contact - SatPresenceProtocol.send returns a Deferred to check when it has actually been sent - memory's methods to handle entities data now use `client` as first argument - metadata filter can be specified with `getIdentity` - `getAvatar` and `setAvatar` are now part of the IDENTITY plugin instead of XEP-0054 (and there signature has changed) - `isRoom` and `getBareOrFull` are now part of XEP-0045 plugin - jp avatar/get command uses `xdg-open` first when available for `--show` flag - `--no-cache` has been added to jp avatar/get and identity/get - jp identity/set has been simplified, explicit options (`--nickname` only for now) are used instead of `--field`. `--field` may come back in the future if necessary for extra data. - QuickContactList `SetContact` now handle None as a value, and doesn't use it to delete the metadata anymore - improved cache handling for `metadata` and `nicknames` in quick frontend - new `default` argument in QuickContactList `getCache`
author Goffi <goffi@goffi.org>
date Tue, 14 Apr 2020 21:00:33 +0200
parents 559a625a236b
children be6d91572633
line wrap: on
line diff
--- a/sat_frontends/jp/cmd_avatar.py	Tue Apr 14 20:36:24 2020 +0200
+++ b/sat_frontends/jp/cmd_avatar.py	Tue Apr 14 21:00:33 2020 +0200
@@ -25,10 +25,11 @@
 from sat.core.i18n import _
 from sat_frontends.jp.constants import Const as C
 from sat.tools import config
+from sat.tools.common import data_format
 
 
 __commands__ = ["Avatar"]
-DISPLAY_CMD = ["xv", "display", "gwenview", "showtell"]
+DISPLAY_CMD = ["xdg-open", "xv", "display", "gwenview", "showtell"]
 
 
 class Get(base.CommandBase):
@@ -38,10 +39,13 @@
         )
 
     def add_parser_options(self):
-        self.parser.add_argument("jid", help=_("entity"))
+        self.parser.add_argument(
+            "--no-cache", action="store_true", help=_("do no use cached values")
+        )
         self.parser.add_argument(
             "-s", "--show", action="store_true", help=_("show avatar")
         )
+        self.parser.add_argument("jid", nargs='?', default='', help=_("entity"))
 
     async def showImage(self, path):
         sat_conf = config.parseMainConf()
@@ -68,20 +72,23 @@
 
     async def start(self):
         try:
-            avatar_path = await self.host.bridge.avatarGet(
+            avatar_data_raw = await self.host.bridge.avatarGet(
                 self.args.jid,
-                False,
-                False,
+                not self.args.no_cache,
                 self.profile,
             )
         except Exception as e:
             self.disp(f"can't retrieve avatar: {e}", error=True)
             self.host.quit(C.EXIT_BRIDGE_ERRBACK)
 
-        if not avatar_path:
+        avatar_data = data_format.deserialise(avatar_data_raw, type_check=None)
+
+        if not avatar_data:
             self.disp(_("No avatar found."), 1)
             self.host.quit(C.EXIT_NOT_FOUND)
 
+        avatar_path = avatar_data['path']
+
         self.disp(avatar_path)
         if self.args.show:
             await self.showImage(avatar_path)
@@ -92,11 +99,14 @@
 class Set(base.CommandBase):
     def __init__(self, host):
         super(Set, self).__init__(
-            host, "set", use_verbose=True, help=_("set avatar of the profile")
+            host, "set", use_verbose=True,
+            help=_("set avatar of the profile or an entity")
         )
 
     def add_parser_options(self):
         self.parser.add_argument(
+            "-j", "--jid", default='', help=_("entity whose avatar must be changed"))
+        self.parser.add_argument(
             "image_path", type=str, help=_("path to the image to upload")
         )
 
@@ -107,7 +117,7 @@
             self.host.quit(C.EXIT_BAD_ARG)
         path = os.path.abspath(path)
         try:
-            await self.host.bridge.avatarSet(path, self.profile)
+            await self.host.bridge.avatarSet(path, self.args.jid, self.profile)
         except Exception as e:
             self.disp(f"can't set avatar: {e}", error=True)
             self.host.quit(C.EXIT_BRIDGE_ERRBACK)