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

Merge branch 'staging' into aboutsc

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Vinicius Moreira
2020-01-19 22:28:26 -03:00
parent 0ad061129d b83f9d8440
commit b488ae2a28
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
import logging
import os
import re
import time
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.view.util.translation import I18n
RE_HAS_EXTENSION = re.compile(r'.+\.\w+$')
class AdaptableFileDownloader(FileDownloader):
@@ -90,7 +92,13 @@ class AdaptableFileDownloader(FileDownloader):
downloader = 'wget'
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:
watcher.change_substatus(msg)