Move download logic to helpers.downloadPage()
This commit is contained in:
parent
45c95f45dc
commit
2ebd021c7f
3 changed files with 9 additions and 13 deletions
|
@ -4,11 +4,7 @@ import errno, fpdf, helpers, os, os.path, PIL, urllib.request
|
||||||
|
|
||||||
def getPage(issue, page):
|
def getPage(issue, page):
|
||||||
try:
|
try:
|
||||||
f = urllib.request.urlopen("https://www.falter.at/falter/e-paper/fetch/%i/%i.jpg" % (issue, page))
|
helpers.downloadPage("https://www.falter.at/falter/e-paper/fetch/%i/%i.jpg" % (issue, page), issue, page)
|
||||||
|
|
||||||
with open("%i/%i.jpg" % (issue, page), "b+w") as o:
|
|
||||||
o.write(f.read())
|
|
||||||
|
|
||||||
except urllib.error.HTTPError:
|
except urllib.error.HTTPError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
|
@ -27,3 +27,9 @@ def makePDF(issue, pages, type = JPG):
|
||||||
|
|
||||||
pdf.output("%s/issue.pdf" % str(issue), "F")
|
pdf.output("%s/issue.pdf" % str(issue), "F")
|
||||||
|
|
||||||
|
def downloadPage(url, issue, page):
|
||||||
|
f = urllib.request.urlopen(url)
|
||||||
|
|
||||||
|
with open("%s/%i.png" % (str(issue), int(page)), "b+w") as o:
|
||||||
|
o.write(f.read())
|
||||||
|
|
||||||
|
|
10
readit.py
10
readit.py
|
@ -47,17 +47,11 @@ def pageHandler(driver, id, page):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
img = driver.find_element_by_id("page1").get_attribute("src")
|
img = driver.find_element_by_id("page1").get_attribute("src")
|
||||||
f = urllib.request.urlopen(img)
|
helpers.downloadPage(img, id, page)
|
||||||
|
|
||||||
with open("%s/%i.png" % (id, page), "b+w") as o:
|
|
||||||
o.write(f.read())
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
img2 = driver.find_element_by_id("page2").get_attribute("src")
|
img2 = driver.find_element_by_id("page2").get_attribute("src")
|
||||||
f2 = urllib.request.urlopen(img2)
|
helpers.downloadPage(img2, id, page + 1)
|
||||||
|
|
||||||
with open("%s/%i.png" % (id, page + 1), "b+w") as o2:
|
|
||||||
o2.write(f2.read())
|
|
||||||
|
|
||||||
return 2
|
return 2
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue