libervia-desktop-kivy: cagou/plugins/plugin_wid_file

comparison cagou/plugins/plugin_wid_file_sharing.py @ 312:772c170b47a9

Python3 port: /!\ Cagou now runs with Python 3.6+ Port has been done in the same way as for backend (check backend commit b2d067339de3 message for details).

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 19:14:22 +0200
parents	1b835bcfa663
children	dddea9684a8e

comparison

equal deleted inserted replaced

-:a0d978d3ce84
+:772c170b47a9
 import os.path
 import json
 PLUGIN_INFO = {
-"name": _(u"file sharing"),
+"name": _("file sharing"),
 "main": "FileSharing",
-"description": _(u"share/transfer files between devices"),
+"description": _("share/transfer files between devices"),
-"icon_symbol": u"exchange",
+"icon_symbol": "exchange",
 }
-MODE_VIEW = u"view"
+MODE_VIEW = "view"
-MODE_LOCAL = u"local"
+MODE_LOCAL = "local"
-SELECT_INSTRUCTIONS = _(u"Please select entities to share with")
+SELECT_INSTRUCTIONS = _("Please select entities to share with")
 if kivy_utils.platform == "android":
 from jnius import autoclass
 Environment = autoclass("android.os.Environment")
 base_dir = Environment.getExternalStorageDirectory().getAbsolutePath()
 def expanduser(path):
-if path == u'~' or path.startswith(u'~/'):
+if path == '~' or path.startswith('~/'):
-return path.replace(u'~', base_dir, 1)
+return path.replace('~', base_dir, 1)
 return path
 else:
 expanduser = os.path.expanduser
 parent.bind(mode=self.on_mode)
 self.on_mode(parent, parent.mode)
 def on_mode(self, parent, new_mode):
 if new_mode == MODE_VIEW:
-self.text = _(u"view shared files")
+self.text = _("view shared files")
 elif new_mode == MODE_LOCAL:
-self.text = _(u"share local files")
+self.text = _("share local files")
 else:
-exceptions.InternalError(u"Unknown mode: {mode}".format(mode=new_mode))
+exceptions.InternalError("Unknown mode: {mode}".format(mode=new_mode))
 class PathWidget(ItemWidget):
 def __init__(self, filepath, main_wid, **kw):
 name = os.path.basename(filepath)
 self.filepath = os.path.normpath(filepath)
-if self.filepath == u'.':
+if self.filepath == '.':
-self.filepath = u''
+self.filepath = ''
 super(PathWidget, self).__init__(name=name, main_wid=main_wid, **kw)
 @property
 def is_dir(self):
 raise NotImplementedError
 def do_item_action(self, touch):
 if self.is_dir:
 self.main_wid.current_dir = self.filepath
 def open_menu(self, touch, dt):
-log.debug(_(u"opening menu for {path}").format(path=self.filepath))
+log.debug(_("opening menu for {path}").format(path=self.filepath))
 super(PathWidget, self).open_menu(touch, dt)
 class LocalPathWidget(PathWidget):
 return os.path.isdir(self.filepath)
 def getMenuChoices(self):
 choices = []
 if self.shared:
-choices.append(dict(text=_(u'unshare'),
+choices.append(dict(text=_('unshare'),
 index=len(choices)+1,
 callback=self.main_wid.unshare))
 else:
-choices.append(dict(text=_(u'share'),
+choices.append(dict(text=_('share'),
 index=len(choices)+1,
 callback=self.main_wid.share))
 return choices
 def is_dir(self):
 return self.type_ == C.FILE_TYPE_DIRECTORY
 def do_item_action(self, touch):
 if self.is_dir:
-if self.filepath == u'..':
+if self.filepath == '..':
-self.main_wid.remote_entity = u''
+self.main_wid.remote_entity = ''
 else:
 super(RemotePathWidget, self).do_item_action(touch)
 else:
 self.main_wid.request_item(self)
 return True
 class SharingDeviceWidget(DeviceWidget):
 def do_item_action(self, touch):
 self.main_wid.remote_entity = self.entity_jid
-self.main_wid.remote_dir = u''
+self.main_wid.remote_dir = ''
 class FileSharing(quick_widgets.QuickWidget, cagou_widget.CagouWidget, FilterBehavior,
 TouchMenuBehaviour):
 SINGLE=False
 layout = properties.ObjectProperty()
 mode = properties.OptionProperty(MODE_VIEW, options=[MODE_VIEW, MODE_LOCAL])
-local_dir = properties.StringProperty(expanduser(u'~'))
+local_dir = properties.StringProperty(expanduser('~'))
-remote_dir = properties.StringProperty(u'')
+remote_dir = properties.StringProperty('')
-remote_entity = properties.StringProperty(u'')
+remote_entity = properties.StringProperty('')
 shared_paths = properties.ListProperty()
 signals_registered = False
 def __init__(self, host, target, profiles):
 quick_widgets.QuickWidget.__init__(self, host, target, profiles)
 def on_mode(self, instance, new_mode):
 self.update_view(None, self.local_dir)
 def onHeaderInput(self):
-if u'/' in self.header_input.text or self.header_input.text == u'~':
+if '/' in self.header_input.text or self.header_input.text == '~':
 self.current_dir = expanduser(self.header_input.text)
 def onHeaderInputComplete(self, wid, text, **kwargs):
 """we filter items when text is entered in input box"""
-if u'/' in text:
+if '/' in text:
 return
 self.do_filter(self.layout.children,
 text,
 lambda c: c.name,
 width_cb=lambda c: c.base_width,
 height_cb=lambda c: c.minimum_height,
 continue_tests=[lambda c: not isinstance(c, ItemWidget),
-lambda c: c.name == u'..'])
+lambda c: c.name == '..'])
 ## remote sharing callback ##
 def _discoFindByFeaturesCb(self, data):
 entities_services, entities_own, entities_roster = data
 for entities_map, title in ((entities_services,
-_(u'services')),
+_('services')),
 (entities_own,
-_(u'your devices')),
+_('your devices')),
 (entities_roster,
-_(u'your contacts devices'))):
+_('your contacts devices'))):
 if entities_map:
 self.layout.add_widget(CategorySeparator(text=title))
-for entity_str, entity_ids in entities_map.iteritems():
+for entity_str, entity_ids in entities_map.items():
 entity_jid = jid.JID(entity_str)
 item = SharingDeviceWidget(
 self, entity_jid, Identities(entity_ids))
 self.layout.add_widget(item)
 if not entities_services and not entities_own and not entities_roster:
 self.layout.add_widget(Label(
 size_hint=(1, 1),
 halign='center',
 text_size=self.size,
-text=_(u"No sharing device found")))
+text=_("No sharing device found")))
 def discover_devices(self):
 """Looks for devices handling file "File Information Sharing" and display them"""
 try:
 namespace = self.host.ns_map['fis']
 except KeyError:
-msg = _(u"can't find file information sharing namespace, "
+msg = _("can't find file information sharing namespace, "
-u"is the plugin running?")
+"is the plugin running?")
 log.warning(msg)
-G.host.addNote(_(u"missing plugin"), msg, C.XMLUI_DATA_LVL_ERROR)
+G.host.addNote(_("missing plugin"), msg, C.XMLUI_DATA_LVL_ERROR)
 return
 self.host.bridge.discoFindByFeatures(
 [namespace], [], False, True, True, True, False, self.profile,
 callback=self._discoFindByFeaturesCb,
 errback=partial(G.host.errback,
-title=_(u"shared folder error"),
+title=_("shared folder error"),
-message=_(u"can't check sharing devices: {msg}")))
+message=_("can't check sharing devices: {msg}")))
 def FISListCb(self, files_data):
 for file_data in files_data:
-filepath = os.path.join(self.current_dir, file_data[u'name'])
+filepath = os.path.join(self.current_dir, file_data['name'])
 item = RemotePathWidget(
 filepath=filepath,
 main_wid=self,
-type_=file_data[u'type'])
+type_=file_data['type'])
 self.layout.add_widget(item)
 def FISListEb(self, failure_):
-self.remote_dir = u''
+self.remote_dir = ''
 G.host.addNote(
-_(u"shared folder error"),
+_("shared folder error"),
-_(u"can't list files for {remote_entity}: {msg}").format(
+_("can't list files for {remote_entity}: {msg}").format(
 remote_entity=self.remote_entity,
 msg=failure_),
 level=C.XMLUI_DATA_LVL_WARNING)
 ## view generation ##
 def update_view(self, *args):
 """update items according to current mode, entity and dir"""
-log.debug(u'updating {}, {}'.format(self.current_dir, args))
+log.debug('updating {}, {}'.format(self.current_dir, args))
 self.layout.clear_widgets()
-self.header_input.text = u''
+self.header_input.text = ''
 self.header_input.hint_text = self.current_dir
 if self.mode == MODE_LOCAL:
-filepath = os.path.join(self.local_dir, u'..')
+filepath = os.path.join(self.local_dir, '..')
 self.layout.add_widget(LocalPathWidget(filepath=filepath, main_wid=self))
 try:
 files = sorted(os.listdir(self.local_dir))
 except OSError as e:
-msg = _(u"can't list files in \"{local_dir}\": {msg}").format(
+msg = _("can't list files in \"{local_dir}\": {msg}").format(
 local_dir=self.local_dir,
 msg=e)
 G.host.addNote(
-_(u"shared folder error"),
+_("shared folder error"),
 msg,
 level=C.XMLUI_DATA_LVL_WARNING)
-self.local_dir = expanduser(u'~')
+self.local_dir = expanduser('~')
 return
 for f in files:
 filepath = os.path.join(self.local_dir, f)
 self.layout.add_widget(LocalPathWidget(filepath=filepath,
 main_wid=self))
 if not self.remote_entity:
 self.discover_devices()
 else:
 # we always a way to go back
 # so user can return to previous list even in case of error
-parent_path = os.path.join(self.remote_dir, u'..')
+parent_path = os.path.join(self.remote_dir, '..')
 item = RemotePathWidget(
 filepath = parent_path,
 main_wid=self,
 type_ = C.FILE_TYPE_DIRECTORY)
 self.layout.add_widget(item)
 self.host.bridge.FISList(
-unicode(self.remote_entity),
+str(self.remote_entity),
 self.remote_dir,
 {},
 self.profile,
 callback=self.FISListCb,
 errback=self.FISListEb)
 ## Share methods ##
 def do_share(self, entities_jids, item):
 if entities_jids:
-access = {u'read': {u'type': 'whitelist',
+access = {'read': {'type': 'whitelist',
-u'jids': entities_jids}}
+'jids': entities_jids}}
 else:
 access = {}
 G.host.bridge.FISSharePath(
 item.name,
 item.filepath,
 json.dumps(access, ensure_ascii=False),
 self.profile,
 callback=lambda name: G.host.addNote(
-_(u"sharing folder"),
+_("sharing folder"),
-_(u"{name} is now shared").format(name=name)),
+_("{name} is now shared").format(name=name)),
 errback=partial(G.host.errback,
-title=_(u"sharing folder"),
+title=_("sharing folder"),
-message=_(u"can't share folder: {msg}")))
+message=_("can't share folder: {msg}")))
 def share(self, menu):
 item = self.menu_item
 self.clear_menu()
 EntitiesSelectorMenu(instructions=SELECT_INSTRUCTIONS,
 self.clear_menu()
 G.host.bridge.FISUnsharePath(
 item.filepath,
 self.profile,
 callback=lambda: G.host.addNote(
-_(u"sharing folder"),
+_("sharing folder"),
-_(u"{name} is not shared anymore").format(name=item.name)),
+_("{name} is not shared anymore").format(name=item.name)),
 errback=partial(G.host.errback,
-title=_(u"sharing folder"),
+title=_("sharing folder"),
-message=_(u"can't unshare folder: {msg}")))
+message=_("can't unshare folder: {msg}")))
 def fileJingleRequestCb(self, progress_id, item, dest_path):
 G.host.addNote(
-_(u"file request"),
+_("file request"),
-_(u"{name} download started at {dest_path}").format(
+_("{name} download started at {dest_path}").format(
 name = item.name,
 dest_path = dest_path))
 def request_item(self, item):
 """Retrieve an item from remote entity
 path, name = os.path.split(item.filepath)
 assert name
 assert self.remote_entity
 extra = {'path': path}
 dest_path = files_utils.get_unique_name(os.path.join(G.host.downloads_dir, name))
-G.host.bridge.fileJingleRequest(unicode(self.remote_entity),
+G.host.bridge.fileJingleRequest(str(self.remote_entity),
 dest_path,
 name,
-u'',
+'',
-u'',
+'',
 extra,
 self.profile,
 callback=partial(self.fileJingleRequestCb,
 item=item,
 dest_path=dest_path),
 errback=partial(G.host.errback,
-title = _(u"file request error"),
+title = _("file request error"),
-message = _(u"can't request file: {msg}")))
+message = _("can't request file: {msg}")))
 @classmethod
 def shared_path_new(cls, shared_path, name, profile):
 for wid in G.host.getVisibleList(cls):
 if shared_path not in wid.shared_paths:
 def shared_path_removed(cls, shared_path, profile):
 for wid in G.host.getVisibleList(cls):
 if shared_path in wid.shared_paths:
 wid.shared_paths.remove(shared_path)
 else:
-log.warning(_(u"shared path {path} not found in {widget}".format(
+log.warning(_("shared path {path} not found in {widget}".format(
 path = shared_path, widget = wid)))

Mercurial > libervia-desktop-kivy

comparison cagou/plugins/plugin_wid_file_sharing.py @ 312:772c170b47a9