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

[fix][aur] not pre-downloading some source files

Browse Source
This commit is contained in:
Vinícius Moreira
2020-01-14 19:31:24 -03:00
parent f805254a59
commit b83f9d8440
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- AUR: - AUR:
- not treating **makedepends' as a list during dependency checking ( **anbox-git** installation was crashing ) - not treating **makedepends' as a list during dependency checking ( **anbox-git** installation was crashing )
- not considering the package name itself as *provided** during dependency checking ( **anbox-git** installation was crashing ) - not considering the package name itself as *provided** during dependency checking ( **anbox-git** installation was crashing )
- not pre-downloading some source files ( e.g: from **anbox-image** )
## [0.8.1] 2020-01-14 ## [0.8.1] 2020-01-14
### Features: ### Features:

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

@@ -36,7 +36,8 @@ URL_SRC_INFO = 'https://aur.archlinux.org/cgit/aur.git/plain/.SRCINFO?h='
RE_SPLIT_VERSION = re.compile(r'(=|>|<)') RE_SPLIT_VERSION = re.compile(r'(=|>|<)')
SOURCE_FIELDS = ('source', 'source_x86_64') SOURCE_FIELDS = ('source', 'source_x86_64')
RE_PRE_DOWNLOADABLE_FILES = re.compile(r'(https?|ftp)://.+\.\w+[^gpg|git]$') RE_PRE_DOWNLOAD_WL_PROTOCOLS = re.compile(r'^(.+::)?(https?|ftp)://.+')
RE_PRE_DOWNLOAD_BL_EXT = re.compile(r'.+\.(git|gpg)$')
SEARCH_OPTIMIZED_MAP = { SEARCH_OPTIMIZED_MAP = {
'google chrome': 'google-chrome', 'google chrome': 'google-chrome',
@@ -424,7 +425,7 @@ class ArchManager(SoftwareManager):
continue continue
else: else:
for f in srcinfo[attr]: for f in srcinfo[attr]:
if RE_PRE_DOWNLOADABLE_FILES.findall(f): if RE_PRE_DOWNLOAD_WL_PROTOCOLS.match(f) and not RE_PRE_DOWNLOAD_BL_EXT.match(f):
pre_download_files.append(f) pre_download_files.append(f)
if pre_download_files: if pre_download_files:

10
bauh/view/core/downloader.py
View File

@@ -1,5 +1,6 @@
import logging import logging
import os import os
import re
import time import time
import traceback import traceback
@@ -10,6 +11,7 @@ from bauh.commons.html import bold
from bauh.commons.system import run_cmd, new_subprocess, ProcessHandler, SystemProcess, SimpleProcess from bauh.commons.system import run_cmd, new_subprocess, ProcessHandler, SystemProcess, SimpleProcess
from bauh.view.util.translation import I18n from bauh.view.util.translation import I18n
RE_HAS_EXTENSION = re.compile(r'.+\.\w+$')
class AdaptableFileDownloader(FileDownloader): class AdaptableFileDownloader(FileDownloader):
@@ -90,7 +92,13 @@ class AdaptableFileDownloader(FileDownloader):
downloader = 'wget' downloader = 'wget'
file_size = self.http_client.get_content_length(file_url) file_size = self.http_client.get_content_length(file_url)
msg = bold('[{}] ').format(downloader) + self.i18n['downloading'] + ' ' + bold(file_url.split('/')[-1]) + (' ( {} )'.format(file_size) if file_size else '')
name = file_url.split('/')[-1]
if output_path and not RE_HAS_EXTENSION.match(name) and RE_HAS_EXTENSION.match(output_path):
name = output_path.split('/')[-1]
msg = bold('[{}] ').format(downloader) + self.i18n['downloading'] + ' ' + bold(name) + (' ( {} )'.format(file_size) if file_size else '')
if watcher: if watcher:
watcher.change_substatus(msg) watcher.change_substatus(msg)