libervia-desktop-kivy: cagou/core/platform

comparison cagou/core/platform_/android.py @ 491:203755bbe0fe

massive refactoring from camelCase -> snake_case. See backend commit log for more details

author	Goffi <goffi@goffi.org>
date	Sat, 08 Apr 2023 13:44:32 +0200
parents	83c67b093350
children

comparison

equal deleted inserted replaced

-:962d17c4078c
+:203755bbe0fe
 activity.bind(on_new_intent=self.on_new_intent)
 self.cache.append((self.on_new_intent, mActivity.getIntent()))
 self.last_selected_wid = None
 self.restore_selected_wid = True
-host.addListener('profilePlugged', self.onProfilePlugged)
+host.addListener('profile_plugged', self.on_profile_plugged)
-host.addListener('selected', self.onSelectedWidget)
+host.addListener('selected', self.on_selected_widget)
-local_dir = Path(host.getConfig('', 'local_dir')).resolve()
+local_dir = Path(host.config_get('', 'local_dir')).resolve()
 self.tmp_dir = local_dir / 'tmp'
 # we assert to avoid disaster if `/ 'tmp'` is removed by mistake on the line
 # above
 assert self.tmp_dir.resolve() != local_dir
 # we reset tmp dir on each run, to be sure that there is no residual file
 if self.tmp_dir.exists():
 shutil.rmtree(self.tmp_dir)
 self.tmp_dir.mkdir(0o700, parents=True)
-def on_initFrontendState(self):
+def on_init_frontend_state(self):
 # XXX: we use a separated socket instead of bridge because if we
 #      try to call a bridge method in on_pause method, the call data
 #      is not written before the actual pause
 s = self._frontend_status_socket = socket.socket(
 socket.AF_UNIX, socket.SOCK_STREAM)
 s.connect(os.path.join(SOCKET_DIR, SOCKET_FILE))
 s.sendall(STATE_RUNNING)
-def profileAutoconnectGetCb(self, profile=None):
+def profile_autoconnect_get_cb(self, profile=None):
 if profile is not None:
 G.host.options.profile = profile
-G.host.postInit()
+G.host.post_init()
-def profileAutoconnectGetEb(self, failure_):
+def profile_autoconnect_get_eb(self, failure_):
 log.error(f"Error while getting profile to autoconnect: {failure_}")
-G.host.postInit()
+G.host.post_init()
 def _show_perm_warning(self, permissions):
 root_wid = G.host.app.root
 perm_warning = Label(
 size_hint=(1, 1),
 f"not all mandatory permissions are granted, requesting again: "
 f"{perm_dict}")
 request_permissions(PERMISSION_MANDATORY, callback=self.permission_cb)
 return
-Clock.schedule_once(lambda *args: G.host.bridge.profileAutoconnectGet(
+Clock.schedule_once(lambda *args: G.host.bridge.profile_autoconnect_get(
-callback=self.profileAutoconnectGetCb,
+callback=self.profile_autoconnect_get_cb,
-errback=self.profileAutoconnectGetEb),
+errback=self.profile_autoconnect_get_eb),
 0)
-def do_postInit(self):
+def do_post_init(self):
 request_permissions(PERMISSION_MANDATORY, callback=self.permission_cb)
 return False
-def privateDataGetCb(self, data_s, profile):
+def private_data_get_cb(self, data_s, profile):
 data = data_format.deserialise(data_s, type_check=None)
 if data is not None and self.restore_selected_wid:
 log.debug(f"restoring previous widget {data}")
 try:
 name = data['name']
 except KeyError as e:
 log.error(f"Bad data format for selected widget: {e}\ndata={data}")
 return
 if target:
 target = jid.JID(data['target'])
-plugin_info = G.host.getPluginInfo(name=name)
+plugin_info = G.host.get_plugin_info(name=name)
 if plugin_info is None:
 log.warning("Can't restore unknown plugin: {name}")
 return
 factory = plugin_info['factory']
-G.host.switchWidget(
+G.host.switch_widget(
 None,
 factory(plugin_info, target=target, profiles=[profile])
 )
-def onProfilePlugged(self, profile):
+def on_profile_plugged(self, profile):
-log.debug("ANDROID profilePlugged")
+log.debug("ANDROID profile_plugged")
-G.host.bridge.setParam(
+G.host.bridge.param_set(
 "autoconnect_backend", C.BOOL_TRUE, "Connection", -1, profile,
 callback=lambda: log.info(f"profile {profile} autoconnection set"),
 errback=lambda: log.error(f"can't set {profile} autoconnection"))
 for method, *args in self.cache:
 method(*args)
 del self.cache
-G.host.removeListener("profilePlugged", self.onProfilePlugged)
+G.host.removeListener("profile_plugged", self.on_profile_plugged)
 # we restore the stored widget if any
 # user will then go back to where they was when the frontend was closed
-G.host.bridge.privateDataGet(
+G.host.bridge.private_data_get(
 "cagou", "selected_widget", profile,
-callback=partial(self.privateDataGetCb, profile=profile),
+callback=partial(self.private_data_get_cb, profile=profile),
 errback=partial(
 G.host.errback,
 title=_("can't get selected widget"),
 message=_("error while retrieving selected widget: {msg}"))
 )
-def onSelectedWidget(self, wid):
+def on_selected_widget(self, wid):
 """Store selected widget in backend, to restore it on next startup"""
 if self.last_selected_wid == None:
 self.last_selected_wid = wid
 # we skip the first selected widget, as we'll restore stored one if possible
 return
 data = {
 "name": plugin_info["name"],
 "target": target,
 }
-G.host.bridge.privateDataSet(
+G.host.bridge.private_data_set(
 "cagou", "selected_widget", data_format.serialise(data), profile,
 errback=partial(
 G.host.errback,
 title=_("can set selected widget"),
 message=_("error while setting selected widget: {msg}"))
 share_widget.close()
 PythonActivity.moveTaskToBack(True)
 return True
 def _disconnect(self, profile):
-G.host.bridge.setParam(
+G.host.bridge.param_set(
 "autoconnect_backend", C.BOOL_FALSE, "Connection", -1, profile,
 callback=lambda: log.info(f"profile {profile} autoconnection unset"),
 errback=lambda: log.error(f"can't unset {profile} autoconnection"))
 G.host.profiles.unplug(profile)
 G.host.bridge.disconnect(profile)
-G.host.app.showProfileManager()
+G.host.app.show_profile_manager()
-G.host.closeUI()
+G.host.close_ui()
 def _on_disconnect(self):
 current_profile = next(iter(G.host.profiles))
 wid = dialog.ConfirmDialog(
 title=_("Are you sure to disconnect?"),
 message=_(
 "If you disconnect the current user ({profile}), you won't receive "
 "any notification until you connect it again, is this really what you "
 "want?").format(profile=current_profile),
 yes_cb=partial(self._disconnect, profile=current_profile),
-no_cb=G.host.closeUI,
+no_cb=G.host.close_ui,
 )
-G.host.showExtraUI(wid)
+G.host.show_extra_ui(wid)
 def on_extra_menu_init(self, extra_menu):
-extra_menu.addItem(_('disconnect'), self._on_disconnect)
+extra_menu.add_item(_('disconnect'), self._on_disconnect)
-def updateParamsExtra(self, extra):
+def update_params_extra(self, extra):
 # on Android, we handle autoconnection automatically,
 # user must not modify those parameters
 extra.update(
 {
 "ignore": [
 ["Connection", "autodisconnect"],
 ],
 }
 )
-def getColDataFromUri(self, uri, col_name):
+def get_col_data_from_uri(self, uri, col_name):
 cursor = mActivity.getContentResolver().query(uri, None, None, None, None)
 if cursor is None:
 return None
 try:
 cursor.moveToFirst()
 return None
 return cursor.getString(col_idx)
 finally:
 cursor.close()
-def getFilenameFromUri(self, uri, media_type):
+def get_filename_from_uri(self, uri, media_type):
-filename = self.getColDataFromUri(uri, DISPLAY_NAME)
+filename = self.get_col_data_from_uri(uri, DISPLAY_NAME)
 if filename is None:
 uri_p = Path(uri.toString())
 filename = uri_p.name or "unnamed"
 if not uri_p.suffix and media_type:
 suffix = mimetypes.guess_extension(media_type, strict=False)
 if suffix:
 filename = filename + suffix
 return filename
-def getPathFromUri(self, uri):
+def get_path_from_uri(self, uri):
 # FIXME: using DATA is not recommended (and DATA is deprecated)
 # we should read directly the file with
 # ContentResolver#openFileDescriptor(Uri, String)
-path = self.getColDataFromUri(uri, DATA)
+path = self.get_col_data_from_uri(uri, DATA)
 return uri.getPath() if path is None else path
 def on_new_intent(self, intent):
 log.debug("on_new_intent")
 action = intent.getAction();
 log.debug("cancelling restoration of previous widget")
 self.restore_selected_wid = False
 # and now we open the widget linked to the intent
 current_profile = next(iter(G.host.profiles))
 Clock.schedule_once(
-lambda *args: G.host.doAction(
+lambda *args: G.host.do_action(
 widget, jid.JID(target), [current_profile]),
 0)
 else:
 log.warning(f"unexpected action: {action}")
 item = intent.getParcelableExtra(Intent.EXTRA_STREAM)
 if item is not None:
 uri = cast('android.net.Uri', item)
 if uri.getScheme() == 'content':
 # Android content, we'll dump it to a temporary file
-filename = self.getFilenameFromUri(uri, intent_type)
+filename = self.get_filename_from_uri(uri, intent_type)
 filepath = self.tmp_dir / filename
 input_stream = mActivity.getContentResolver().openInputStream(uri)
 buff = bytearray(4096)
 with open(filepath, 'wb') as f:
 while True:
 break
 input_stream.close()
 data['path'] = path = str(filepath)
 else:
 data['uri'] = uri.toString()
-path = self.getPathFromUri(uri)
+path = self.get_path_from_uri(uri)
 if path is not None and path not in data:
 data['path'] = path
 else:
 uri = None
 path = None

Mercurial > libervia-desktop-kivy

comparison cagou/core/platform_/android.py @ 491:203755bbe0fe