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

[wgem] fix search: name and icon

Browse Source
This commit is contained in:
Vinícius Moreira
2019-12-12 19:15:48 -03:00
parent 197df9c256
commit 2f9a2d4ef0
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ class InputOption:
Represents a select component option. Represents a select component option.
""" """
def __init__(self, label: str, value: object, tooltip: str = None, icon_path: str = None, read_only: bool = False): def __init__(self, label: str, value: object, tooltip: str = None, icon_path: str = None, read_only: bool = False, id_: str = None):
""" """
:param label: the string that will be shown to the user :param label: the string that will be shown to the user
:param value: the option value (not shown) :param value: the option value (not shown)
@@ -41,6 +41,7 @@ class InputOption:
if value is None: if value is None:
raise Exception("'value' must be a not blank string") raise Exception("'value' must be a not blank string")
self.id = id_
self.label = label self.label = label
self.value = value self.value = value
self.tooltip = tooltip self.tooltip = tooltip

52
bauh/gems/web/controller.py
View File

@@ -59,34 +59,56 @@ class WebApplicationManager(SoftwareManager):
except: except:
return 'en_US' return 'en_US'
def _get_app_name(self, url_no_protocol: str, soup: BeautifulSoup) -> str:
name_tag = soup.head.find('meta', attrs={'name': 'application-name'})
name = name_tag.get('content') if name_tag else None
if not name:
name_tag = soup.head.find('title')
name = name_tag.text.strip() if name_tag else None
if not name:
name = url_no_protocol.split('.')[0]
return name
def _get_app_icon_url(self, url: str, soup: BeautifulSoup) -> str:
icon_tag = soup.head.find('link', attrs={"rel": "icon"})
icon_url = icon_tag.get('href') if icon_tag else None
if icon_url and icon_url.startswith('/'):
icon_url = url + icon_url
return icon_url
def search(self, words: str, disk_loader: DiskCacheLoader, limit: int = -1, is_url: bool = False) -> SearchResult: def search(self, words: str, disk_loader: DiskCacheLoader, limit: int = -1, is_url: bool = False) -> SearchResult:
res = SearchResult([], [], 0) res = SearchResult([], [], 0)
installed = self.read_installed(disk_loader=disk_loader, limit=limit).installed installed = self.read_installed(disk_loader=disk_loader, limit=limit).installed
if is_url: if is_url:
url_no_protocol = RE_PROTOCOL_STRIP.split(words)[1].strip().lower() url = words[0:-1] if words.endswith('/') else words
url_no_protocol = RE_PROTOCOL_STRIP.split(url)[1].strip().lower()
installed_matches = [app for app in installed if RE_PROTOCOL_STRIP.split(app.url)[1].strip().lower() == url_no_protocol] installed_matches = [app for app in installed if RE_PROTOCOL_STRIP.split(app.url)[1].strip().lower() == url_no_protocol]
if installed_matches: if installed_matches:
res.installed.extend(installed_matches) res.installed.extend(installed_matches)
else: else:
url_res = self.http_client.get(words, headers={'Accept-language': self._get_lang_header()}) url_res = self.http_client.get(url, headers={'Accept-language': self._get_lang_header()})
if url_res: if url_res:
soup = BeautifulSoup(url_res.text, 'lxml', parse_only=SoupStrainer('head')) soup = BeautifulSoup(url_res.text, 'lxml', parse_only=SoupStrainer('head'))
name_tag = soup.head.find('meta', attrs={'name': 'application-name'}) name = self._get_app_name(url_no_protocol, soup)
name = name_tag.get('content') if name_tag else words.split('.')[0].split('://')[1]
desc_tag = soup.head.find('meta', attrs={'name': 'description'}) desc_tag = soup.head.find('meta', attrs={'name': 'description'})
desc = desc_tag.get('content') if desc_tag else words desc = desc_tag.get('content') if desc_tag else words
icon_tag = soup.head.find('link', attrs={"rel": "icon"}) icon_url = self._get_app_icon_url(url, soup)
icon_url = icon_tag.get('href') if icon_tag else None
app = WebApplication(url=words, name=name, description=desc, icon_url=icon_url) app = WebApplication(url=url, name=name, description=desc, icon_url=icon_url)
if self.env_settings.get('electron') and self.env_settings['electron'].get('version'): if self.env_settings.get('electron') and self.env_settings['electron'].get('version'):
app.version = self.env_settings['electron']['version'] app.version = self.env_settings['electron']['version']
@@ -175,14 +197,14 @@ class WebApplicationManager(SoftwareManager):
bt_continue = self.i18n['continue'].capitalize() bt_continue = self.i18n['continue'].capitalize()
op_single = InputOption(label=self.i18n['web.install.option.single.label'], value="--single-instance", tooltip=self.i18n['web.install.option.single.tip']) op_single = InputOption(id_='single', label=self.i18n['web.install.option.single.label'], value="--single-instance", tooltip=self.i18n['web.install.option.single.tip'])
op_max = InputOption(label=self.i18n['web.install.option.max.label'], value="--maximize", tooltip=self.i18n['web.install.option.max.tip']) op_max = InputOption(id_='max', label=self.i18n['web.install.option.max.label'], value="--maximize", tooltip=self.i18n['web.install.option.max.tip'])
op_fs = InputOption(label=self.i18n['web.install.option.fullscreen.label'], value="--full-screen", tooltip=self.i18n['web.install.option.fullscreen.tip']) op_fs = InputOption(id_='fullscreen', label=self.i18n['web.install.option.fullscreen.label'], value="--full-screen", tooltip=self.i18n['web.install.option.fullscreen.tip'])
op_nframe = InputOption(label=self.i18n['web.install.option.noframe.label'], value="--hide-window-frame", tooltip=self.i18n['web.install.option.noframe.tip']) op_nframe = InputOption(id_='no_frame', label=self.i18n['web.install.option.noframe.label'], value="--hide-window-frame", tooltip=self.i18n['web.install.option.noframe.tip'])
op_allow_urls = InputOption(label=self.i18n['web.install.option.allow_urls.label'], value='--internal-urls=.*', tooltip=self.i18n['web.install.option.allow_urls.tip']) op_allow_urls = InputOption(id_='allow_urls', label=self.i18n['web.install.option.allow_urls.label'], value='--internal-urls=.*', tooltip=self.i18n['web.install.option.allow_urls.tip'])
op_ncache = InputOption(label=self.i18n['web.install.option.nocache.label'], value="--clear-cache", tooltip=self.i18n['web.install.option.nocache.tip']) op_ncache = InputOption(id_='no_cache', label=self.i18n['web.install.option.nocache.label'], value="--clear-cache", tooltip=self.i18n['web.install.option.nocache.tip'])
op_insecure = InputOption(label=self.i18n['web.install.option.insecure.label'], value="--insecure", tooltip=self.i18n['web.install.option.insecure.tip']) op_insecure = InputOption(id_='insecure', label=self.i18n['web.install.option.insecure.label'], value="--insecure", tooltip=self.i18n['web.install.option.insecure.tip'])
op_igcert = InputOption(label=self.i18n['web.install.option.ignore_certificate.label'], value="--ignore-certificate", tooltip=self.i18n['web.install.option.ignore_certificate.tip']) op_igcert = InputOption(id_='ignore_certs', label=self.i18n['web.install.option.ignore_certificate.label'], value="--ignore-certificate", tooltip=self.i18n['web.install.option.ignore_certificate.tip'])
tray_op_off = InputOption(label=self.i18n['web.install.option.tray.off.label'], value=0, tooltip=self.i18n['web.install.option.tray.off.tip']) tray_op_off = InputOption(label=self.i18n['web.install.option.tray.off.label'], value=0, tooltip=self.i18n['web.install.option.tray.off.tip'])
tray_op_default = InputOption(label=self.i18n['web.install.option.tray.default.label'], value='--tray', tooltip=self.i18n['web.install.option.tray.default.tip']) tray_op_default = InputOption(label=self.i18n['web.install.option.tray.default.label'], value='--tray', tooltip=self.i18n['web.install.option.tray.default.tip'])