:zap: [Enhance] FilepathConverter: New parent param when init

networks/filepath_converter.py

@@ -34,8 +34,9 @@ WINDOWS_INVALID_FILE_PATH_NAMES = [
 
 
 class FilepathConverter:
-    def __init__(self):
+    def __init__(self, parent: str = None):
         self.output_root = Path(__file__).parents[1] / "files"
+        self.parent = parent
 
     def preprocess(self, input_string):
         return input_string
@@ -63,6 +64,7 @@ class FilepathConverter:
         filename = self.validate(filename)
         filename = self.append_extension(filename)
 
+        parent = parent or self.parent
         if parent:
             filepath = self.output_root / parent / filename
         else:
@@ -75,8 +77,8 @@ class FilepathConverter:
 
 
 class UrlToFilepathConverter(FilepathConverter):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, parent: str = None):
+        super().__init__(parent)
         self.output_root = self.output_root / "urls"
 
     def preprocess(self, url):
@@ -85,8 +87,8 @@ class UrlToFilepathConverter(FilepathConverter):
 
 
 class QueryToFilepathConverter(FilepathConverter):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, parent: str = None):
+        super().__init__(parent)
         self.output_root = self.output_root / "queries"
 
 
@@ -100,5 +102,5 @@ if __name__ == "__main__":
         "https://stackoverflow.com/questions/295135/turn-a-string-into-a-valid-filename"
     )
 
-    url_converter = UrlToFilepathConverter()
-    print(url_converter.convert(url, parent=query))
+    url_converter = UrlToFilepathConverter(parent=query)
+    print(url_converter.convert(url))

networks/google_searcher.py

@@ -2,6 +2,7 @@ import requests
 from pathlib import Path
 from utils.enver import enver
 from utils.logger import logger
+from networks.filepath_converter import QueryToFilepathConverter
 
 
 class GoogleSearcher:
@@ -10,7 +11,7 @@ class GoogleSearcher:
         self.url = "https://www.google.com/search"
         self.enver = enver
         self.enver.set_envs(proxies=True)
-        self.output_root = Path(__file__).parents[1] / "files"
+        self.filepath_converter = QueryToFilepathConverter()
 
     def send_request(self, result_num=10):
         logger.note(f"Searching: [{self.query}]")
@@ -27,12 +28,11 @@ class GoogleSearcher:
         )
 
     def save_response(self):
-        output_filename = self.query.replace(" ", "_") + ".html"
-        if not self.output_root.exists():
-            self.output_root.mkdir(parents=True, exist_ok=True)
-        output_path = self.output_root / output_filename
-        logger.note(f"Saving to: [{output_path}]")
-        with open(output_path, "wb") as wf:
+        self.output_path = self.filepath_converter.convert(self.query)
+        if not self.output_path.exists():
+            self.output_path.parent.mkdir(parents=True, exist_ok=True)
+        logger.note(f"Saving to: [{self.output_path}]")
+        with open(self.output_path, "wb") as wf:
             wf.write(self.request_response.content)
 
     def search(self, query):