spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-08 21:14:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[snap] fix: not showing 'API is out' popup when there is no internet connection

Browse Source
This commit is contained in:
Vinicius Moreira
2019-10-24 14:52:25 -03:00
parent 97fe290bff
commit c323ed125b
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bauh/api/abstract/controller.py
View File

@@ -213,8 +213,9 @@ class SoftwareManager(ABC):
pass pass
@abstractmethod @abstractmethod
def list_warnings(self) -> List[str]: def list_warnings(self, internet_available: bool) -> List[str]:
""" """
:param internet_available
:return: a list of warnings to be shown to the user :return: a list of warnings to be shown to the user
""" """
pass pass

2
bauh/gems/appimage/controller.py
View File

@@ -396,7 +396,7 @@ class AppImageManager(SoftwareManager):
return updates return updates
def list_warnings(self) -> List[str]: def list_warnings(self, internet_available: bool) -> List[str]:
pass pass
def list_suggestions(self, limit: int) -> List[PackageSuggestion]: def list_suggestions(self, limit: int) -> List[PackageSuggestion]:

2
bauh/gems/arch/controller.py
View File

@@ -710,7 +710,7 @@ class ArchManager(SoftwareManager):
installed = self.read_installed(disk_loader=None, internet_available=internet_available).installed installed = self.read_installed(disk_loader=None, internet_available=internet_available).installed
return [PackageUpdate(p.id, p.latest_version, 'aur') for p in installed if p.update] return [PackageUpdate(p.id, p.latest_version, 'aur') for p in installed if p.update]
def list_warnings(self) -> List[str]: def list_warnings(self, internet_available: bool) -> List[str]:
warnings = [] warnings = []
if self.arch_distro: if self.arch_distro:

2
bauh/gems/flatpak/controller.py
View File

@@ -248,7 +248,7 @@ class FlatpakManager(SoftwareManager):
return updates return updates
def list_warnings(self) -> List[str]: def list_warnings(self, internet_available: bool) -> List[str]:
if flatpak.is_installed(): if flatpak.is_installed():
if not flatpak.has_remotes_set(): if not flatpak.has_remotes_set():
return [self.i18n['flatpak.notification.no_remotes']] return [self.i18n['flatpak.notification.no_remotes']]

11
bauh/gems/snap/controller.py
View File

@@ -196,17 +196,18 @@ class SnapManager(SoftwareManager):
def list_updates(self, internet_available: bool) -> List[PackageUpdate]: def list_updates(self, internet_available: bool) -> List[PackageUpdate]:
pass pass
def list_warnings(self) -> List[str]: def list_warnings(self, internet_available: bool) -> List[str]:
if snap.is_installed() and not snap.is_snapd_running(): if snap.is_installed() and not snap.is_snapd_running():
snap_bold = bold('Snap') snap_bold = bold('Snap')
return [self.i18n['snap.notification.snapd_unavailable'].format(bold('snapd'), snap_bold), return [self.i18n['snap.notification.snapd_unavailable'].format(bold('snapd'), snap_bold),
self.i18n['snap.notification.snap.disable'].format(snap_bold, bold(self.i18n['manage_window.settings.gems']))] self.i18n['snap.notification.snap.disable'].format(snap_bold, bold(self.i18n['manage_window.settings.gems']))]
available, output = snap.is_api_available() if internet_available:
available, output = snap.is_api_available()
if not available: if not available:
self.logger.warning('It seems Snap API is not available. Search output: {}'.format(output)) self.logger.warning('It seems Snap API is not available. Search output: {}'.format(output))
return [self.i18n['snap.notifications.api.unavailable'].format(bold('Snaps'), bold('Snap'))] return [self.i18n['snap.notifications.api.unavailable'].format(bold('Snaps'), bold('Snap'))]
def _fill_suggestion(self, pkg_name: str, priority: SuggestionPriority, out: List[PackageSuggestion]): def _fill_suggestion(self, pkg_name: str, priority: SuggestionPriority, out: List[PackageSuggestion]):
res = self.http_client.get_json(SNAP_API_URL + '/search?q=package_name:{}'.format(pkg_name)) res = self.http_client.get_json(SNAP_API_URL + '/search?q=package_name:{}'.format(pkg_name))

6
bauh/view/core/controller.py
View File

@@ -307,13 +307,15 @@ class GenericSoftwareManager(SoftwareManager):
return updates return updates
def list_warnings(self) -> List[str]: def list_warnings(self, internet_available: bool = None) -> List[str]:
warnings = [] warnings = []
if self.managers: if self.managers:
int_available = internet.is_available(self.context.http_client, self.context.logger)
for man in self.managers: for man in self.managers:
if man.is_enabled(): if man.is_enabled():
man_warnings = man.list_warnings() man_warnings = man.list_warnings(internet_available=int_available)
if man_warnings: if man_warnings:
if warnings is None: if warnings is None: