fix untar

Author: jph00

fastcore/xtras.py

@@ -151,10 +151,12 @@ def loads_multi(s:str):
 def untar_dir(fname, dest):
     "untar `file` into `dest`"
     with tempfile.TemporaryDirectory(dir='.') as d:
-        shutil.unpack_archive(fname, d)
-        ls = Path(d).ls()
+        out = Path(d)/'out'
+        out.mkdir()
+        shutil.unpack_archive(fname, out)
+        ls = out.ls()
         if len(ls) == 1: shutil.move(str(ls[0]), dest)
-        else: shutil.move(str(d), dest/remove_suffix(Path(fname).stem, '.tar'))
+        else: shutil.move(str(out), dest/remove_suffix(Path(fname).stem, '.tar'))
 
 # Cell
 def repo_details(url):

nbs/03_xtras.ipynb

@@ -618,7 +618,7 @@
     {
      "data": {
       "text/plain": [
-       "['d', 'e', 'h', 'g', 'b', 'a', 'c', 'f']"
+       "['c', 'b', 'e', 'f', 'g', 'a', 'd', 'h']"
       ]
      },
      "execution_count": null,
@@ -1010,10 +1010,12 @@
     "def untar_dir(fname, dest):\n",
     "    \"untar `file` into `dest`\"\n",
     "    with tempfile.TemporaryDirectory(dir='.') as d:\n",
-    "        shutil.unpack_archive(fname, d)\n",
-    "        ls = Path(d).ls()\n",
+    "        out = Path(d)/'out'\n",
+    "        out.mkdir()\n",
+    "        shutil.unpack_archive(fname, out)\n",
+    "        ls = out.ls()\n",
     "        if len(ls) == 1: shutil.move(str(ls[0]), dest)\n",
-    "        else: shutil.move(str(d), dest/remove_suffix(Path(fname).stem, '.tar'))"
+    "        else: shutil.move(str(out), dest/remove_suffix(Path(fname).stem, '.tar'))"
    ]
   },
   {
@@ -1295,7 +1297,8 @@
    "outputs": [],
    "source": [
     "for suf in '.pkl','.bz2','.gz':\n",
-    "    # delete=False is added for Windows. https://stackoverflow.com/questions/23212435/permission-denied-to-write-to-my-temporary-file\n",
+    "    # delete=False is added for Windows\n",
+    "    # https://stackoverflow.com/questions/23212435/permission-denied-to-write-to-my-temporary-file\n",
     "    with tempfile.NamedTemporaryFile(suffix=suf, delete=False) as f:\n",
     "        fn = Path(f.name)\n",
     "        save_pickle(fn, 't')\n",