Minor advance

model/webpic.py

@@ -3,6 +3,7 @@ from urllib import request
 from urllib.error import HTTPError, URLError
 from bs4 import BeautifulSoup, Tag, ResultSet
 
+
 class WebPicDownloader():
     """
     WebPicDownloader
@@ -15,14 +16,14 @@ class WebPicDownloader():
     """
     # Variables
     path: str = None
-    message_callback: function = None
+    messenger = None
     headers: dict = None
 
     # Constructor
     def __init__(self, path: str = os.getcwd()) -> None:
         """Constructor"""
         self.path = path
-        self.message_callback = lambda message: print(message)
+        self.messenger = lambda message: print(message)
         self.headers = {'User-Agent': "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"}
 
     # Internal functions
@@ -50,7 +51,7 @@ class WebPicDownloader():
         else:
             raise ValueError("Unable to find image url")
         if not 'http' in link:
-            raise ValueError("Bad image link")
+            raise ValueError("Bad image url")
         return link
 
     def __find_image_type(self, img_link: str) -> str:
@@ -75,15 +76,15 @@ class WebPicDownloader():
             raise ValueError("the folder already exists, it may already contain images")
 
     # Public functions
-    def set_message_callback(self, callback) -> None:
+    def set_messenger_callback(self, callback) -> None:
         """
-        Setter to define the callback function in case of new messages.
+        Setter to define the callback function called when new messages arrive.
 
         :callback: -> the callback function to call when a message event is emited.
         """
-        self.message_callback = callback
+        self.messenger = callback
 
-    def download(self, url: str, folder_name: str) -> None:
+    def download(self, url: str, folder_name: str) -> bool:
         """
         Start downloading all pictures of a website
         
@@ -97,29 +98,31 @@ class WebPicDownloader():
             images = self.__find_all_img(html)
 
             self.__initialize_folder(folder_path)
-            print(f"\nWebPicDownload found {len(images)} images on the website.")
+            self.messenger(f"WebPicDownloader found {len(images)} images on the website.")
 
             for i, img in enumerate(images):
                 try:
+                    self.messenger(f"Start downloading image {i}.")
                     img_link = self.__find_img_link(img)
                     self.__download_img(img_link, f"{folder_path}image-{i}.{self.__find_image_type(img_link)}")
-                    print(f"SUCCESS: File n°{i} successfuly downloaded.")
+                    self.messenger(f"Download of image {i}, done!")
                     count += 1
-                except ValueError as err:
-                    print(f"ERROR: Unable to process image n°{i} -> [{err}].")
                 except Exception as err:
-                    print(f"ERROR: Unable to process image n°{i}, an unknown error occured -> [{err}].")
+                    self.messenger(f"ERROR: Unable to process image {i} -> err[{err}].")
                     
-            print(f"WebPicDownloader has processed {count} images out of {len(images)}.")
+            self.messenger(f"WebPicDownloader has processed {count} images out of {len(images)}.")
+            return True
         except HTTPError as err:
-            print(f"ERROR: An http error occured -> [{err}].")
+            self.messenger(f"ERROR: An http error occured -> err[{err}].")
         except (ValueError, URLError) as err:
-            print(f"ERROT: An error occured with the url -> [{err}].")
+            self.messenger(f"ERROT: An error occured with the url -> err[{err}].")
         except Exception as err:
-            print(f"ERROR: An unknown error occured -> [{err}]")
+            self.messenger(f"ERROR: An unknown error occured -> err[{err}]")
+        return False
 
 if __name__ == "__main__":
     wpd = WebPicDownloader()
+    wpd.set_messenger_callback(lambda msg: print(f"--> {msg}"))
     while True:
         url = input("Website URL ? ")
         name = input("Folder name ? ")