Move download logic to helpers.downloadPage()

falter.py

@@ -4,11 +4,7 @@ import errno, fpdf, helpers, os, os.path, PIL, urllib.request
 
 def getPage(issue, page):
  try:
-  f = urllib.request.urlopen("https://www.falter.at/falter/e-paper/fetch/%i/%i.jpg" % (issue, page))
-
-  with open("%i/%i.jpg" % (issue, page), "b+w") as o:
-   o.write(f.read())
-
+  helpers.downloadPage("https://www.falter.at/falter/e-paper/fetch/%i/%i.jpg" % (issue, page), issue, page)
  except urllib.error.HTTPError:
   return False
 

helpers/__init__.py

@@ -27,3 +27,9 @@ def makePDF(issue, pages, type = JPG):
 
  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())
+

readit.py

@@ -47,17 +47,11 @@ def pageHandler(driver, id, page):
   return False
 
  img = driver.find_element_by_id("page1").get_attribute("src")
- f = urllib.request.urlopen(img)
-
- with open("%s/%i.png" % (id, page), "b+w") as o:
-  o.write(f.read())
+ helpers.downloadPage(img, id, page)
 
  try:
   img2 = driver.find_element_by_id("page2").get_attribute("src")
-  f2 = urllib.request.urlopen(img2)
-
-  with open("%s/%i.png" % (id, page + 1), "b+w") as o2:
-   o2.write(f2.read())
+  helpers.downloadPage(img2, id, page + 1)
 
   return 2