Skip to content

add on_read2 to allow for better progress bar during download #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add on_read2 to allow for better progress bar during download #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions mosspy/download_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
except ImportError:
from urllib2 import urlopen

def process_url(url, urls, base_url, path, on_read):
def process_url(url, urls, base_url, path, on_read, on_read2):
from bs4 import BeautifulSoup # Backward compability, don't break Moss when bs4 not available.

logging.debug ("Processing URL: " + url)
response = urlopen(url)
html = response.read()
on_read(url)
on_read2(url, len(urls))
soup = BeautifulSoup(html, 'lxml')
file_name = os.path.basename(url)

Expand Down Expand Up @@ -50,7 +51,7 @@ def process_url(url, urls, base_url, path, on_read):
f.write(soup.encode(soup.original_encoding))
f.close()

def download_report(url, path, connections = 4, log_level=logging.DEBUG, on_read=lambda url: None):
def download_report(url, path, connections = 4, log_level=logging.DEBUG, on_read=lambda url: None, on_read2=lambda url, left: None):
logging.basicConfig(level=log_level)

if len(url) == 0:
Expand All @@ -69,7 +70,7 @@ def download_report(url, path, connections = 4, log_level=logging.DEBUG, on_read

# Handling thread
for url in urls:
t = Thread(target=process_url, args=[url, urls, base_url, path, on_read])
t = Thread(target=process_url, args=[url, urls, base_url, path, on_read, on_read2])
t.start()
threads.append(t)

Expand Down