Fix copy folder error (#65)

* Fix copy folder error * Fix linux musl issue
opengeos · May 24, 2024 · d895a9a · d895a9a
1 parent f8cc2e6
commit d895a9a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/whitebox/download_wbt.py b/whitebox/download_wbt.py
@@ -128,7 +128,9 @@ def safe_extract(
             if verbose:
                 print("WhiteboxTools package directory: {}".format(pkg_dir))
 
-            zip_dir = zip_name.split(".")[0]
+            zip_dir = os.path.join(
+                pkg_dir, os.path.basename(zip_name).replace(".zip", "")
+            ).replace("musl", "amd64")
             src_dir = os.path.join(zip_dir, "WBT")
 
             if os.path.exists(src_dir):
@@ -139,12 +141,14 @@ def safe_extract(
             if os.path.exists(new_plugin_dir):
                 shutil.rmtree(new_plugin_dir)
 
-            if os.path.exists(zip_dir):
-                shutil.rmtree(zip_dir)
+            if os.path.exists(new_img_dir):
+                shutil.copytree(init_img_dir, new_img_dir)
 
-            shutil.copytree(init_img_dir, new_img_dir)
-            shutil.copytree(init_plugin_dir, new_plugin_dir)
+            if os.path.exists(new_plugin_dir):
+                shutil.copytree(init_plugin_dir, new_plugin_dir)
 
+            if os.path.exists(zip_dir):
+                shutil.rmtree(zip_dir)
             exe_ext = ""  # file extension for MacOS/Linux
             if platform.system() == "Windows":
                 exe_ext = ".exe"

diff --git a/whitebox/whitebox_tools.py b/whitebox/whitebox_tools.py
@@ -157,7 +157,9 @@ def safe_extract(
             if verbose:
                 print("WhiteboxTools package directory: {}".format(pkg_dir))
 
-            zip_dir = zip_name.split(".")[0]
+            zip_dir = os.path.join(
+                pkg_dir, os.path.basename(zip_name).replace(".zip", "")
+            ).replace("musl", "amd64")
             src_dir = os.path.join(zip_dir, "WBT")
 
             if os.path.exists(src_dir):
@@ -168,12 +170,14 @@ def safe_extract(
             if os.path.exists(new_plugin_dir):
                 shutil.rmtree(new_plugin_dir)
 
-            if os.path.exists(zip_dir):
-                shutil.rmtree(zip_dir)
+            if os.path.exists(new_img_dir):
+                shutil.copytree(init_img_dir, new_img_dir)
 
-            shutil.copytree(init_img_dir, new_img_dir)
-            shutil.copytree(init_plugin_dir, new_plugin_dir)
+            if os.path.exists(new_plugin_dir):
+                shutil.copytree(init_plugin_dir, new_plugin_dir)
 
+            if os.path.exists(zip_dir):
+                shutil.rmtree(zip_dir)
             exe_ext = ""  # file extension for MacOS/Linux
             if platform.system() == "Windows":
                 exe_ext = ".exe"