Refactor downloading

Author: mdmintz

seleniumbase/core/download_helper.py

@@ -24,11 +24,22 @@ def get_downloads_folder():
 def reset_downloads_folder():
     """Clears the downloads folder.
     If settings.ARCHIVE_EXISTING_DOWNLOADS is set to True, archives it."""
+    archived_downloads_folder = os.path.join(os.getcwd(), ARCHIVE_DIR) + os.sep
     if os.path.exists(downloads_path) and not os.listdir(downloads_path) == []:
-        archived_downloads_folder = os.path.join(
-            downloads_path, "..", ARCHIVE_DIR
-        )
         reset_downloads_folder_assistant(archived_downloads_folder)
+    if os.path.exists(downloads_path) and os.listdir(downloads_path) == []:
+        try:
+            os.rmdir(downloads_path)
+        except OSError:
+            pass
+    if (
+        os.path.exists(archived_downloads_folder)
+        and os.listdir(archived_downloads_folder) == []
+    ):
+        try:
+            os.rmdir(archived_downloads_folder)
+        except OSError:
+            pass
 
 
 def reset_downloads_folder_assistant(archived_downloads_folder):

seleniumbase/fixtures/constants.py

@@ -147,7 +147,8 @@ class MultiBrowser:
     DRIVER_FIXING_LOCK = Files.DOWNLOADS_FOLDER + "/driver_fixing.lock"
     DRIVER_REPAIRED = Files.DOWNLOADS_FOLDER + "/driver_fixed.lock"
     CERT_FIXING_LOCK = Files.DOWNLOADS_FOLDER + "/cert_fixing.lock"
-    DOWNLOAD_FILE_LOCK = Files.DOWNLOADS_FOLDER + "/download_file.lock"
+    DOWNLOAD_FILE_LOCK = Files.DOWNLOADS_FOLDER + "/downloading.lock"
+    FILE_IO_LOCK = Files.DOWNLOADS_FOLDER + "/file_io.lock"
 
 
 class SavedCookies:

seleniumbase/fixtures/page_utils.py

@@ -256,10 +256,10 @@ def _download_file_to(file_url, destination_folder, new_file_name=None):
 
 
 def _save_data_as(data, destination_folder, file_name):
-    download_file_lock = fasteners.InterProcessLock(
-        constants.MultiBrowser.DOWNLOAD_FILE_LOCK
+    file_io_lock = fasteners.InterProcessLock(
+        constants.MultiBrowser.FILE_IO_LOCK
     )
-    with download_file_lock:
+    with file_io_lock:
         out_file = codecs.open(
             os.path.join(destination_folder, file_name), "w+", encoding="utf-8"
         )
@@ -268,10 +268,10 @@ def _save_data_as(data, destination_folder, file_name):
 
 
 def _append_data_to_file(data, destination_folder, file_name):
-    download_file_lock = fasteners.InterProcessLock(
-        constants.MultiBrowser.DOWNLOAD_FILE_LOCK
+    file_io_lock = fasteners.InterProcessLock(
+        constants.MultiBrowser.FILE_IO_LOCK
     )
-    with download_file_lock:
+    with file_io_lock:
         existing_data = ""
         if os.path.exists(os.path.join(destination_folder, file_name)):
             with open(os.path.join(destination_folder, file_name), "r") as f:
@@ -286,10 +286,10 @@ def _append_data_to_file(data, destination_folder, file_name):
 
 
 def _get_file_data(folder, file_name):
-    download_file_lock = fasteners.InterProcessLock(
-        constants.MultiBrowser.DOWNLOAD_FILE_LOCK
+    file_io_lock = fasteners.InterProcessLock(
+        constants.MultiBrowser.FILE_IO_LOCK
     )
-    with download_file_lock:
+    with file_io_lock:
         if not os.path.exists(os.path.join(folder, file_name)):
             raise Exception("File not found!")
         with open(os.path.join(folder, file_name), "r") as f: