{}.
'.format(self.i18n['snap.install.available_channels.message'].format(bold(self.i18n['stable']), bold(pkg.name))) - body += '{}:
'.format(self.i18n['snap.install.available_channels.help']) + body = f"{self.i18n['snap.install.available_channels.message'].format(bold(self.i18n['stable']), bold(pkg.name))}.
" + body += f"{self.i18n['snap.install.available_channels.help']}:
" if watcher.request_confirmation(title=self.i18n['snap.install.available_channels.title'], body=body, components=[channel_select], confirmation_label=self.i18n['continue'], deny_label=self.i18n['cancel']): - self.logger.info("Installing '{}' with the custom command '{}'".format(pkg.name, channel_select.value)) + self.logger.info(f"Installing '{pkg.name}' with the custom command '{channel_select.value}'") res = ProcessHandler(watcher).handle(SystemProcess(new_root_subprocess(channel_select.value.value.split(' '), root_password=root_password))) return self._gen_installation_response(success=res, pkg=pkg, installed=installed_names, disk_loader=disk_loader) else: - self.logger.error("Could not find available channels in the installation output: {}".format(output)) + self.logger.error(f"Could not find available channels in the installation output: {output}") return self._gen_installation_response(success=res, pkg=pkg, installed=installed_names, disk_loader=disk_loader) @@ -321,14 +321,13 @@ class SnapManager(SoftwareManager): if not snapd.is_running(): snap_bold = bold('Snap') return [self.i18n['snap.notification.snapd_unavailable'].format(bold('snapd'), snap_bold), - self.i18n['snap.notification.snap.disable'].format(snap_bold, bold( - '{} > {}'.format(self.i18n['settings'].capitalize(), - self.i18n['core.config.tab.types'])))] + self.i18n['snap.notification.snap.disable'].format(snap_bold, + bold(f"{self.i18n['settings'].capitalize()} > {self.i18n['core.config.tab.types']}"))] elif internet_available: available, output = snap.is_api_available() if not available: - self.logger.warning('It seems Snap API is not available. Search output: {}'.format(output)) + self.logger.warning(f'It seems Snap API is not available. Search output: {output}') return [self.i18n['snap.notifications.api.unavailable'].format(bold('Snaps'), bold('Snap'))] def _fill_suggestion(self, name: str, priority: SuggestionPriority, snapd_client: SnapdClient, out: List[PackageSuggestion]): @@ -347,7 +346,7 @@ class SnapManager(SoftwareManager): out.append(sug) return - self.logger.warning("Could not retrieve suggestion '{}'".format(name)) + self.logger.warning(f"Could not retrieve suggestion '{name}'") def _map_to_app(self, app_json: dict, installed: bool, disk_loader: Optional[DiskCacheLoader] = None, is_application: bool = False) -> SnapApplication: app = SnapApplication(id=app_json.get('id'), @@ -382,11 +381,11 @@ class SnapManager(SoftwareManager): res = [] if snapd.is_running(): - self.logger.info('Downloading suggestions file {}'.format(SUGGESTIONS_FILE)) + self.logger.info(f'Downloading suggestions file {SUGGESTIONS_FILE}') file = self.http_client.get(SUGGESTIONS_FILE) if not file or not file.text: - self.logger.warning("No suggestion found in {}".format(SUGGESTIONS_FILE)) + self.logger.warning(f"No suggestion found in {SUGGESTIONS_FILE}") return res else: self.logger.info('Mapping suggestions') @@ -437,7 +436,7 @@ class SnapManager(SoftwareManager): else: cmd = commands[0]['name'] - self.logger.info("Running '{}': {}".format(pkg.name, cmd)) + self.logger.info(f"Running '{pkg.name}': {cmd}") snap.run(cmd) def get_screenshots(self, pkg: SnapApplication) -> List[str]: @@ -482,19 +481,19 @@ class SnapManager(SoftwareManager): try: data = [r for r in snapd_client.find_by_name(pkg.name) if r['name'] == pkg.name] except: - self.logger.warning("snapd client could not retrieve channels for '{}'".format(pkg.name)) + self.logger.warning(f"snapd client could not retrieve channels for '{pkg.name}'") return if not data: - self.logger.warning("snapd client could find a match for name '{}' when retrieving its channels".format(pkg.name)) + self.logger.warning(f"snapd client could find a match for name '{pkg.name}' when retrieving its channels") else: if not data[0].get('channels'): - self.logger.info("No channel available for '{}'. Skipping selection.".format(pkg.name)) + self.logger.info(f"No channel available for '{pkg.name}'. Skipping selection.") else: if pkg.channel: - current_channel = pkg.channel if '/' in pkg.channel else 'latest/{}'.format(pkg.channel) + current_channel = pkg.channel if '/' in pkg.channel else f'latest/{pkg.channel}' else: - current_channel = 'latest/{}'.format(data[0].get('channel', 'stable')) + current_channel = f"latest/{data[0].get('channel', 'stable')}" opts = [] def_opt = None @@ -510,7 +509,7 @@ class SnapManager(SoftwareManager): def_opt = op if not opts: - self.logger.info("No different channel available for '{}'. Skipping selection.".format(pkg.name)) + self.logger.info(f"No different channel available for '{pkg.name}'. Skipping selection.") return select = SingleSelectComponent(label='', diff --git a/bauh/gems/snap/model.py b/bauh/gems/snap/model.py index 58e787af..d873b54e 100644 --- a/bauh/gems/snap/model.py +++ b/bauh/gems/snap/model.py @@ -70,7 +70,7 @@ class SnapApplication(SoftwarePackage): return self.type == 'app' def get_disk_cache_path(self): - return super(SnapApplication, self).get_disk_cache_path() + '/installed/' + self.name + return f'{super(SnapApplication, self).get_disk_cache_path()}/installed/{self.name}' def is_trustable(self) -> bool: return self.verified_publisher diff --git a/bauh/gems/snap/snap.py b/bauh/gems/snap/snap.py index d6e5cc5b..82cba496 100644 --- a/bauh/gems/snap/snap.py +++ b/bauh/gems/snap/snap.py @@ -27,7 +27,7 @@ def install_and_stream(app_name: str, confinement: str, root_password: str, chan install_cmd.append('--classic') if channel: - install_cmd.append('--channel={}'.format(channel)) + install_cmd.append(f'--channel={channel}') return SimpleProcess(install_cmd, root_password=root_password, shell=True) @@ -42,7 +42,7 @@ def refresh_and_stream(app_name: str, root_password: str, channel: Optional[str] cmd = [BASE_CMD, 'refresh', app_name] if channel: - cmd.append('--channel={}'.format(channel)) + cmd.append(f'--channel={channel}') return SimpleProcess(cmd=cmd, root_password=root_password, @@ -51,7 +51,7 @@ def refresh_and_stream(app_name: str, root_password: str, channel: Optional[str] def run(cmd: str): - subprocess.Popen(['snap run {}'.format(cmd)], shell=True, env={**os.environ}) + subprocess.Popen([f'{BASE_CMD} run {cmd}'], shell=True, env={**os.environ}) def is_api_available() -> Tuple[bool, str]: diff --git a/bauh/gems/snap/snapd.py b/bauh/gems/snap/snapd.py index 2f2f0959..4a8b0f63 100644 --- a/bauh/gems/snap/snapd.py +++ b/bauh/gems/snap/snapd.py @@ -55,7 +55,7 @@ class SnapdClient: final_query = query.strip() if final_query and self.session: - res = self.session.get(url='{}/find'.format(URL_BASE), params={'q': final_query}) + res = self.session.get(url=f'{URL_BASE}/find', params={'q': final_query}) if res.status_code == 200: json_res = res.json() @@ -65,7 +65,7 @@ class SnapdClient: def find_by_name(self, name: str) -> Optional[List[dict]]: if name and self.session: - res = self.session.get('{}/find?name={}'.format(URL_BASE, name)) + res = self.session.get(f'{URL_BASE}/find?name={name}') if res.status_code == 200: json_res = res.json() @@ -75,7 +75,7 @@ class SnapdClient: def list_all_snaps(self) -> List[dict]: if self.session: - res = self.session.get('{}/snaps'.format(URL_BASE)) + res = self.session.get(f'{URL_BASE}/snaps') if res.status_code == 200: json_res = res.json() @@ -87,7 +87,7 @@ class SnapdClient: def list_only_apps(self) -> List[dict]: if self.session: - res = self.session.get('{}/apps'.format(URL_BASE)) + res = self.session.get(f'{URL_BASE}/apps') if res.status_code == 200: json_res = res.json() @@ -98,7 +98,7 @@ class SnapdClient: def list_commands(self, name: str) -> List[dict]: if self.session: - res = self.session.get('{}/apps?names={}'.format(URL_BASE, name)) + res = self.session.get(f'{URL_BASE}/apps?names={name}') if res.status_code == 200: json_res = res.json()