diff --git a/bauh/gems/arch/controller.py b/bauh/gems/arch/controller.py index ba713b68..26072684 100644 --- a/bauh/gems/arch/controller.py +++ b/bauh/gems/arch/controller.py @@ -28,7 +28,7 @@ URL_SRC_INFO = 'https://aur.archlinux.org/cgit/aur.git/plain/.SRCINFO?h=' RE_SPLIT_VERSION = re.compile(r'(=|>|<)') SOURCE_FIELDS = ('source', 'source_x86_64') -RE_PRE_DOWNLOADABLE_FILES = re.compile(r'(https?|ftp)://.+\.\w+[^gpg]$') +RE_PRE_DOWNLOADABLE_FILES = re.compile(r'^(https?|ftp)://.+\.\w+[^gpg|git]$') class ArchManager(SoftwareManager): diff --git a/bauh/view/qt/thread.py b/bauh/view/qt/thread.py index ccd5f1fc..677d5746 100644 --- a/bauh/view/qt/thread.py +++ b/bauh/view/qt/thread.py @@ -1,17 +1,16 @@ -import subprocess import time from datetime import datetime, timedelta from typing import List, Type, Set import requests from PyQt5.QtCore import QThread, pyqtSignal + from bauh.api.abstract.cache import MemoryCache from bauh.api.abstract.controller import SoftwareManager from bauh.api.abstract.handler import ProcessWatcher from bauh.api.abstract.model import PackageStatus, SoftwarePackage, PackageAction from bauh.api.abstract.view import InputViewComponent, MessageType from bauh.api.exception import NoInternetException - from bauh.view.qt import commons from bauh.view.qt.view_model import PackageView @@ -57,13 +56,16 @@ class AsyncAction(QThread, ProcessWatcher): self.signal_finished.emit(res) def change_status(self, status: str): - self.signal_status.emit(status) + if status: + self.signal_status.emit(status) def change_substatus(self, substatus: str): - self.signal_substatus.emit(substatus) + if substatus: + self.signal_substatus.emit(substatus) def change_progress(self, val: int): - self.signal_progress.emit(val) + if val is not None: + self.signal_progress.emit(val) def should_stop(self): return self.stop